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>,
Manuel Lauss <manuel.lauss@googlemail.com>,
Thomas Meyer <thomas@m3y3r.de>,
"David S. Miller" <davem@davemloft.net>,
Raghavendra K T <raghavendra.kt@linux.vnet.ibm.com>,
Ingo Molnar <mingo@kernel.org>,
Paul Gortmaker <paul.gortmaker@windriver.com>,
linux-mips@linux-mips.org, linux-kernel@vger.kernel.org
Subject: [PATCH 24/32 v4] MIPS: Alchemy: use the OHCI platform driver
Date: Mon, 8 Oct 2012 15:11:38 +0200 [thread overview]
Message-ID: <1349701906-16481-25-git-send-email-florian@openwrt.org> (raw)
In-Reply-To: <1349701906-16481-1-git-send-email-florian@openwrt.org>
Convert the Alchemy platform to register the ohci-platform driver, now that
the ohci-platform driver properly handles the specific ohci-au1xxx resume
from suspend case.
This also greatly simplifies the power_{on,off} callbacks and make them
work on platform device id instead of checking the OHCI controller base
address like what was done in ohci-au1xxx.c.
Impacted defconfigs are also updated accordingly to select the OHCI platform
driver.
Signed-off-by: Florian Fainelli <florian@openwrt.org>
---
Changes in v4:
- rebased against greg's latest usb-next
No changes in v3
Changes in v2:
- updated defconfigs accordingly
- really instantiate "ohci-platform" instead of "ohci-au1xxx"
- rebased on top of the latest OHCI HCD changes
arch/mips/alchemy/common/platform.c | 35 +++++++++++++++++++++++++++++++++--
arch/mips/configs/db1000_defconfig | 1 +
arch/mips/configs/db1200_defconfig | 1 +
arch/mips/configs/db1300_defconfig | 1 +
arch/mips/configs/db1550_defconfig | 1 +
arch/mips/configs/gpr_defconfig | 1 +
arch/mips/configs/mtx1_defconfig | 1 +
arch/mips/configs/pb1100_defconfig | 1 +
arch/mips/configs/pb1500_defconfig | 1 +
arch/mips/configs/pb1550_defconfig | 1 +
10 files changed, 42 insertions(+), 2 deletions(-)
diff --git a/arch/mips/alchemy/common/platform.c b/arch/mips/alchemy/common/platform.c
index b9a5f6d..7af941d 100644
--- a/arch/mips/alchemy/common/platform.c
+++ b/arch/mips/alchemy/common/platform.c
@@ -18,6 +18,7 @@
#include <linux/serial_8250.h>
#include <linux/slab.h>
#include <linux/usb/ehci_pdriver.h>
+#include <linux/usb/ohci_pdriver.h>
#include <asm/mach-au1x00/au1000.h>
#include <asm/mach-au1x00/au1xxx_dbdma.h>
@@ -142,6 +143,34 @@ static struct usb_ehci_pdata alchemy_ehci_pdata = {
.power_suspend = alchemy_ehci_power_off,
};
+/* Power on callback for the ohci platform driver */
+static int alchemy_ohci_power_on(struct platform_device *pdev)
+{
+ int unit;
+
+ unit = (pdev->id == 1) ?
+ ALCHEMY_USB_OHCI1 : ALCHEMY_USB_OHCI0;
+
+ return alchemy_usb_control(unit, 1);
+}
+
+/* Power off/suspend callback for the ohci platform driver */
+static void alchemy_ohci_power_off(struct platform_device *pdev)
+{
+ int unit;
+
+ unit = (pdev->id == 1) ?
+ ALCHEMY_USB_OHCI1 : ALCHEMY_USB_OHCI0;
+
+ alchemy_usb_control(unit, 0);
+}
+
+static struct usb_ohci_pdata alchemy_ohci_pdata = {
+ .power_on = alchemy_ohci_power_on,
+ .power_off = alchemy_ohci_power_off,
+ .power_suspend = alchemy_ohci_power_off,
+};
+
static unsigned long alchemy_ohci_data[][2] __initdata = {
[ALCHEMY_CPU_AU1000] = { AU1000_USB_OHCI_PHYS_ADDR, AU1000_USB_HOST_INT },
[ALCHEMY_CPU_AU1500] = { AU1000_USB_OHCI_PHYS_ADDR, AU1500_USB_HOST_INT },
@@ -189,9 +218,10 @@ static void __init alchemy_setup_usb(int ctype)
res[1].start = alchemy_ohci_data[ctype][1];
res[1].end = res[1].start;
res[1].flags = IORESOURCE_IRQ;
- pdev->name = "au1xxx-ohci";
+ pdev->name = "ohci-platform";
pdev->id = 0;
pdev->dev.dma_mask = &alchemy_ohci_dmamask;
+ pdev->dev.platform_data = &alchemy_ohci_pdata;
if (platform_device_register(pdev))
printk(KERN_INFO "Alchemy USB: cannot add OHCI0\n");
@@ -228,9 +258,10 @@ static void __init alchemy_setup_usb(int ctype)
res[1].start = AU1300_USB_INT;
res[1].end = res[1].start;
res[1].flags = IORESOURCE_IRQ;
- pdev->name = "au1xxx-ohci";
+ pdev->name = "ohci-platform";
pdev->id = 1;
pdev->dev.dma_mask = &alchemy_ohci_dmamask;
+ pdev->dev.platform_data = &alchemy_ohci_pdata;
if (platform_device_register(pdev))
printk(KERN_INFO "Alchemy USB: cannot add OHCI1\n");
diff --git a/arch/mips/configs/db1000_defconfig b/arch/mips/configs/db1000_defconfig
index 17a36c1..face9d2 100644
--- a/arch/mips/configs/db1000_defconfig
+++ b/arch/mips/configs/db1000_defconfig
@@ -233,6 +233,7 @@ CONFIG_USB_EHCI_HCD=y
CONFIG_USB_EHCI_ROOT_HUB_TT=y
CONFIG_USB_EHCI_TT_NEWSCHED=y
CONFIG_USB_OHCI_HCD=y
+CONFIG_USB_OHCI_HCD_PLATFORM=y
CONFIG_USB_UHCI_HCD=y
CONFIG_USB_STORAGE=y
CONFIG_NEW_LEDS=y
diff --git a/arch/mips/configs/db1200_defconfig b/arch/mips/configs/db1200_defconfig
index d31ac85..e36f44a 100644
--- a/arch/mips/configs/db1200_defconfig
+++ b/arch/mips/configs/db1200_defconfig
@@ -120,6 +120,7 @@ CONFIG_USB_EHCI_HCD=y
CONFIG_USB_EHCI_HCD_PLATFORM=y
CONFIG_USB_EHCI_ROOT_HUB_TT=y
CONFIG_USB_OHCI_HCD=y
+CONFIG_USB_OHCI_HCD_PLATFORM=y
CONFIG_MMC=y
# CONFIG_MMC_BLOCK_BOUNCE is not set
CONFIG_MMC_AU1X=y
diff --git a/arch/mips/configs/db1300_defconfig b/arch/mips/configs/db1300_defconfig
index 717e7b2..6873443 100644
--- a/arch/mips/configs/db1300_defconfig
+++ b/arch/mips/configs/db1300_defconfig
@@ -292,6 +292,7 @@ CONFIG_USB_EHCI_HCD_PLATFORM=y
CONFIG_USB_EHCI_ROOT_HUB_TT=y
CONFIG_USB_EHCI_TT_NEWSCHED=y
CONFIG_USB_OHCI_HCD=y
+CONFIG_USB_OHCI_HCD_PLATFORM=y
CONFIG_USB_OHCI_LITTLE_ENDIAN=y
CONFIG_RTC_LIB=y
CONFIG_RTC_CLASS=y
diff --git a/arch/mips/configs/db1550_defconfig b/arch/mips/configs/db1550_defconfig
index 36cda27..315fe24 100644
--- a/arch/mips/configs/db1550_defconfig
+++ b/arch/mips/configs/db1550_defconfig
@@ -187,6 +187,7 @@ CONFIG_USB_EHCI_HCD=y
CONFIG_USB_EHCI_ROOT_HUB_TT=y
CONFIG_USB_EHCI_TT_NEWSCHED=y
CONFIG_USB_OHCI_HCD=y
+CONFIG_USB_OHCI_HCD_PLATFORM=y
CONFIG_USB_OHCI_LITTLE_ENDIAN=y
CONFIG_USB_UHCI_HCD=y
CONFIG_USB_STORAGE=y
diff --git a/arch/mips/configs/gpr_defconfig b/arch/mips/configs/gpr_defconfig
index 48a40ae..fb64589 100644
--- a/arch/mips/configs/gpr_defconfig
+++ b/arch/mips/configs/gpr_defconfig
@@ -291,6 +291,7 @@ CONFIG_USB_MON=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_EHCI_ROOT_HUB_TT=y
CONFIG_USB_OHCI_HCD=y
+CONFIG_USB_OHCI_HCD_PLATFORM=y
CONFIG_USB_STORAGE=m
CONFIG_USB_LIBUSUAL=y
CONFIG_USB_SERIAL=y
diff --git a/arch/mips/configs/mtx1_defconfig b/arch/mips/configs/mtx1_defconfig
index 46c61edc..459018a 100644
--- a/arch/mips/configs/mtx1_defconfig
+++ b/arch/mips/configs/mtx1_defconfig
@@ -581,6 +581,7 @@ CONFIG_USB_MON=m
CONFIG_USB_EHCI_HCD=m
CONFIG_USB_EHCI_ROOT_HUB_TT=y
CONFIG_USB_OHCI_HCD=m
+CONFIG_USB_OHCI_HCD_PLATFORM=y
CONFIG_USB_UHCI_HCD=m
CONFIG_USB_U132_HCD=m
CONFIG_USB_SL811_HCD=m
diff --git a/arch/mips/configs/pb1100_defconfig b/arch/mips/configs/pb1100_defconfig
index 75eb1b1..b47b1a3 100644
--- a/arch/mips/configs/pb1100_defconfig
+++ b/arch/mips/configs/pb1100_defconfig
@@ -97,6 +97,7 @@ CONFIG_USB=y
CONFIG_USB_DYNAMIC_MINORS=y
CONFIG_USB_SUSPEND=y
CONFIG_USB_OHCI_HCD=y
+CONFIG_USB_OHCI_HCD_PLATFORM=y
CONFIG_RTC_CLASS=y
CONFIG_RTC_DRV_AU1XXX=y
CONFIG_EXT2_FS=y
diff --git a/arch/mips/configs/pb1500_defconfig b/arch/mips/configs/pb1500_defconfig
index fa00487..adbc281 100644
--- a/arch/mips/configs/pb1500_defconfig
+++ b/arch/mips/configs/pb1500_defconfig
@@ -104,6 +104,7 @@ CONFIG_USB=y
CONFIG_USB_DYNAMIC_MINORS=y
CONFIG_USB_OTG_WHITELIST=y
CONFIG_USB_OHCI_HCD=y
+CONFIG_USB_OHCI_HCD_PLATFORM=y
CONFIG_RTC_CLASS=y
CONFIG_RTC_DRV_AU1XXX=y
CONFIG_EXT2_FS=y
diff --git a/arch/mips/configs/pb1550_defconfig b/arch/mips/configs/pb1550_defconfig
index e83d649..ef13bba 100644
--- a/arch/mips/configs/pb1550_defconfig
+++ b/arch/mips/configs/pb1550_defconfig
@@ -108,6 +108,7 @@ CONFIG_USB_SUSPEND=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_EHCI_ROOT_HUB_TT=y
CONFIG_USB_OHCI_HCD=y
+CONFIG_USB_OHCI_HCD_PLATFORM=y
CONFIG_RTC_CLASS=y
CONFIG_RTC_DRV_AU1XXX=y
CONFIG_EXT2_FS=y
--
1.7.9.5
next prev parent reply other threads:[~2012-10-08 13:14 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 ` [PATCH 16/32 v4] MIPS: PNX8550: use OHCI platform driver Florian Fainelli
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 ` Florian Fainelli [this message]
2012-10-22 18:27 ` [PATCH 24/32 v4] MIPS: Alchemy: use the OHCI " 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-25-git-send-email-florian@openwrt.org \
--to=florian@openwrt.org \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@linux-mips.org \
--cc=linux-usb@vger.kernel.org \
--cc=manuel.lauss@googlemail.com \
--cc=mingo@kernel.org \
--cc=paul.gortmaker@windriver.com \
--cc=raghavendra.kt@linux.vnet.ibm.com \
--cc=ralf@linux-mips.org \
--cc=stern@rowland.harvard.edu \
--cc=thomas@m3y3r.de \
/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