Convert CONFIG_TWL4030_USB to Kconfig

This converts the following to Kconfig:
   CONFIG_TWL4030_USB

Signed-off-by: Adam Ford <aford173@gmail.com>

diff --git a/configs/cm_t35_defconfig b/configs/cm_t35_defconfig
index cfb68b1cd2df86bdda09902b9bd16896246c2ab3..0cb6e7277d08329a5cf6fd073d97fa158fa650f9 100644 (file)
--- a/configs/cm_t35_defconfig
+++ b/configs/cm_t35_defconfig
@@ -52,6 +52,7 @@ CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_MUSB_UDC=y
 CONFIG_USB_OMAP3=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_MUSB_UDC=y
 CONFIG_USB_OMAP3=y

+CONFIG_TWL4030_USB=y

 CONFIG_USB_STORAGE=y
 CONFIG_LCD=y
 CONFIG_OF_LIBFDT=y
 CONFIG_USB_STORAGE=y
 CONFIG_LCD=y
 CONFIG_OF_LIBFDT=y

diff --git a/configs/igep0032_defconfig b/configs/igep0032_defconfig
index 60cce779cda2f19aedf51f57bca578a4f9001ca1..b0daee1a619ba1506c389015dfd1ac2029499997 100644 (file)
--- a/configs/igep0032_defconfig
+++ b/configs/igep0032_defconfig
@@ -42,6 +42,7 @@ CONFIG_OMAP3_SPI=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_UDC=y
 CONFIG_USB_OMAP3=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_UDC=y
 CONFIG_USB_OMAP3=y

+CONFIG_TWL4030_USB=y

 CONFIG_FAT_WRITE=y
 CONFIG_BCH=y
 CONFIG_OF_LIBFDT=y
 CONFIG_FAT_WRITE=y
 CONFIG_BCH=y
 CONFIG_OF_LIBFDT=y

diff --git a/configs/igep00x0_defconfig b/configs/igep00x0_defconfig
index d8ece6bbee84e7988f2b193fdb03b412652e76ab..22dbc706153805f0c43686f6c38b0df7167c9ab7 100644 (file)
--- a/configs/igep00x0_defconfig
+++ b/configs/igep00x0_defconfig
@@ -43,6 +43,7 @@ CONFIG_OMAP3_SPI=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_UDC=y
 CONFIG_USB_OMAP3=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_UDC=y
 CONFIG_USB_OMAP3=y

+CONFIG_TWL4030_USB=y

 CONFIG_FAT_WRITE=y
 CONFIG_BCH=y
 CONFIG_OF_LIBFDT=y
 CONFIG_FAT_WRITE=y
 CONFIG_BCH=y
 CONFIG_OF_LIBFDT=y

diff --git a/configs/nokia_rx51_defconfig b/configs/nokia_rx51_defconfig
index 570bb3f7acc03d2afc5a6aab3e25616e71db8ad1..e93042e76af2700ea58638c99fbb54d6d98018f7 100644 (file)
--- a/configs/nokia_rx51_defconfig
+++ b/configs/nokia_rx51_defconfig
@@ -30,6 +30,7 @@ CONFIG_USB=y
 CONFIG_USB_MUSB_HCD=y
 CONFIG_USB_MUSB_UDC=y
 CONFIG_USB_OMAP3=y
 CONFIG_USB_MUSB_HCD=y
 CONFIG_USB_MUSB_UDC=y
 CONFIG_USB_OMAP3=y

+CONFIG_TWL4030_USB=y

 CONFIG_VIDEO=y
 CONFIG_CFB_CONSOLE_ANSI=y
 # CONFIG_VGA_AS_SINGLE_DEVICE is not set
 CONFIG_VIDEO=y
 CONFIG_CFB_CONSOLE_ANSI=y
 # CONFIG_VGA_AS_SINGLE_DEVICE is not set

diff --git a/configs/omap3_beagle_defconfig b/configs/omap3_beagle_defconfig
index 33fd1462c484728bc3ba998e9039f2aa1ac0f445..318c1f934679dc4e0ed4d0d50fad85131881229d 100644 (file)
--- a/configs/omap3_beagle_defconfig
+++ b/configs/omap3_beagle_defconfig
@@ -53,6 +53,7 @@ CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_MUSB_GADGET=y
 CONFIG_USB_MUSB_OMAP2PLUS=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_MUSB_GADGET=y
 CONFIG_USB_MUSB_OMAP2PLUS=y

+CONFIG_TWL4030_USB=y

 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="TI"
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="TI"

diff --git a/configs/omap3_logic_defconfig b/configs/omap3_logic_defconfig
index 3abe8885f0fa78363e61d909aff389335b9eaf22..3482538d78162d9eb505680d3b9644d79377672f 100644 (file)
--- a/configs/omap3_logic_defconfig
+++ b/configs/omap3_logic_defconfig
@@ -53,6 +53,7 @@ CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_OMAP3=y
 CONFIG_USB_MUSB_GADGET=y
 CONFIG_USB_MUSB_OMAP2PLUS=y
 CONFIG_USB_OMAP3=y
 CONFIG_USB_MUSB_GADGET=y
 CONFIG_USB_MUSB_OMAP2PLUS=y

