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

Commit e223a4cc authored Oct 08, 2012 by Florian Fainelli Committed by Greg Kroah-Hartman Oct 22, 2012

MIPS: Alchemy: use the OHCI platform driver



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>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 231a72e0

arch/mips/alchemy/common/platform.c

+33 −2

Original line number	Original line	Diff line number	Diff line
	@@ -18,6 +18,7 @@
	#include <linux/serial_8250.h>		#include <linux/serial_8250.h>
	#include <linux/slab.h>		#include <linux/slab.h>
	#include <linux/usb/ehci_pdriver.h>		#include <linux/usb/ehci_pdriver.h>
			#include <linux/usb/ohci_pdriver.h>

	#include <asm/mach-au1x00/au1000.h>		#include <asm/mach-au1x00/au1000.h>
	#include <asm/mach-au1x00/au1xxx_dbdma.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_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 = {		static unsigned long alchemy_ohci_data[][2] __initdata = {
	[ALCHEMY_CPU_AU1000] = { AU1000_USB_OHCI_PHYS_ADDR, AU1000_USB_HOST_INT },		[ALCHEMY_CPU_AU1000] = { AU1000_USB_OHCI_PHYS_ADDR, AU1000_USB_HOST_INT },
	[ALCHEMY_CPU_AU1500] = { AU1000_USB_OHCI_PHYS_ADDR, AU1500_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].start = alchemy_ohci_data[ctype][1];
	res[1].end = res[1].start;		res[1].end = res[1].start;
	res[1].flags = IORESOURCE_IRQ;		res[1].flags = IORESOURCE_IRQ;
	pdev->name = "au1xxx-ohci";		pdev->name = "ohci-platform";
	pdev->id = 0;		pdev->id = 0;
	pdev->dev.dma_mask = &alchemy_ohci_dmamask;		pdev->dev.dma_mask = &alchemy_ohci_dmamask;
			pdev->dev.platform_data = &alchemy_ohci_pdata;

	if (platform_device_register(pdev))		if (platform_device_register(pdev))
	printk(KERN_INFO "Alchemy USB: cannot add OHCI0\n");		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].start = AU1300_USB_INT;
	res[1].end = res[1].start;		res[1].end = res[1].start;
	res[1].flags = IORESOURCE_IRQ;		res[1].flags = IORESOURCE_IRQ;
	pdev->name = "au1xxx-ohci";		pdev->name = "ohci-platform";
	pdev->id = 1;		pdev->id = 1;
	pdev->dev.dma_mask = &alchemy_ohci_dmamask;		pdev->dev.dma_mask = &alchemy_ohci_dmamask;
			pdev->dev.platform_data = &alchemy_ohci_pdata;

	if (platform_device_register(pdev))		if (platform_device_register(pdev))
	printk(KERN_INFO "Alchemy USB: cannot add OHCI1\n");		printk(KERN_INFO "Alchemy USB: cannot add OHCI1\n");

arch/mips/configs/db1000_defconfig

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -233,6 +233,7 @@ CONFIG_USB_EHCI_HCD=y
	CONFIG_USB_EHCI_ROOT_HUB_TT=y		CONFIG_USB_EHCI_ROOT_HUB_TT=y
	CONFIG_USB_EHCI_TT_NEWSCHED=y		CONFIG_USB_EHCI_TT_NEWSCHED=y
	CONFIG_USB_OHCI_HCD=y		CONFIG_USB_OHCI_HCD=y
			CONFIG_USB_OHCI_HCD_PLATFORM=y
	CONFIG_USB_UHCI_HCD=y		CONFIG_USB_UHCI_HCD=y
	CONFIG_USB_STORAGE=y		CONFIG_USB_STORAGE=y
	CONFIG_NEW_LEDS=y		CONFIG_NEW_LEDS=y

arch/mips/configs/gpr_defconfig

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -291,6 +291,7 @@ CONFIG_USB_MON=y
	CONFIG_USB_EHCI_HCD=y		CONFIG_USB_EHCI_HCD=y
	CONFIG_USB_EHCI_ROOT_HUB_TT=y		CONFIG_USB_EHCI_ROOT_HUB_TT=y
	CONFIG_USB_OHCI_HCD=y		CONFIG_USB_OHCI_HCD=y
			CONFIG_USB_OHCI_HCD_PLATFORM=y
	CONFIG_USB_STORAGE=m		CONFIG_USB_STORAGE=m
	CONFIG_USB_LIBUSUAL=y		CONFIG_USB_LIBUSUAL=y
	CONFIG_USB_SERIAL=y		CONFIG_USB_SERIAL=y

arch/mips/configs/mtx1_defconfig

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -581,6 +581,7 @@ CONFIG_USB_MON=m
	CONFIG_USB_EHCI_HCD=m		CONFIG_USB_EHCI_HCD=m
	CONFIG_USB_EHCI_ROOT_HUB_TT=y		CONFIG_USB_EHCI_ROOT_HUB_TT=y
	CONFIG_USB_OHCI_HCD=m		CONFIG_USB_OHCI_HCD=m
			CONFIG_USB_OHCI_HCD_PLATFORM=y
	CONFIG_USB_UHCI_HCD=m		CONFIG_USB_UHCI_HCD=m
	CONFIG_USB_U132_HCD=m		CONFIG_USB_U132_HCD=m
	CONFIG_USB_SL811_HCD=m		CONFIG_USB_SL811_HCD=m