Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2be350fa authored by Florian Fainelli's avatar Florian Fainelli Committed by Greg Kroah-Hartman
Browse files

MIPS: Alchemy: use the ehci platform driver 



Use the ehci platform driver power_{on,suspend,off} callbacks to perform the
USB block gate enabling/disabling as what the ehci-au1xxx.c driver does.
Update the db1200 and db1300 defconfigs to now select the EHCI platform
driver.

Signed-off-by: default avatarFlorian Fainelli <florian@openwrt.org>
Acked-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4534874a

arch/mips/alchemy/common/platform.c

+22 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <linux/platform_device.h>

#include <linux/serial_8250.h>

#include <linux/slab.h>

#include <linux/usb/ehci_pdriver.h>



#include <asm/mach-au1x00/au1000.h>

#include <asm/mach-au1x00/au1xxx_dbdma.h>
@@ -122,6 +123,25 @@ static void __init alchemy_setup_uarts(int ctype) 
static u64 alchemy_ohci_dmamask = DMA_BIT_MASK(32);

static u64 __maybe_unused alchemy_ehci_dmamask = DMA_BIT_MASK(32);



/* Power on callback for the ehci platform driver */

static int alchemy_ehci_power_on(struct platform_device *pdev)

{

	return alchemy_usb_control(ALCHEMY_USB_EHCI0, 1);

}



/* Power off/suspend callback for the ehci platform driver */

static void alchemy_ehci_power_off(struct platform_device *pdev)

{

	alchemy_usb_control(ALCHEMY_USB_EHCI0, 0);

}



static struct usb_ehci_pdata alchemy_ehci_pdata = {

	.no_io_watchdog	= 1,

	.power_on	= alchemy_ehci_power_on,

	.power_off	= alchemy_ehci_power_off,

	.power_suspend	= alchemy_ehci_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 },
@@ -188,9 +208,10 @@ static void __init alchemy_setup_usb(int ctype) 
		res[1].start = alchemy_ehci_data[ctype][1];

		res[1].end = res[1].start;

		res[1].flags = IORESOURCE_IRQ;

		pdev->name = "au1xxx-ehci";

		pdev->name = "ehci-platform";

		pdev->id = 0;

		pdev->dev.dma_mask = &alchemy_ehci_dmamask;

		pdev->dev.platform_data = &alchemy_ehci_pdata;



		if (platform_device_register(pdev))

			printk(KERN_INFO "Alchemy USB: cannot add EHCI0\n");