From 0d313693411ac69821326b783d587b3eedb5df69 Mon Sep 17 00:00:00 2001 From: Alex Smith Date: Fri, 9 May 2014 12:29:30 +0100 Subject: [PATCH 04/12] MIPS: octeon: Don't add platform devices for EHCI/OHCI Now that the {e,o}hci-octeon drivers have DT probe support, we no longer need to add platform devices for them. This code was problematic for some boards, e.g. the Ubiquiti E200, as it only added platform devices on CN63XX, which doesn't cover all models with *HCI support. With this change, USB will now be enabled on all boards which indicate *HCI support in their device tree. Signed-off-by: Alex Smith --- arch/mips/cavium-octeon/octeon-platform.c | 102 ------------------------------ 1 file changed, 102 deletions(-) diff --git a/arch/mips/cavium-octeon/octeon-platform.c b/arch/mips/cavium-octeon/octeon-platform.c index 6df0f4d..f8cced4 100644 --- a/arch/mips/cavium-octeon/octeon-platform.c +++ b/arch/mips/cavium-octeon/octeon-platform.c @@ -66,108 +66,6 @@ out: } device_initcall(octeon_rng_device_init); -#ifdef CONFIG_USB - -static int __init octeon_ehci_device_init(void) -{ - struct platform_device *pd; - int ret = 0; - - struct resource usb_resources[] = { - { - .flags = IORESOURCE_MEM, - }, { - .flags = IORESOURCE_IRQ, - } - }; - - /* Only Octeon2 has ehci/ohci */ - if (!OCTEON_IS_MODEL(OCTEON_CN63XX)) - return 0; - - if (octeon_is_simulation() || usb_disabled()) - return 0; /* No USB in the simulator. */ - - pd = platform_device_alloc("octeon-ehci", 0); - if (!pd) { - ret = -ENOMEM; - goto out; - } - - usb_resources[0].start = 0x00016F0000000000ULL; - usb_resources[0].end = usb_resources[0].start + 0x100; - - usb_resources[1].start = OCTEON_IRQ_USB0; - usb_resources[1].end = OCTEON_IRQ_USB0; - - ret = platform_device_add_resources(pd, usb_resources, - ARRAY_SIZE(usb_resources)); - if (ret) - goto fail; - - ret = platform_device_add(pd); - if (ret) - goto fail; - - return ret; -fail: - platform_device_put(pd); -out: - return ret; -} -device_initcall(octeon_ehci_device_init); - -static int __init octeon_ohci_device_init(void) -{ - struct platform_device *pd; - int ret = 0; - - struct resource usb_resources[] = { - { - .flags = IORESOURCE_MEM, - }, { - .flags = IORESOURCE_IRQ, - } - }; - - /* Only Octeon2 has ehci/ohci */ - if (!OCTEON_IS_MODEL(OCTEON_CN63XX)) - return 0; - - if (octeon_is_simulation() || usb_disabled()) - return 0; /* No USB in the simulator. */ - - pd = platform_device_alloc("octeon-ohci", 0); - if (!pd) { - ret = -ENOMEM; - goto out; - } - - usb_resources[0].start = 0x00016F0000000400ULL; - usb_resources[0].end = usb_resources[0].start + 0x100; - - usb_resources[1].start = OCTEON_IRQ_USB0; - usb_resources[1].end = OCTEON_IRQ_USB0; - - ret = platform_device_add_resources(pd, usb_resources, - ARRAY_SIZE(usb_resources)); - if (ret) - goto fail; - - ret = platform_device_add(pd); - if (ret) - goto fail; - - return ret; -fail: - platform_device_put(pd); -out: - return ret; -} -device_initcall(octeon_ohci_device_init); - -#endif /* CONFIG_USB */ - static struct of_device_id __initdata octeon_ids[] = { { .compatible = "simple-bus", }, { .compatible = "cavium,octeon-6335-uctl", }, -- 2.1.0