Skip to contentSkip to conversation

usb: ohci: remove ep93xx bus glue platform driver

PATCH Superseded H Hartley Sweeten 3 participants 7 messages Oct 16, 2013 – Oct 17, 2013

Subsystems (5)

v2 of 5 Superseded Latest is v5 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 usb: ohci: remove ep93xx bus glue platform driver

Convert ep93xx to use the OHCI platform driver and remove the ohci-ep93xx bus glue driver.

Enable CONFIG_OHCI_HCD_PLATFORM and refresh the ep93xx_defconfig so that USB is still enabled by default on the EP93xx platform.

Cc Alan Stern <[email protected]>
Cc Greg Kroah-Hartman <[email protected]>
Cc Ryan Mallon <[email protected]>
Cc Olof Johansson <[email protected]>

---
v2: Use the (*power_off) callback for (*power_suspend), as suggested
by Alan Stern.
Remove the Kconfig change to USB_OHCI_HCD_PLATFORM and refresh the ep93xx_defconfig to enable this option, as suggested by Alan Stern.

 arch/arm/configs/ep93xx_defconfig |  17 +---
 arch/arm/mach-ep93xx/clock.c      |   2 +-
 arch/arm/mach-ep93xx/core.c       |  40 ++++++++-
 drivers/usb/host/ohci-ep93xx.c    | 184 --------------------------------------
 drivers/usb/host/ohci-hcd.c       |  18 ----
 5 files changed, 40 insertions(+), 221 deletions(-)
 delete mode 100644 drivers/usb/host/ohci-ep93xx.c
arch/arm/configs/ep93xx_defconfig +3 -14
index 806005a..6ac5ea7 100644
@@ -1,15 +1,14 @@
-CONFIG_EXPERIMENTAL=y
 CONFIG_SYSVIPC=y
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=14
-CONFIG_SYSFS_DEPRECATED_V2=y
 CONFIG_EXPERT=y
 CONFIG_SLAB=y
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_MODULE_FORCE_UNLOAD=y
 # CONFIG_BLK_DEV_BSG is not set
+CONFIG_PARTITION_ADVANCED=y
 # CONFIG_IOSCHED_CFQ is not set
 CONFIG_ARCH_EP93XX=y
 CONFIG_CRUNCH=y
@@ -47,11 +46,8 @@ CONFIG_IPV6=y
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 # CONFIG_FW_LOADER is not set
 CONFIG_MTD=y
-CONFIG_MTD_CONCAT=y
-CONFIG_MTD_PARTITIONS=y
 CONFIG_MTD_REDBOOT_PARTS=y
 CONFIG_MTD_CMDLINE_PARTS=y
-CONFIG_MTD_CHAR=y
 CONFIG_MTD_BLOCK=y
 CONFIG_MTD_CFI=y
 CONFIG_MTD_CFI_ADV_OPTIONS=y
@@ -67,15 +63,14 @@ CONFIG_SCSI=y
 # CONFIG_SCSI_PROC_FS is not set
 CONFIG_BLK_DEV_SD=y
 CONFIG_NETDEVICES=y
-CONFIG_NET_ETHERNET=y
 CONFIG_EP93XX_ETH=y
 CONFIG_USB_RTL8150=y
 # CONFIG_INPUT is not set
 # CONFIG_SERIO is not set
 # CONFIG_VT is not set
+# CONFIG_LEGACY_PTYS is not set
 CONFIG_SERIAL_AMBA_PL010=y
 CONFIG_SERIAL_AMBA_PL010_CONSOLE=y
-# CONFIG_LEGACY_PTYS is not set
 # CONFIG_HW_RANDOM is not set
 CONFIG_I2C=y
 CONFIG_I2C_CHARDEV=y
@@ -86,9 +81,9 @@ CONFIG_WATCHDOG=y
 CONFIG_EP93XX_WATCHDOG=y
 CONFIG_USB=y
 CONFIG_USB_DEBUG=y
