Re: [PATCH 24/25] MIPS: Alchemy: use the OHCI platform driver
flat view
From: Manuel Lauss <manuel.lauss@gmail.com>
Date: 2012-10-03 16:08:11
Also in:
lkml
On Wed, Oct 3, 2012 at 5:03 PM, Florian Fainelli [off-list ref] wrote:
quoted hunk ↗ jump to hunk
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. Signed-off-by: Florian Fainelli <florian@openwrt.org> --- arch/mips/alchemy/common/platform.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+)diff --git a/arch/mips/alchemy/common/platform.c b/arch/mips/alchemy/common/platform.c index 57335a2..cd12458 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 },@@ -192,6 +221,7 @@ static void __init alchemy_setup_usb(int ctype) pdev->name = "au1xxx-ohci";
Should be "ohci-platform" (2x). With this change USB works on all my Alchemy boards. I'd also suggest to move drivers/usb/host/alchemy-common.c to arch/mips/alchemy/common/usb.c. (same for octeon2-common.c) Manuel