mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Florian Fainelli <florian@openwrt.org>
To: stern@rowland.harvard.edu
Cc: linux-usb@vger.kernel.org, Florian Fainelli <florian@openwrt.org>,
	Ralf Baechle <ralf@linux-mips.org>,
	linux-mips@linux-mips.org, linux-kernel@vger.kernel.org
Subject: [PATCH 16/32 v4] MIPS: PNX8550: use OHCI platform driver
Date: Mon,  8 Oct 2012 15:11:30 +0200	[thread overview]
Message-ID: <1349701906-16481-17-git-send-email-florian@openwrt.org> (raw)
In-Reply-To: <1349701906-16481-1-git-send-email-florian@openwrt.org>

Change the PNX8550 platform code to register an ohci-platform driver instead
of ohci-pnx8550 since the ohci-platform is suitable for use.

Signed-off-by: Florian Fainelli <florian@openwrt.org>
---
Changes in v4:
- rebased against greg's latest usb-next

No changes in v2 and v3

 arch/mips/pnx8550/common/platform.c |   31 ++++++++++++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/arch/mips/pnx8550/common/platform.c b/arch/mips/pnx8550/common/platform.c
index 5264cc0..0a8faea 100644
--- a/arch/mips/pnx8550/common/platform.c
+++ b/arch/mips/pnx8550/common/platform.c
@@ -20,6 +20,7 @@
 #include <linux/serial.h>
 #include <linux/serial_pnx8xxx.h>
 #include <linux/platform_device.h>
+#include <linux/usb/ohci_pdriver.h>
 
 #include <int.h>
 #include <usb.h>
@@ -96,12 +97,40 @@ static u64 ohci_dmamask = DMA_BIT_MASK(32);
 
 static u64 uart_dmamask = DMA_BIT_MASK(32);
 