-CONFIG_USB_DEVICEFS=y
 CONFIG_USB_DYNAMIC_MINORS=y
 CONFIG_USB_OHCI_HCD=y
+CONFIG_USB_OHCI_HCD_PLATFORM=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_SERIAL=y
 CONFIG_USB_SERIAL_CONSOLE=y
@@ -100,24 +95,18 @@ CONFIG_RTC_DRV_EP93XX=y
 CONFIG_EXT2_FS=y
 CONFIG_EXT3_FS=y
 # CONFIG_EXT3_FS_XATTR is not set
-CONFIG_INOTIFY=y
 CONFIG_VFAT_FS=y
 CONFIG_TMPFS=y
 CONFIG_JFFS2_FS=y
 CONFIG_NFS_FS=y
-CONFIG_NFS_V3=y
 CONFIG_ROOT_NFS=y
-CONFIG_PARTITION_ADVANCED=y
 CONFIG_NLS_CODEPAGE_437=y
 CONFIG_NLS_ISO8859_1=y
 CONFIG_MAGIC_SYSRQ=y
-CONFIG_DEBUG_KERNEL=y
 CONFIG_DEBUG_SLAB=y
 CONFIG_DEBUG_SPINLOCK=y
 CONFIG_DEBUG_MUTEXES=y
-# CONFIG_RCU_CPU_STALL_DETECTOR is not set
 CONFIG_DEBUG_USER=y
-CONFIG_DEBUG_ERRORS=y
 CONFIG_DEBUG_LL=y
 # CONFIG_CRYPTO_ANSI_CPRNG is not set
 CONFIG_LIBCRC32C=y