+CONFIG_TWL4030_USB=y

 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="TI"
 CONFIG_USB_STORAGE=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="TI"

diff --git a/configs/omap3_zoom1_defconfig b/configs/omap3_zoom1_defconfig
index db867b1f2c641b4a44b7a43da392a64c7fe2d412..1a915c5128a740873a76df31dfc53de81d4c2dab 100644 (file)
--- a/configs/omap3_zoom1_defconfig
+++ b/configs/omap3_zoom1_defconfig
@@ -44,5 +44,6 @@ CONFIG_OMAP3_SPI=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_UDC=y
 CONFIG_USB_OMAP3=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_UDC=y
 CONFIG_USB_OMAP3=y

+CONFIG_TWL4030_USB=y

 CONFIG_FAT_WRITE=y
 CONFIG_OF_LIBFDT=y
 CONFIG_FAT_WRITE=y
 CONFIG_OF_LIBFDT=y

diff --git a/configs/sniper_defconfig b/configs/sniper_defconfig
index c75b1ba4ef0386c085fa95c2b4626eaba8ec9766..a3bae56cdaf671cd440ad3e45f49d2bb4b0155cb 100644 (file)
--- a/configs/sniper_defconfig
+++ b/configs/sniper_defconfig
@@ -40,6 +40,7 @@ CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_GADGET=y
 CONFIG_USB_MUSB_OMAP2PLUS=y
 CONFIG_USB=y
 CONFIG_USB_MUSB_GADGET=y
 CONFIG_USB_MUSB_OMAP2PLUS=y

+CONFIG_TWL4030_USB=y

 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
 CONFIG_USB_GADGET_VENDOR_NUM=0x0451
 CONFIG_USB_GADGET=y
 CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments"
 CONFIG_USB_GADGET_VENDOR_NUM=0x0451

diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig
index 13e9e49b22bca2abf1c411d4ccc94df1498bc0cf..7de41057ca1bbdb8752aed40b34bc26809de358c 100644 (file)
--- a/drivers/usb/Kconfig
+++ b/drivers/usb/Kconfig
@@ -57,6 +57,8 @@ source "drivers/usb/musb-new/Kconfig"
 
 source "drivers/usb/emul/Kconfig"
 
 
 source "drivers/usb/emul/Kconfig"
 

+source "drivers/usb/phy/Kconfig"
+

 source "drivers/usb/ulpi/Kconfig"
 
 comment "USB peripherals"
 source "drivers/usb/ulpi/Kconfig"
 
 comment "USB peripherals"

diff --git a/drivers/usb/phy/Kconfig b/drivers/usb/phy/Kconfig
new file mode 100644 (file)
index 0000000..943a966
--- /dev/null
+++ b/drivers/usb/phy/Kconfig
@@ -0,0 +1,12 @@
+#
+# (C) Copyright 2017
+# Adam Ford, Logic PD, aford173@gmail.com
+#
+# SPDX-License-Identifier:     GPL-2.0+
+#
+
+comment "USB Phy"
+
+config TWL4030_USB
+       bool "TWL4030 PHY"
+

diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h
index 8abe870e9f2c5dcdcf53584f7f3ae4b4372be244..3c64cb575cfaf89f6f5e2f7b7bcb5d729cb2ff57 100644 (file)
--- a/include/configs/cm_t35.h
+++ b/include/configs/cm_t35.h
@@ -71,9 +71,6 @@
 #define CONFIG_SYS_BAUDRATE_TABLE      {4800, 9600, 19200, 38400, 57600,\
                                        115200}
 
 #define CONFIG_SYS_BAUDRATE_TABLE      {4800, 9600, 19200, 38400, 57600,\
                                        115200}
 

-/* USB */
-#define CONFIG_TWL4030_USB
-

 /* USB device configuration */
 #define CONFIG_USB_DEVICE
 #define CONFIG_USB_TTY
 /* USB device configuration */
 #define CONFIG_USB_DEVICE
 #define CONFIG_USB_TTY

diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h
index 1c02a8ca316d0c90b4c86dd711a886f396b27fde..00509e8508ade5df9d7d6161cfe28bb75f53c649 100644 (file)
--- a/include/configs/nokia_rx51.h
+++ b/include/configs/nokia_rx51.h
@@ -82,9 +82,6 @@
 #define CONFIG_ENV_OVERWRITE
 #define CONFIG_SYS_BAUDRATE_TABLE { 4800, 9600, 19200, 38400, 57600, 115200 }
 
 #define CONFIG_ENV_OVERWRITE
 #define CONFIG_SYS_BAUDRATE_TABLE { 4800, 9600, 19200, 38400, 57600, 115200 }
 

-/* USB */
-#define CONFIG_TWL4030_USB
-

 /* USB device configuration */
 #define CONFIG_USB_DEVICE
 #define CONFIG_USBD_VENDORID           0x0421
 /* USB device configuration */
 #define CONFIG_USB_DEVICE
 #define CONFIG_USBD_VENDORID           0x0421

diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
index 7d109a43dc3df4f2b39c03ddb7ee499e745e4337..d3dfe60bb08fc810992381fd2484d76d3db94d47 100644 (file)
--- a/include/configs/omap3_beagle.h
+++ b/include/configs/omap3_beagle.h
@@ -62,7 +62,6 @@
 
 /* MUSB */
 #define CONFIG_USB_OMAP3
 
 /* MUSB */
 #define CONFIG_USB_OMAP3

-#define CONFIG_TWL4030_USB

 
 /* USB EHCI */
 #define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO       147
 
 /* USB EHCI */
 #define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO       147

diff --git a/include/configs/omap3_igep00x0.h b/include/configs/omap3_igep00x0.h
index 9b815e03f71b11e89577d2330ccd7116c9b71450..76d8e13d52c107d1d5bc79bb062d4d241d894627 100644 (file)
--- a/include/configs/omap3_igep00x0.h
+++ b/include/configs/omap3_igep00x0.h
@@ -41,9 +41,6 @@
 #define GPIO_IGEP00X0_BOARD_DETECTION          28
 #define GPIO_IGEP00X0_REVISION_DETECTION       129
 
 #define GPIO_IGEP00X0_BOARD_DETECTION          28
 #define GPIO_IGEP00X0_REVISION_DETECTION       129
 

-/* USB */
-#define CONFIG_TWL4030_USB             1
-

 /* USB device configuration */
 #define CONFIG_USB_DEVICE              1
 #define CONFIG_USB_TTY                 1
 /* USB device configuration */
 #define CONFIG_USB_DEVICE              1
 #define CONFIG_USB_TTY                 1

diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h
index a4b29f18124eb08dcc10cb0ba8590c743002c9f3..70745a882cbd4ead6665d3bea62fffa2732d38bb 100644 (file)
--- a/include/configs/omap3_logic.h
+++ b/include/configs/omap3_logic.h
@@ -52,11 +52,6 @@
 /* I2C */
 #define CONFIG_SYS_I2C_EEPROM_ADDR     0x50    /* EEPROM AT24C64      */
 
 /* I2C */
 #define CONFIG_SYS_I2C_EEPROM_ADDR     0x50    /* EEPROM AT24C64      */
 

-/* USB */
-
-/* TWL4030 */
-#define CONFIG_TWL4030_USB
-

 /* Board NAND Info. */
 #ifdef CONFIG_NAND
 #define CONFIG_SYS_NAND_ADDR           NAND_BASE /* physical address */
 /* Board NAND Info. */
 #ifdef CONFIG_NAND
 #define CONFIG_SYS_NAND_ADDR           NAND_BASE /* physical address */

diff --git a/include/configs/omap3_zoom1.h b/include/configs/omap3_zoom1.h
index e5e4bc4c8e2be60fed508b8beb5fbb0cdcd624df..cc7c2fdf0435d25baaaa9a3c231c8be0bd33b7c2 100644 (file)
--- a/include/configs/omap3_zoom1.h
+++ b/include/configs/omap3_zoom1.h
@@ -34,9 +34,6 @@
  * Hardware drivers
  */
 
  * Hardware drivers
  */
 

-/* USB */
-#define CONFIG_TWL4030_USB             1
-

 /* USB device configuration */
 #define CONFIG_USB_DEVICE              1
 #define CONFIG_USB_TTY                 1
 /* USB device configuration */
 #define CONFIG_USB_DEVICE              1
 #define CONFIG_USB_TTY                 1

diff --git a/include/configs/sniper.h b/include/configs/sniper.h
index 09b5a73ec0064f8c5537b1dd57e04542527cbd7c..0ed72cf901b2f9531b4c9e94aa3579eea5af0fb6 100644 (file)
--- a/include/configs/sniper.h
+++ b/include/configs/sniper.h
@@ -109,12 +109,6 @@
 #define CONFIG_SYS_BAUDRATE_TABLE      { 4800, 9600, 19200, 38400, 57600, \
                                          115200 }
 
 #define CONFIG_SYS_BAUDRATE_TABLE      { 4800, 9600, 19200, 38400, 57600, \
                                          115200 }
 

-/*
- * USB gadget
- */
-
-#define CONFIG_TWL4030_USB
-

 /*
  * Environment
  */
 /*
  * Environment
  */

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 2fea7aefaccc54a5960ed5c60510e3c7b7cac5a7..20d5fbec313f548a23b0d8f26a77231e11f94eac 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -4747,7 +4747,6 @@ CONFIG_TUXX1
 CONFIG_TWL4030_INPUT
 CONFIG_TWL4030_KEYPAD
 CONFIG_TWL4030_LED
 CONFIG_TWL4030_INPUT
 CONFIG_TWL4030_KEYPAD
 CONFIG_TWL4030_LED

-CONFIG_TWL4030_USB

 CONFIG_TWL6030_INPUT
 CONFIG_TWL6030_POWER
 CONFIG_TWR
 CONFIG_TWL6030_INPUT
 CONFIG_TWL6030_POWER
 CONFIG_TWR