+static int pnx8550_usb_ohci_power_on(struct platform_device *pdev)
+{
+	/*
+	 * Set register CLK48CTL to enable and 48MHz
+	 */
+	outl(0x00000003, PCI_BASE | 0x0004770c);
+
+	/*
+	 * Set register CLK12CTL to enable and 48MHz
+	 */
+	outl(0x00000003, PCI_BASE | 0x00047710);
+
+	udelay(100);
+
+	return 0;
+}
+
+static void pnx8550_usb_ohci_power_off(struct platform_device *pdev)
+{
+	udelay(10);
+}
+
+static struct usb_ohci_pdata pnx8550_usb_ohci_pdata = {
+	.power_on	= pnx8550_usb_ohci_power_on,
+	.power_off	= pnx8550_usb_ohci_power_off,
+};
+
 static struct platform_device pnx8550_usb_ohci_device = {
-	.name		= "pnx8550-ohci",
+	.name		= "ohci-platform",
 	.id		= -1,
 	.dev = {
 		.dma_mask		= &ohci_dmamask,
 		.coherent_dma_mask	= DMA_BIT_MASK(32),
+		.platform_data		= &pnx8550_usb_ohci_pdata,
 	},
 	.num_resources	= ARRAY_SIZE(pnx8550_usb_ohci_resources),
 	.resource	= pnx8550_usb_ohci_resources,
-- 
1.7.9.5


  parent reply	other threads:[~2012-10-08 13:13 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <1349701906-16481-1-git-send-email-florian@openwrt.org>
2012-10-08 13:11 ` [PATCH 01/32 v4] USB: EHCI: remove IXP4xx EHCI driver Florian Fainelli
2012-10-08 13:11 ` [PATCH 02/32 v2] USB: OHCI: remove ohci-pcc-soc driver Florian Fainelli
2012-10-08 13:11 ` [PATCH 03/32 v4] MIPS: Loongson 1B: use ehci-platform instead of ehci-ls1x Florian Fainelli
     [not found]   ` <CAJhJPsV5mFmOgU38ZpnYqUTNuOPmvRXjsf31XdFUqNOzsd_Edg@mail.gmail.com>
2012-10-23  8:46     ` Florian Fainelli
2012-10-23  8:53       ` Florian Fainelli
2012-10-08 13:11 ` [PATCH 04/32 v4] USB: EHCI: remove Loongson 1B EHCI driver Florian Fainelli
2012-10-08 13:11 ` [PATCH 05/32 v4] MIPS: Netlogic: use ehci-platform driver Florian Fainelli
2012-10-08 14:06   ` Jayachandran C.
2012-10-08 13:11 ` [PATCH 06/32 v4] USB: EHCI: remove Netlogic XLS EHCI driver Florian Fainelli
2012-10-08 13:11 ` [PATCH 07/32 v4] USB: EHCI: add no_io_watchdog platform_data parameter to ehci-platform Florian Fainelli
2012-10-08 13:11 ` [PATCH 08/32 v4] MIPS: Alchemy: use the ehci platform driver Florian Fainelli
2012-10-22 18:19   ` Greg KH
2012-10-08 13:11 ` [PATCH 09/32 v4] USB: EHCI: remove Alchemy EHCI driver Florian Fainelli
2012-10-08 13:11 ` [PATCH 10/32 v4] ARM: cns3xxx: use ehci platform driver Florian Fainelli
2012-10-08 13:11 ` [PATCH 11/32 v4] USB: EHCI: remove CNS3xxx EHCI " Florian Fainelli
2012-10-08 13:11 ` [PATCH 12/32 v4] USB: ohci: allow platform driver to specify the number of ports Florian Fainelli
2012-10-08 13:11 ` [PATCH 13/32 v3] USB: ohci: move ohci_pci_{suspend,resume} to ohci-hcd.c Florian Fainelli
2012-10-08 13:11 ` [PATCH 14/32 v3] USB: ohci: remove check for RH already suspended in ohci_suspend Florian Fainelli
2012-10-08 13:11 ` [PATCH 15/32 v3] USB: ohci: merge ohci_finish_controller_resume with ohci_resume Florian Fainelli
2012-10-08 13:11 ` Florian Fainelli [this message]
2012-10-08 13:11 ` [PATCH 17/32 v4] USB: OHCI: remove PNX8550 OHCI driver Florian Fainelli
2012-10-08 13:11 ` [PATCH 18/32 v4] ARM: cns3xxx: use OHCI platform driver Florian Fainelli
2012-10-08 13:11 ` [PATCH 19/32 v4] USB: OHCI: remove CNS3xxx " Florian Fainelli
2012-10-08 13:11 ` [PATCH 20/32 v4] MIPS: Netlogic: convert to use " Florian Fainelli
2012-10-08 13:11 ` [PATCH 21/32 v4] USB: OHCI: remove Netlogic XLS " Florian Fainelli
2012-10-08 13:11 ` [PATCH 22/32 v4] sh: convert boards to use the " Florian Fainelli
2012-10-08 13:11 ` [PATCH 23/32 v4] USB: OHCI: remove OHCI SH " Florian Fainelli
2012-10-08 13:11 ` [PATCH 24/32 v4] MIPS: Alchemy: use the OHCI " Florian Fainelli
2012-10-22 18:27   ` Greg KH
2012-10-08 13:11 ` [PATCH 25/32 v4] USB: OHCI: remove Alchemy " Florian Fainelli
2012-10-08 13:11 ` [PATCH 26/32 v2] USB: move common alchemy USB routines to arch/mips/alchemy/common.c Florian Fainelli
2012-10-08 13:11 ` [PATCH 27/32 v2] USB: EHCI: make ehci-platform use dev_err() instead of pr_err() Florian Fainelli
2012-10-08 13:11 ` [PATCH 28/32 v2] USB: OHCI: make ohci-platform " Florian Fainelli
2012-10-08 13:11 ` [PATCH 29/32 v2] USB: EHCI: fix typo in ehci-platform driver on the word "resource" Florian Fainelli
2012-10-08 13:11 ` [PATCH 30/32 v2] USB: OHCI: fix typo in ohci-platform " Florian Fainelli
2012-10-08 13:11 ` [PATCH 31/32 v3] USB: EHCI: make ehci-platform use devm_request_and_ioremap helper Florian Fainelli
2012-10-08 13:11 ` [PATCH 32/32 v3] USB: OHCI: make ohci-platform " Florian Fainelli

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1349701906-16481-17-git-send-email-florian@openwrt.org \
    --to=florian@openwrt.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mips@linux-mips.org \
    --cc=linux-usb@vger.kernel.org \
    --cc=ralf@linux-mips.org \
    --cc=stern@rowland.harvard.edu \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

Powered by JetHome