arch/arm/mach-ep93xx/clock.c +1 -1
index c95dbce..39ef3b6 100644
@@ -212,7 +212,7 @@ static struct clk_lookup clocks[] = {
 	INIT_CK(NULL,			"hclk",		&clk_h),
 	INIT_CK(NULL,			"apb_pclk",	&clk_p),
 	INIT_CK(NULL,			"pll2",		&clk_pll2),
-	INIT_CK("ep93xx-ohci",		NULL,		&clk_usb_host),
+	INIT_CK("ohci-platform",	NULL,		&clk_usb_host),
 	INIT_CK("ep93xx-keypad",	NULL,		&clk_keypad),
 	INIT_CK("ep93xx-fb",		NULL,		&clk_video),
 	INIT_CK("ep93xx-spi.0",		NULL,		&clk_spi),
arch/arm/mach-ep93xx/core.c +36 -4
index 3f12b88..92d59c4 100644
@@ -36,6 +36,7 @@
 #include <linux/export.h>
 #include <linux/irqchip/arm-vic.h>
 #include <linux/reboot.h>
+#include <linux/usb/ohci_pdriver.h>
 
 #include <mach/hardware.h>
 #include <linux/platform_data/video-ep93xx.h>
@@ -297,22 +298,53 @@ static struct platform_device ep93xx_rtc_device = {
 	.resource	= ep93xx_rtc_resource,
 };
 
+/*************************************************************************
+ * EP93xx OHCI USB Host
+ *************************************************************************/
+
+static struct clk *ep93xx_ohci_host_clock;
+
+static int ep93xx_ohci_power_on(struct platform_device *pdev)
+{
+	if (!ep93xx_ohci_host_clock) {
+		ep93xx_ohci_host_clock = devm_clk_get(&pdev->dev, NULL);
+		if (IS_ERR(ep93xx_ohci_host_clock))
+			return PTR_ERR(ep93xx_ohci_host_clock);
+	}
+
+	clk_enable(ep93xx_ohci_host_clock);
+
+	return 0;
+}
+
+static void ep93xx_ohci_power_off(struct platform_device *pdev)
+{
+	clk_disable(ep93xx_ohci_host_clock);
+}
+
+static struct usb_ohci_pdata ep93xx_ohci_pdata = {
+	.power_on	= ep93xx_ohci_power_on,
+	.power_off	= ep93xx_ohci_power_off,
+	.power_suspend	= ep93xx_ohci_power_off,
+};
 
 static struct resource ep93xx_ohci_resources[] = {
 	DEFINE_RES_MEM(EP93XX_USB_PHYS_BASE, 0x1000),
 	DEFINE_RES_IRQ(IRQ_EP93XX_USB),
 };
 
+static u64 ep93xx_ohci_dma_mask = DMA_BIT_MASK(32);
 
 static struct platform_device ep93xx_ohci_device = {
-	.name		= "ep93xx-ohci",
+	.name		= "ohci-platform",
 	.id		= -1,
+	.num_resources	= ARRAY_SIZE(ep93xx_ohci_resources),
+	.resource	= ep93xx_ohci_resources,
 	.dev		= {
-		.dma_mask		= &ep93xx_ohci_device.dev.coherent_dma_mask,
+		.dma_mask		= &ep93xx_ohci_dma_mask,
 		.coherent_dma_mask	= DMA_BIT_MASK(32),
+		.platform_data		= &ep93xx_ohci_pdata,
 	},
-	.num_resources	= ARRAY_SIZE(ep93xx_ohci_resources),
-	.resource	= ep93xx_ohci_resources,
 };
 
 
drivers/usb/host/ohci-ep93xx.c deleted +0 -184

184 lines not on this page · raw message

drivers/usb/host/ohci-hcd.c +0 -18
index 604cad1..5845c82 100644
@@ -1204,11 +1204,6 @@ MODULE_LICENSE ("GPL");
 #define PLATFORM_DRIVER		ohci_hcd_pxa27x_driver
 #endif
 
-#ifdef CONFIG_ARCH_EP93XX
-#include "ohci-ep93xx.c"
-#define EP93XX_PLATFORM_DRIVER	ohci_hcd_ep93xx_driver
-#endif
-
 #ifdef CONFIG_ARCH_AT91
 #include "ohci-at91.c"
 #define AT91_PLATFORM_DRIVER	ohci_hcd_at91_driver
@@ -1344,12 +1339,6 @@ static int __init ohci_hcd_mod_init(void)
 		goto error_exynos;
 #endif
 
-#ifdef EP93XX_PLATFORM_DRIVER
-	retval = platform_driver_register(&EP93XX_PLATFORM_DRIVER);
-	if (retval < 0)
-		goto error_ep93xx;
-#endif
-
 #ifdef AT91_PLATFORM_DRIVER
 	retval = platform_driver_register(&AT91_PLATFORM_DRIVER);
 	if (retval < 0)
@@ -1393,10 +1382,6 @@ static int __init ohci_hcd_mod_init(void)
 	platform_driver_unregister(&AT91_PLATFORM_DRIVER);
  error_at91:
 #endif
-#ifdef EP93XX_PLATFORM_DRIVER
-	platform_driver_unregister(&EP93XX_PLATFORM_DRIVER);
- error_ep93xx:
-#endif
 #ifdef EXYNOS_PLATFORM_DRIVER
 	platform_driver_unregister(&EXYNOS_PLATFORM_DRIVER);
  error_exynos:
@@ -1462,9 +1447,6 @@ static void __exit ohci_hcd_mod_exit(void)
 #ifdef AT91_PLATFORM_DRIVER
 	platform_driver_unregister(&AT91_PLATFORM_DRIVER);
 #endif
-#ifdef EP93XX_PLATFORM_DRIVER
-	platform_driver_unregister(&EP93XX_PLATFORM_DRIVER);
-#endif
 #ifdef EXYNOS_PLATFORM_DRIVER
 	platform_driver_unregister(&EXYNOS_PLATFORM_DRIVER);
 #endif
Signature · 1 line
1.8.3.2
#1 lore raw

PATCH v2 1/1 usb: ohci: remove ep93xx bus glue platform driver

Quoted 101 lines · H Hartley Sweeten

Convert ep93xx to use the OHCI platform driver and remove the ohci-ep93xx bus glue driver.

Enable CONFIG_OHCI_HCD_PLATFORM and refresh the ep93xx_defconfig so that USB is still enabled by default on the EP93xx platform.

Cc Alan Stern <[email protected]>
Cc Greg Kroah-Hartman <[email protected]>
Cc Ryan Mallon <[email protected]>
Cc Olof Johansson <[email protected]>

---
v2: Use the (*power_off) callback for (*power_suspend), as suggested
by Alan Stern.
Remove the Kconfig change to USB_OHCI_HCD_PLATFORM and refresh the ep93xx_defconfig to enable this option, as suggested by Alan Stern.

 arch/arm/configs/ep93xx_defconfig |  17 +---
 arch/arm/mach-ep93xx/clock.c      |   2 +-
 arch/arm/mach-ep93xx/core.c       |  40 ++++++++-
 drivers/usb/host/ohci-ep93xx.c    | 184 --------------------------------------
 drivers/usb/host/ohci-hcd.c       |  18 ----
 5 files changed, 40 insertions(+), 221 deletions(-)
 delete mode 100644 drivers/usb/host/ohci-ep93xx.c
arch/arm/configs/ep93xx_defconfig +3 -11
index 806005a..6ac5ea7 100644
@@ -1,15 +1,14 @@
-CONFIG_EXPERIMENTAL=y
 CONFIG_SYSVIPC=y
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=14
-CONFIG_SYSFS_DEPRECATED_V2=y
 CONFIG_EXPERT=y
 CONFIG_SLAB=y
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_MODULE_FORCE_UNLOAD=y
 # CONFIG_BLK_DEV_BSG is not set
+CONFIG_PARTITION_ADVANCED=y
 # CONFIG_IOSCHED_CFQ is not set
 CONFIG_ARCH_EP93XX=y
 CONFIG_CRUNCH=y
@@ -47,11 +46,8 @@ CONFIG_IPV6=y
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 # CONFIG_FW_LOADER is not set
 CONFIG_MTD=y
-CONFIG_MTD_CONCAT=y
-CONFIG_MTD_PARTITIONS=y
 CONFIG_MTD_REDBOOT_PARTS=y
 CONFIG_MTD_CMDLINE_PARTS=y
-CONFIG_MTD_CHAR=y
 CONFIG_MTD_BLOCK=y
 CONFIG_MTD_CFI=y
 CONFIG_MTD_CFI_ADV_OPTIONS=y
@@ -67,15 +63,14 @@ CONFIG_SCSI=y
 # CONFIG_SCSI_PROC_FS is not set
 CONFIG_BLK_DEV_SD=y
 CONFIG_NETDEVICES=y
-CONFIG_NET_ETHERNET=y
 CONFIG_EP93XX_ETH=y
 CONFIG_USB_RTL8150=y
 # CONFIG_INPUT is not set
 # CONFIG_SERIO is not set
 # CONFIG_VT is not set
+# CONFIG_LEGACY_PTYS is not set
 CONFIG_SERIAL_AMBA_PL010=y
 CONFIG_SERIAL_AMBA_PL010_CONSOLE=y
-# CONFIG_LEGACY_PTYS is not set
 # CONFIG_HW_RANDOM is not set
 CONFIG_I2C=y
 CONFIG_I2C_CHARDEV=y
@@ -86,9 +81,9 @@ CONFIG_WATCHDOG=y
 CONFIG_EP93XX_WATCHDOG=y
 CONFIG_USB=y
 CONFIG_USB_DEBUG=y
-CONFIG_USB_DEVICEFS=y
 CONFIG_USB_DYNAMIC_MINORS=y
 CONFIG_USB_OHCI_HCD=y
+CONFIG_USB_OHCI_HCD_PLATFORM=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_SERIAL=y
 CONFIG_USB_SERIAL_CONSOLE=y
@@ -100,24 +95,18 @@ CONFIG_RTC_DRV_EP93XX=y
 CONFIG_EXT2_FS=y
 CONFIG_EXT3_FS=y
 # CONFIG_EXT3_FS_XATTR is not set
-CONFIG_INOTIFY=y
 CONFIG_VFAT_FS=y
 CONFIG_TMPFS=y
 CONFIG_JFFS2_FS=y
 CONFIG_NFS_FS=y
-CONFIG_NFS_V3=y
 CONFIG_ROOT_NFS=y
-CONFIG_PARTITION_ADVANCED=y
 CONFIG_NLS_CODEPAGE_437=y
 CONFIG_NLS_ISO8859_1=y
 CONFIG_MAGIC_SYSRQ=y

arch/arm/configs/ep93xx_defconfig CONFIG_RTC_DRV_EP93XX=y · line 112

Quoted 10 lines
arch/arm/configs/ep93xx_defconfig +0 -3
-CONFIG_DEBUG_KERNEL=y
 CONFIG_DEBUG_SLAB=y
 CONFIG_DEBUG_SPINLOCK=y
 CONFIG_DEBUG_MUTEXES=y
-# CONFIG_RCU_CPU_STALL_DETECTOR is not set
 CONFIG_DEBUG_USER=y
-CONFIG_DEBUG_ERRORS=y
 CONFIG_DEBUG_LL=y
 # CONFIG_CRYPTO_ANSI_CPRNG is not set
 CONFIG_LIBCRC32C=y

Gah, defconfig changes are a pest. I assume the other removed options are implicitly selected, and their removal is the result of re-minimising the defconfig? Can you put a note about this is the changelog please.

arch/arm/configs/ep93xx_defconfig

Quoted 13 lines
arch/arm/configs/ep93xx_defconfig +13 -0
+static struct clk *ep93xx_ohci_host_clock;
+
+static int ep93xx_ohci_power_on(struct platform_device *pdev)
+{
+	if (!ep93xx_ohci_host_clock) {
+		ep93xx_ohci_host_clock = devm_clk_get(&pdev->dev, NULL);
+		if (IS_ERR(ep93xx_ohci_host_clock))
+			return PTR_ERR(ep93xx_ohci_host_clock);
+	}
+
+	clk_enable(ep93xx_ohci_host_clock);
+
+	return 0;

Nit:

	return clk_enable(ep93xx_ohci_host_clock);

~Ryan

#2 lore raw

PATCH v2 1/1 usb: ohci: remove ep93xx bus glue platform driver

Quoted 109 lines · Ryan Mallon
Quoted 108 lines · H Hartley Sweeten

Convert ep93xx to use the OHCI platform driver and remove the ohci-ep93xx bus glue driver.

Enable CONFIG_OHCI_HCD_PLATFORM and refresh the ep93xx_defconfig so that USB is still enabled by default on the EP93xx platform.

Cc Alan Stern <[email protected]>
Cc Greg Kroah-Hartman <[email protected]>
Cc Ryan Mallon <[email protected]>
Cc Olof Johansson <[email protected]>

---
v2: Use the (*power_off) callback for (*power_suspend), as suggested
by Alan Stern.
Remove the Kconfig change to USB_OHCI_HCD_PLATFORM and refresh the ep93xx_defconfig to enable this option, as suggested by Alan Stern.

 arch/arm/configs/ep93xx_defconfig |  17 +---
 arch/arm/mach-ep93xx/clock.c      |   2 +-
 arch/arm/mach-ep93xx/core.c       |  40 ++++++++-
 drivers/usb/host/ohci-ep93xx.c    | 184 --------------------------------------
 drivers/usb/host/ohci-hcd.c       |  18 ----
 5 files changed, 40 insertions(+), 221 deletions(-)
 delete mode 100644 drivers/usb/host/ohci-ep93xx.c
arch/arm/configs/ep93xx_defconfig +3 -14
index 806005a..6ac5ea7 100644
@@ -1,15 +1,14 @@
-CONFIG_EXPERIMENTAL=y
 CONFIG_SYSVIPC=y
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=14
-CONFIG_SYSFS_DEPRECATED_V2=y
 CONFIG_EXPERT=y
 CONFIG_SLAB=y
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_MODULE_FORCE_UNLOAD=y
 # CONFIG_BLK_DEV_BSG is not set
+CONFIG_PARTITION_ADVANCED=y
 # CONFIG_IOSCHED_CFQ is not set
 CONFIG_ARCH_EP93XX=y
 CONFIG_CRUNCH=y
@@ -47,11 +46,8 @@ CONFIG_IPV6=y
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 # CONFIG_FW_LOADER is not set
 CONFIG_MTD=y
-CONFIG_MTD_CONCAT=y
-CONFIG_MTD_PARTITIONS=y
 CONFIG_MTD_REDBOOT_PARTS=y
 CONFIG_MTD_CMDLINE_PARTS=y
-CONFIG_MTD_CHAR=y
 CONFIG_MTD_BLOCK=y
 CONFIG_MTD_CFI=y
 CONFIG_MTD_CFI_ADV_OPTIONS=y
@@ -67,15 +63,14 @@ CONFIG_SCSI=y
 # CONFIG_SCSI_PROC_FS is not set
 CONFIG_BLK_DEV_SD=y
 CONFIG_NETDEVICES=y
-CONFIG_NET_ETHERNET=y
 CONFIG_EP93XX_ETH=y
 CONFIG_USB_RTL8150=y
 # CONFIG_INPUT is not set
 # CONFIG_SERIO is not set
 # CONFIG_VT is not set
+# CONFIG_LEGACY_PTYS is not set
 CONFIG_SERIAL_AMBA_PL010=y
 CONFIG_SERIAL_AMBA_PL010_CONSOLE=y
-# CONFIG_LEGACY_PTYS is not set
 # CONFIG_HW_RANDOM is not set
 CONFIG_I2C=y
 CONFIG_I2C_CHARDEV=y
@@ -86,9 +81,9 @@ CONFIG_WATCHDOG=y
 CONFIG_EP93XX_WATCHDOG=y
 CONFIG_USB=y
 CONFIG_USB_DEBUG=y
-CONFIG_USB_DEVICEFS=y
 CONFIG_USB_DYNAMIC_MINORS=y
 CONFIG_USB_OHCI_HCD=y
+CONFIG_USB_OHCI_HCD_PLATFORM=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_SERIAL=y
 CONFIG_USB_SERIAL_CONSOLE=y
@@ -100,24 +95,18 @@ CONFIG_RTC_DRV_EP93XX=y
 CONFIG_EXT2_FS=y
 CONFIG_EXT3_FS=y
 # CONFIG_EXT3_FS_XATTR is not set
-CONFIG_INOTIFY=y
 CONFIG_VFAT_FS=y
 CONFIG_TMPFS=y
 CONFIG_JFFS2_FS=y
 CONFIG_NFS_FS=y
-CONFIG_NFS_V3=y
 CONFIG_ROOT_NFS=y
-CONFIG_PARTITION_ADVANCED=y
 CONFIG_NLS_CODEPAGE_437=y
 CONFIG_NLS_ISO8859_1=y
 CONFIG_MAGIC_SYSRQ=y
-CONFIG_DEBUG_KERNEL=y
 CONFIG_DEBUG_SLAB=y
 CONFIG_DEBUG_SPINLOCK=y
 CONFIG_DEBUG_MUTEXES=y
-# CONFIG_RCU_CPU_STALL_DETECTOR is not set
 CONFIG_DEBUG_USER=y
-CONFIG_DEBUG_ERRORS=y
Quoted 8 lines

arch/arm/configs/ep93xx_defconfig CONFIG_RTC_DRV_EP93XX=y · line 112

Quoted 3 lines
arch/arm/configs/ep93xx_defconfig +0 -0
 CONFIG_DEBUG_LL=y
 # CONFIG_CRYPTO_ANSI_CPRNG is not set
 CONFIG_LIBCRC32C=y

Gah, defconfig changes are a pest. I assume the other removed options are implicitly selected, and their removal is the result of re-minimising the defconfig? Can you put a note about this is the changelog please.

Yah... It's a mess.

All I did was:
make ARCH=arm ep93xx_defconfig
make ARCH=arm menuconfig # enable USB_OHCI_HCD_PLATFORM
make ARCH=arm savedefconfig
mv defconfig arch/arm/configs/ep93xx_defconfig

Looks like the last time the ep93xx_defconfig was refreshed was:

commit 07a8c03f3e06129e847acd068b8b89c13357ee64

Author: Uwe Kleine-K?nig <[email protected]>
Date:   Thu Jun 10 07:12:18 2010 +0200

ARM: reduce defconfigs

Hence the ugly changes.

Quoted 16 lines

arch/arm/configs/ep93xx_defconfig

Quoted 13 lines
arch/arm/configs/ep93xx_defconfig +13 -0
+static struct clk *ep93xx_ohci_host_clock;
+
+static int ep93xx_ohci_power_on(struct platform_device *pdev)
+{
+	if (!ep93xx_ohci_host_clock) {
+		ep93xx_ohci_host_clock = devm_clk_get(&pdev->dev, NULL);
+		if (IS_ERR(ep93xx_ohci_host_clock))
+			return PTR_ERR(ep93xx_ohci_host_clock);
+	}
+
+	clk_enable(ep93xx_ohci_host_clock);
+
+	return 0;

Nit:

Quoted 1 line
	return clk_enable(ep93xx_ohci_host_clock);

Ah, good catch. I'll post a v3 tomorrow in case there are any other comments.

Thanks,
Hartley

maintainer
#3 lore raw

PATCH v2 1/1 usb: ohci: remove ep93xx bus glue platform driver

Quoted 17 lines · Hartley Sweeten
Quoted 4 lines · Ryan Mallon

Gah, defconfig changes are a pest. I assume the other removed options are implicitly selected, and their removal is the result of re-minimising the defconfig? Can you put a note about this is the changelog please.

Yah... It's a mess.

All I did was:
make ARCH=arm ep93xx_defconfig
make ARCH=arm menuconfig # enable USB_OHCI_HCD_PLATFORM
make ARCH=arm savedefconfig
mv defconfig arch/arm/configs/ep93xx_defconfig

Looks like the last time the ep93xx_defconfig was refreshed was:

Quoted 7 lines

commit 07a8c03f3e06129e847acd068b8b89c13357ee64

Author: Uwe Kleine-K?nig <[email protected]>
Date:   Thu Jun 10 07:12:18 2010 +0200

ARM: reduce defconfigs

Hence the ugly changes.

It's awfully hard to believe that enabling USB_OHCI_HCD_PLATFORM is responsible for all those other changes.

Maybe this should be done in two stages. First create a patch that describes the differences resulting from:

make ARCH=arm ep93xx_defconfig
make ARCH=arm savedefconfig
mv defconfig arch/arm/configs/ep93xx_defconfig

Then do this patch on top of that one.

Alan Stern

#4 lore raw

PATCH v2 1/1 usb: ohci: remove ep93xx bus glue platform driver

Quoted 23 lines · Alan Stern
Quoted 21 lines · Hartley Sweeten
Quoted 4 lines · Ryan Mallon

Gah, defconfig changes are a pest. I assume the other removed options are implicitly selected, and their removal is the result of re-minimising the defconfig? Can you put a note about this is the changelog please.

Yah... It's a mess.

All I did was:
make ARCH=arm ep93xx_defconfig
make ARCH=arm menuconfig # enable USB_OHCI_HCD_PLATFORM
make ARCH=arm savedefconfig
mv defconfig arch/arm/configs/ep93xx_defconfig

Looks like the last time the ep93xx_defconfig was refreshed was:

commit 07a8c03f3e06129e847acd068b8b89c13357ee64

Author: Uwe Kleine-K?nig <[email protected]>
Date:   Thu Jun 10 07:12:18 2010 +0200
Quoted 6 lines
Quoted 3 lines

ARM: reduce defconfigs

Hence the ugly changes.

It's awfully hard to believe that enabling USB_OHCI_HCD_PLATFORM is responsible for all those other changes.

The 'make savedefconfig' step minimises the defconfig by removing any options that are implicitly selected or options that no longer exist. E.g: 4d42942c: 'mtd: make MTD_CONCAT support mandatory' is responsible for CONFIG_MTD_CONCAT disappearing from the defconfig. Looks the other MTD options have also been removed.

CONFIG_NFS_V3, for example, got removed because it is implicit as of:
981f9fac: 'NFS: Turn v3 on by default'.

'make savedefconfig' also has an annoying tendency to shuffle items around, presumably because the Kconfig files have changed. This is why, for example, the:

# CONFIG_LEGACY_PTYS is not set

line got moved in the diff.

Interestingly CONFIG_INOTIFY got removed because that option doesn't exist anymore. I can't find the exact commit, but things have been moved around and the option is now called CONFIG_INOTIFY_USER (so whoever made the change probably didn't scan through all the defconfigs). It does mean that ep93xx lost support for inotify at some point. Since nobody has complained, I don't think it is a huge loss.

In short, yes the 'make savedefconfig' step is annoying because it creates weird diffs. However, the diffs are correct (cleaning up unused options, etc). The diffs should be inspected to catch things like the inotify case, but otherwise there should be no functional changes.

Quoted 11 lines

Maybe this should be done in two stages. First create a patch that describes the differences resulting from:

make ARCH=arm ep93xx_defconfig
make ARCH=arm savedefconfig
mv defconfig arch/arm/configs/ep93xx_defconfig

Then do this patch on top of that one.

Yeah, I think a pre-patch for "ep93xx: make savedefconfig" would be best.

Are you happy to collect all these patches once they are done? I could take the ep93xx parts, but my tree typically only has a small handful of patches each merge window, so it is probably easier if you grab them all.

Thanks,
~Ryan

maintainer
#5 lore raw

PATCH v2 1/1 usb: ohci: remove ep93xx bus glue platform driver

Quoted 9 lines · Ryan Mallon
Quoted 2 lines

It's awfully hard to believe that enabling USB_OHCI_HCD_PLATFORM is responsible for all those other changes.

The 'make savedefconfig' step minimises the defconfig by removing any options that are implicitly selected or options that no longer exist. E.g: 4d42942c: 'mtd: make MTD_CONCAT support mandatory' is responsible for CONFIG_MTD_CONCAT disappearing from the defconfig. Looks the other MTD options have also been removed.

...

Quoted 5 lines

In short, yes the 'make savedefconfig' step is annoying because it creates weird diffs. However, the diffs are correct (cleaning up unused options, etc). The diffs should be inspected to catch things like the inotify case, but otherwise there should be no functional changes.

Sure, that's what I meant. All that churn was caused by re-minimizing the defconfig file, not by adding USB_OHCI_HCD_PLATFORM.

Quoted 11 lines
Quoted 10 lines

Maybe this should be done in two stages. First create a patch that describes the differences resulting from:

make ARCH=arm ep93xx_defconfig
make ARCH=arm savedefconfig
mv defconfig arch/arm/configs/ep93xx_defconfig

Then do this patch on top of that one.

Quoted 7 lines

Yeah, I think a pre-patch for "ep93xx: make savedefconfig" would be best.

Are you happy to collect all these patches once they are done? I could take the ep93xx parts, but my tree typically only has a small handful of patches each merge window, so it is probably easier if you grab them all.

Greg KH and I can take both patches.

Alan Stern

#6 lore raw

PATCH v2 1/1 usb: ohci: remove ep93xx bus glue platform driver

Quoted 2 lines · Alan Stern

Sure, that's what I meant. All that churn was caused by re-minimizing the defconfig file, not by adding USB_OHCI_HCD_PLATFORM.

As requested, I have split this patch to:
1) refresh the ep93xx_defconfig
2) remove the ep93xx bus glue driver

I just posted the new patch series as v3.

If there are any other issues I will happily fix them.

Quoted 1 line

Greg KH and I can take both patches.

Thanks,
Hartley