| Message ID | 1514561564-24103-1-git-send-email-aford173@gmail.com |
|---|---|
| State | Superseded |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | [U-Boot] Convert CONFIG_TWL4030_USB et al to Kconfig | expand |
Hi, Le vendredi 29 décembre 2017 à 09:32 -0600, Adam Ford a écrit : > This converts the following to Kconfig: > CONFIG_TWL4030_USB > CONFIG_OMAP_USB_PHY > CONFIG_ROCKCHIP_USB2_PHY Thanks for the effort! See one comment below. Otherwise, looks good to me. > Signed-off-by: Adam Ford <aford173@gmail.com> > --- > configs/am43xx_evm_defconfig | 1 + > configs/am43xx_evm_ethboot_defconfig | 1 + > configs/am43xx_evm_qspiboot_defconfig | 1 + > configs/am43xx_evm_usbhost_boot_defconfig | 1 + > configs/am43xx_hs_evm_defconfig | 1 + > configs/am57xx_evm_defconfig | 1 + > configs/am57xx_hs_evm_defconfig | 1 + > configs/cl-som-am57x_defconfig | 1 + > configs/cm_t35_defconfig | 1 + > configs/cm_t43_defconfig | 1 + > configs/dra7xx_evm_defconfig | 1 + > configs/dra7xx_hs_evm_defconfig | 1 + > configs/igep0032_defconfig | 1 + > configs/igep00x0_defconfig | 1 + > configs/nokia_rx51_defconfig | 1 + > configs/omap3_beagle_defconfig | 1 + > configs/omap3_logic_defconfig | 1 + > configs/omap3_zoom1_defconfig | 1 + > configs/sniper_defconfig | 1 + > drivers/usb/Kconfig | 2 ++ > drivers/usb/phy/Kconfig | 17 +++++++++++++++++ > include/configs/am43xx_evm.h | 1 - > include/configs/am57xx_evm.h | 1 - > include/configs/cl-som-am57x.h | 1 - > include/configs/cm_t35.h | 1 - > include/configs/cm_t43.h | 1 - > include/configs/dra7xx_evm.h | 1 - > include/configs/nokia_rx51.h | 1 - > include/configs/omap3_beagle.h | 1 - > include/configs/omap3_igep00x0.h | 1 - > include/configs/omap3_logic.h | 1 - > include/configs/omap3_zoom1.h | 1 - > include/configs/rk3188_common.h | 1 - > include/configs/rk3288_common.h | 1 - > include/configs/sniper.h | 2 -- > scripts/config_whitelist.txt | 3 --- > 36 files changed, 38 insertions(+), 18 deletions(-) > > diff --git a/configs/am43xx_evm_defconfig > b/configs/am43xx_evm_defconfig > index c180214..c75eab3 100644 > --- a/configs/am43xx_evm_defconfig > +++ b/configs/am43xx_evm_defconfig > @@ -49,6 +49,7 @@ CONFIG_USB_DWC3=y > CONFIG_USB_DWC3_GADGET=y > CONFIG_USB_DWC3_OMAP=y > CONFIG_USB_DWC3_PHY_OMAP=y > +CONFIG_OMAP_USB_PHY=y > CONFIG_USB_STORAGE=y > CONFIG_USB_GADGET=y > CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments" > diff --git a/configs/am43xx_evm_ethboot_defconfig > b/configs/am43xx_evm_ethboot_defconfig > index 60f0552..7f2acd9 100644 > --- a/configs/am43xx_evm_ethboot_defconfig > +++ b/configs/am43xx_evm_ethboot_defconfig > @@ -60,6 +60,7 @@ CONFIG_USB_DWC3=y > CONFIG_USB_DWC3_GADGET=y > CONFIG_USB_DWC3_OMAP=y > CONFIG_USB_DWC3_PHY_OMAP=y > +CONFIG_OMAP_USB_PHY=y > CONFIG_USB_STORAGE=y > CONFIG_USB_GADGET=y > CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments" > diff --git a/configs/am43xx_evm_qspiboot_defconfig > b/configs/am43xx_evm_qspiboot_defconfig > index d6a5263..a56abc9 100644 > --- a/configs/am43xx_evm_qspiboot_defconfig > +++ b/configs/am43xx_evm_qspiboot_defconfig > @@ -49,6 +49,7 @@ CONFIG_USB_DWC3=y > CONFIG_USB_DWC3_GADGET=y > CONFIG_USB_DWC3_OMAP=y > CONFIG_USB_DWC3_PHY_OMAP=y > +CONFIG_OMAP_USB_PHY=y > CONFIG_USB_STORAGE=y > CONFIG_USB_GADGET=y > CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments" > diff --git a/configs/am43xx_evm_usbhost_boot_defconfig > b/configs/am43xx_evm_usbhost_boot_defconfig > index 28cf04a..e9c3a05 100644 > --- a/configs/am43xx_evm_usbhost_boot_defconfig > +++ b/configs/am43xx_evm_usbhost_boot_defconfig > @@ -72,6 +72,7 @@ CONFIG_USB_DWC3=y > CONFIG_USB_DWC3_GADGET=y > CONFIG_USB_DWC3_OMAP=y > CONFIG_USB_DWC3_PHY_OMAP=y > +CONFIG_OMAP_USB_PHY=y > CONFIG_USB_STORAGE=y > CONFIG_USB_GADGET=y > CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments" > diff --git a/configs/am43xx_hs_evm_defconfig > b/configs/am43xx_hs_evm_defconfig > index bed0583..e8a641e 100644 > --- a/configs/am43xx_hs_evm_defconfig > +++ b/configs/am43xx_hs_evm_defconfig > @@ -60,6 +60,7 @@ CONFIG_USB_DWC3=y > CONFIG_USB_DWC3_GADGET=y > CONFIG_USB_DWC3_OMAP=y > CONFIG_USB_DWC3_PHY_OMAP=y > +CONFIG_OMAP_USB_PHY=y > CONFIG_USB_STORAGE=y > CONFIG_USB_GADGET=y > CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments" > diff --git a/configs/am57xx_evm_defconfig > b/configs/am57xx_evm_defconfig > index fc96401..470a7ad 100644 > --- a/configs/am57xx_evm_defconfig > +++ b/configs/am57xx_evm_defconfig > @@ -67,6 +67,7 @@ CONFIG_USB_DWC3=y > CONFIG_USB_DWC3_GADGET=y > CONFIG_USB_DWC3_OMAP=y > CONFIG_USB_DWC3_PHY_OMAP=y > +CONFIG_OMAP_USB_PHY=y > CONFIG_USB_STORAGE=y > CONFIG_USB_GADGET=y > CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments" > diff --git a/configs/am57xx_hs_evm_defconfig > b/configs/am57xx_hs_evm_defconfig > index 681e2a5..0800d5f 100644 > --- a/configs/am57xx_hs_evm_defconfig > +++ b/configs/am57xx_hs_evm_defconfig > @@ -70,6 +70,7 @@ CONFIG_USB_DWC3=y > CONFIG_USB_DWC3_GADGET=y > CONFIG_USB_DWC3_OMAP=y > CONFIG_USB_DWC3_PHY_OMAP=y > +CONFIG_OMAP_USB_PHY=y > CONFIG_USB_STORAGE=y > CONFIG_USB_GADGET=y > CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments" > diff --git a/configs/cl-som-am57x_defconfig b/configs/cl-som- > am57x_defconfig > index 9c3031b..e9b6fe0 100644 > --- a/configs/cl-som-am57x_defconfig > +++ b/configs/cl-som-am57x_defconfig > @@ -57,6 +57,7 @@ CONFIG_TI_QSPI=y > CONFIG_USB=y > CONFIG_USB_XHCI_HCD=y > CONFIG_USB_XHCI_DWC3=y > +CONFIG_OMAP_USB_PHY=y > CONFIG_USB_STORAGE=y > CONFIG_USB_HOST_ETHER=y > CONFIG_USB_ETHER_ASIX=y > diff --git a/configs/cm_t35_defconfig b/configs/cm_t35_defconfig > index cfb68b1..0cb6e72 100644 > --- 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_TWL4030_USB=y > CONFIG_USB_STORAGE=y > CONFIG_LCD=y > CONFIG_OF_LIBFDT=y > diff --git a/configs/cm_t43_defconfig b/configs/cm_t43_defconfig > index a621ff2..e234bc6 100644 > --- a/configs/cm_t43_defconfig > +++ b/configs/cm_t43_defconfig > @@ -72,6 +72,7 @@ CONFIG_OMAP3_SPI=y > CONFIG_USB=y > CONFIG_USB_XHCI_HCD=y > CONFIG_USB_XHCI_DWC3=y > +CONFIG_OMAP_USB_PHY=y > CONFIG_USB_STORAGE=y > CONFIG_FAT_WRITE=y > CONFIG_OF_LIBFDT=y > diff --git a/configs/dra7xx_evm_defconfig > b/configs/dra7xx_evm_defconfig > index 716a57b..b13a27e 100644 > --- a/configs/dra7xx_evm_defconfig > +++ b/configs/dra7xx_evm_defconfig > @@ -80,6 +80,7 @@ CONFIG_USB_DWC3=y > CONFIG_USB_DWC3_GADGET=y > CONFIG_USB_DWC3_OMAP=y > CONFIG_USB_DWC3_PHY_OMAP=y > +CONFIG_OMAP_USB_PHY=y > CONFIG_USB_STORAGE=y > CONFIG_USB_GADGET=y > CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments" > diff --git a/configs/dra7xx_hs_evm_defconfig > b/configs/dra7xx_hs_evm_defconfig > index f7418c7..7ccb4f0 100644 > --- a/configs/dra7xx_hs_evm_defconfig > +++ b/configs/dra7xx_hs_evm_defconfig > @@ -82,6 +82,7 @@ CONFIG_USB_DWC3=y > CONFIG_USB_DWC3_GADGET=y > CONFIG_USB_DWC3_OMAP=y > CONFIG_USB_DWC3_PHY_OMAP=y > +CONFIG_OMAP_USB_PHY=y > CONFIG_USB_STORAGE=y > CONFIG_USB_GADGET=y > CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments" > diff --git a/configs/igep0032_defconfig b/configs/igep0032_defconfig > index 60cce77..b0daee1 100644 > --- 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_TWL4030_USB=y > CONFIG_FAT_WRITE=y > CONFIG_BCH=y > CONFIG_OF_LIBFDT=y > diff --git a/configs/igep00x0_defconfig b/configs/igep00x0_defconfig > index d8ece6b..22dbc70 100644 > --- 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_TWL4030_USB=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 570bb3f..e93042e 100644 > --- 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_TWL4030_USB=y > 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 1fea12a..40b99c4 100644 > --- a/configs/omap3_beagle_defconfig > +++ b/configs/omap3_beagle_defconfig > @@ -49,6 +49,7 @@ CONFIG_USB=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" > diff --git a/configs/omap3_logic_defconfig > b/configs/omap3_logic_defconfig > index a34401f..d282efa 100644 > --- a/configs/omap3_logic_defconfig > +++ b/configs/omap3_logic_defconfig > @@ -51,6 +51,7 @@ CONFIG_USB_EHCI_HCD=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" > diff --git a/configs/omap3_zoom1_defconfig > b/configs/omap3_zoom1_defconfig > index db867b1..1a915c5 100644 > --- 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_TWL4030_USB=y > CONFIG_FAT_WRITE=y > CONFIG_OF_LIBFDT=y > diff --git a/configs/sniper_defconfig b/configs/sniper_defconfig > index c75b1ba..a3bae56 100644 > --- 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_TWL4030_USB=y > 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 13e9e49..7de4105 100644 > --- 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/phy/Kconfig" > + > source "drivers/usb/ulpi/Kconfig" > > comment "USB peripherals" > diff --git a/drivers/usb/phy/Kconfig b/drivers/usb/phy/Kconfig > new file mode 100644 > index 0000000..bcc67a0 > --- /dev/null > +++ b/drivers/usb/phy/Kconfig > @@ -0,0 +1,17 @@ > +# > +# (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" > + > +config OMAP_USB_PHY > + bool "OMAP PHY" > + > +config ROCKCHIP_USB2_PHY > + bool "Rockchip USB2 PHY" > diff --git a/include/configs/am43xx_evm.h > b/include/configs/am43xx_evm.h > index 302181b..77f8e76 100644 > --- a/include/configs/am43xx_evm.h > +++ b/include/configs/am43xx_evm.h > @@ -77,7 +77,6 @@ > #define CONFIG_SYS_USB_FAT_BOOT_PARTITION 1 > #define CONFIG_USB_XHCI_OMAP > > -#define CONFIG_OMAP_USB_PHY > #define CONFIG_AM437X_USB2PHY2_HOST > #endif > > diff --git a/include/configs/am57xx_evm.h > b/include/configs/am57xx_evm.h > index 28618a5..7546b3f 100644 > --- a/include/configs/am57xx_evm.h > +++ b/include/configs/am57xx_evm.h > @@ -92,7 +92,6 @@ > /* USB xHCI HOST */ > #define CONFIG_USB_XHCI_OMAP > > -#define CONFIG_OMAP_USB_PHY > #define CONFIG_OMAP_USB3PHY1_HOST > > /* SATA */ > diff --git a/include/configs/cl-som-am57x.h b/include/configs/cl-som- > am57x.h > index 6935b06..4f64672 100644 > --- a/include/configs/cl-som-am57x.h > +++ b/include/configs/cl-som-am57x.h > @@ -77,7 +77,6 @@ > /* USB xHCI HOST */ > #define CONFIG_USB_XHCI_OMAP > > -#define CONFIG_OMAP_USB_PHY > #define CONFIG_OMAP_USB3PHY1_HOST > > /* USB Networking options */ > diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h > index 8abe870..cec99ea 100644 > --- a/include/configs/cm_t35.h > +++ b/include/configs/cm_t35.h > @@ -72,7 +72,6 @@ > 115200} > > /* USB */ > -#define CONFIG_TWL4030_USB > > /* USB device configuration */ > #define CONFIG_USB_DEVICE > diff --git a/include/configs/cm_t43.h b/include/configs/cm_t43.h > index a222491..a564b86 100644 > --- a/include/configs/cm_t43.h > +++ b/include/configs/cm_t43.h > @@ -55,7 +55,6 @@ > > /* USB support */ > #define CONFIG_USB_XHCI_OMAP > -#define CONFIG_OMAP_USB_PHY > #define CONFIG_AM437X_USB2PHY2_HOST > > /* SPI Flash support */ > diff --git a/include/configs/dra7xx_evm.h > b/include/configs/dra7xx_evm.h > index f777d57..ff90b6d 100644 > --- a/include/configs/dra7xx_evm.h > +++ b/include/configs/dra7xx_evm.h > @@ -144,7 +144,6 @@ > /* USB xHCI HOST */ > #define CONFIG_USB_XHCI_OMAP > > -#define CONFIG_OMAP_USB_PHY > #define CONFIG_OMAP_USB2PHY2_HOST > > /* SATA */ > diff --git a/include/configs/nokia_rx51.h > b/include/configs/nokia_rx51.h > index 1c02a8c..c52c6ff 100644 > --- a/include/configs/nokia_rx51.h > +++ b/include/configs/nokia_rx51.h > @@ -83,7 +83,6 @@ > #define CONFIG_SYS_BAUDRATE_TABLE { 4800, 9600, 19200, 38400, 57600, > 115200 } > > /* USB */ > -#define CONFIG_TWL4030_USB > > /* USB device configuration */ > #define CONFIG_USB_DEVICE > diff --git a/include/configs/omap3_beagle.h > b/include/configs/omap3_beagle.h > index f21a843..2fc81db 100644 > --- a/include/configs/omap3_beagle.h > +++ b/include/configs/omap3_beagle.h > @@ -43,7 +43,6 @@ > #define CONFIG_SYS_I2C_NOPROBES {{0x0, 0x0}} > > /* USB */ > -#define CONFIG_TWL4030_USB 1 > > /* USB EHCI */ > > diff --git a/include/configs/omap3_igep00x0.h > b/include/configs/omap3_igep00x0.h > index 9b815e0..4888176 100644 > --- a/include/configs/omap3_igep00x0.h > +++ b/include/configs/omap3_igep00x0.h > @@ -42,7 +42,6 @@ > #define GPIO_IGEP00X0_REVISION_DETECTION 129 > > /* USB */ > -#define CONFIG_TWL4030_USB 1 > > /* USB device configuration */ > #define CONFIG_USB_DEVICE 1 > diff --git a/include/configs/omap3_logic.h > b/include/configs/omap3_logic.h > index a4b29f1..5445186 100644 > --- a/include/configs/omap3_logic.h > +++ b/include/configs/omap3_logic.h > @@ -55,7 +55,6 @@ > /* USB */ > > /* TWL4030 */ > -#define CONFIG_TWL4030_USB > > /* Board NAND Info. */ > #ifdef CONFIG_NAND > diff --git a/include/configs/omap3_zoom1.h > b/include/configs/omap3_zoom1.h > index e5e4bc4..653790e 100644 > --- a/include/configs/omap3_zoom1.h > +++ b/include/configs/omap3_zoom1.h > @@ -35,7 +35,6 @@ > */ > > /* USB */ > -#define CONFIG_TWL4030_USB 1 > > /* USB device configuration */ > #define CONFIG_USB_DEVICE 1 > diff --git a/include/configs/rk3188_common.h > b/include/configs/rk3188_common.h > index 0cb0762..9ab5502 100644 > --- a/include/configs/rk3188_common.h > +++ b/include/configs/rk3188_common.h > @@ -58,7 +58,6 @@ > > #ifndef CONFIG_SPL_BUILD > /* usb otg */ > -#define CONFIG_ROCKCHIP_USB2_PHY > > /* usb host support */ > #define ENV_MEM_LAYOUT_SETTINGS \ > diff --git a/include/configs/rk3288_common.h > b/include/configs/rk3288_common.h > index e2f070f..c2bd378 100644 > --- a/include/configs/rk3288_common.h > +++ b/include/configs/rk3288_common.h > @@ -58,7 +58,6 @@ > > #ifndef CONFIG_SPL_BUILD > /* usb otg */ > -#define CONFIG_ROCKCHIP_USB2_PHY > > /* usb mass storage */ > #define CONFIG_USB_FUNCTION_MASS_STORAGE > diff --git a/include/configs/sniper.h b/include/configs/sniper.h > index 09b5a73..99bee4c 100644 > --- a/include/configs/sniper.h > +++ b/include/configs/sniper.h > @@ -113,8 +113,6 @@ > * USB gadget > */ > > -#define CONFIG_TWL4030_USB > - Please remove the heading "USB gadget" as this change effectively leaves the section empty. > /* > * Environment > */ > diff --git a/scripts/config_whitelist.txt > b/scripts/config_whitelist.txt > index fdf9e55..d12d0eb 100644 > --- a/scripts/config_whitelist.txt > +++ b/scripts/config_whitelist.txt > @@ -1561,7 +1561,6 @@ CONFIG_OMAP_EHCI_PHY2_RESET_GPIO > CONFIG_OMAP_EHCI_PHY3_RESET_GPIO > CONFIG_OMAP_USB2PHY2_HOST > CONFIG_OMAP_USB3PHY1_HOST > -CONFIG_OMAP_USB_PHY > CONFIG_ORIGEN > CONFIG_OS1_ENV_ADDR > CONFIG_OS2_ENV_ADDR > @@ -1830,7 +1829,6 @@ CONFIG_RMSTP9_ENA > CONFIG_ROCKCHIP_CHIP_TAG > CONFIG_ROCKCHIP_MAX_INIT_SIZE > CONFIG_ROCKCHIP_SDHCI_MAX_FREQ > -CONFIG_ROCKCHIP_USB2_PHY > CONFIG_ROM_STUBS > CONFIG_ROOTFS_OFFSET > CONFIG_ROOTPATH > @@ -4814,7 +4812,6 @@ CONFIG_TUXX1 > CONFIG_TWL4030_INPUT > CONFIG_TWL4030_KEYPAD > CONFIG_TWL4030_LED > -CONFIG_TWL4030_USB > CONFIG_TWL6030_INPUT > CONFIG_TWL6030_POWER > CONFIG_TWR
> On 29 Dec 2017, at 16:32, Adam Ford <aford173@gmail.com> wrote: > > This converts the following to Kconfig: > CONFIG_TWL4030_USB > CONFIG_OMAP_USB_PHY > CONFIG_ROCKCHIP_USB2_PHY Please split this into three distinct commits, converting each of these PHY changes in a separate patch. This will make life much easier in case that anyone ever hits this commit (or rather: one of these commits) during a bisect. > Signed-off-by: Adam Ford <aford173@gmail.com> [For the Kconfig-change and the changes affecting the Rockchip sub-arch:] Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
diff --git a/configs/am43xx_evm_defconfig b/configs/am43xx_evm_defconfig index c180214..c75eab3 100644 --- a/configs/am43xx_evm_defconfig +++ b/configs/am43xx_evm_defconfig @@ -49,6 +49,7 @@ CONFIG_USB_DWC3=y CONFIG_USB_DWC3_GADGET=y CONFIG_USB_DWC3_OMAP=y CONFIG_USB_DWC3_PHY_OMAP=y +CONFIG_OMAP_USB_PHY=y CONFIG_USB_STORAGE=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments" diff --git a/configs/am43xx_evm_ethboot_defconfig b/configs/am43xx_evm_ethboot_defconfig index 60f0552..7f2acd9 100644 --- a/configs/am43xx_evm_ethboot_defconfig +++ b/configs/am43xx_evm_ethboot_defconfig @@ -60,6 +60,7 @@ CONFIG_USB_DWC3=y CONFIG_USB_DWC3_GADGET=y CONFIG_USB_DWC3_OMAP=y CONFIG_USB_DWC3_PHY_OMAP=y +CONFIG_OMAP_USB_PHY=y CONFIG_USB_STORAGE=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments" diff --git a/configs/am43xx_evm_qspiboot_defconfig b/configs/am43xx_evm_qspiboot_defconfig index d6a5263..a56abc9 100644 --- a/configs/am43xx_evm_qspiboot_defconfig +++ b/configs/am43xx_evm_qspiboot_defconfig @@ -49,6 +49,7 @@ CONFIG_USB_DWC3=y CONFIG_USB_DWC3_GADGET=y CONFIG_USB_DWC3_OMAP=y CONFIG_USB_DWC3_PHY_OMAP=y +CONFIG_OMAP_USB_PHY=y CONFIG_USB_STORAGE=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments" diff --git a/configs/am43xx_evm_usbhost_boot_defconfig b/configs/am43xx_evm_usbhost_boot_defconfig index 28cf04a..e9c3a05 100644 --- a/configs/am43xx_evm_usbhost_boot_defconfig +++ b/configs/am43xx_evm_usbhost_boot_defconfig @@ -72,6 +72,7 @@ CONFIG_USB_DWC3=y CONFIG_USB_DWC3_GADGET=y CONFIG_USB_DWC3_OMAP=y CONFIG_USB_DWC3_PHY_OMAP=y +CONFIG_OMAP_USB_PHY=y CONFIG_USB_STORAGE=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments" diff --git a/configs/am43xx_hs_evm_defconfig b/configs/am43xx_hs_evm_defconfig index bed0583..e8a641e 100644 --- a/configs/am43xx_hs_evm_defconfig +++ b/configs/am43xx_hs_evm_defconfig @@ -60,6 +60,7 @@ CONFIG_USB_DWC3=y CONFIG_USB_DWC3_GADGET=y CONFIG_USB_DWC3_OMAP=y CONFIG_USB_DWC3_PHY_OMAP=y +CONFIG_OMAP_USB_PHY=y CONFIG_USB_STORAGE=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments" diff --git a/configs/am57xx_evm_defconfig b/configs/am57xx_evm_defconfig index fc96401..470a7ad 100644 --- a/configs/am57xx_evm_defconfig +++ b/configs/am57xx_evm_defconfig @@ -67,6 +67,7 @@ CONFIG_USB_DWC3=y CONFIG_USB_DWC3_GADGET=y CONFIG_USB_DWC3_OMAP=y CONFIG_USB_DWC3_PHY_OMAP=y +CONFIG_OMAP_USB_PHY=y CONFIG_USB_STORAGE=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments" diff --git a/configs/am57xx_hs_evm_defconfig b/configs/am57xx_hs_evm_defconfig index 681e2a5..0800d5f 100644 --- a/configs/am57xx_hs_evm_defconfig +++ b/configs/am57xx_hs_evm_defconfig @@ -70,6 +70,7 @@ CONFIG_USB_DWC3=y CONFIG_USB_DWC3_GADGET=y CONFIG_USB_DWC3_OMAP=y CONFIG_USB_DWC3_PHY_OMAP=y +CONFIG_OMAP_USB_PHY=y CONFIG_USB_STORAGE=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments" diff --git a/configs/cl-som-am57x_defconfig b/configs/cl-som-am57x_defconfig index 9c3031b..e9b6fe0 100644 --- a/configs/cl-som-am57x_defconfig +++ b/configs/cl-som-am57x_defconfig @@ -57,6 +57,7 @@ CONFIG_TI_QSPI=y CONFIG_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y +CONFIG_OMAP_USB_PHY=y CONFIG_USB_STORAGE=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_ASIX=y diff --git a/configs/cm_t35_defconfig b/configs/cm_t35_defconfig index cfb68b1..0cb6e72 100644 --- 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_TWL4030_USB=y CONFIG_USB_STORAGE=y CONFIG_LCD=y CONFIG_OF_LIBFDT=y diff --git a/configs/cm_t43_defconfig b/configs/cm_t43_defconfig index a621ff2..e234bc6 100644 --- a/configs/cm_t43_defconfig +++ b/configs/cm_t43_defconfig @@ -72,6 +72,7 @@ CONFIG_OMAP3_SPI=y CONFIG_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y +CONFIG_OMAP_USB_PHY=y CONFIG_USB_STORAGE=y CONFIG_FAT_WRITE=y CONFIG_OF_LIBFDT=y diff --git a/configs/dra7xx_evm_defconfig b/configs/dra7xx_evm_defconfig index 716a57b..b13a27e 100644 --- a/configs/dra7xx_evm_defconfig +++ b/configs/dra7xx_evm_defconfig @@ -80,6 +80,7 @@ CONFIG_USB_DWC3=y CONFIG_USB_DWC3_GADGET=y CONFIG_USB_DWC3_OMAP=y CONFIG_USB_DWC3_PHY_OMAP=y +CONFIG_OMAP_USB_PHY=y CONFIG_USB_STORAGE=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments" diff --git a/configs/dra7xx_hs_evm_defconfig b/configs/dra7xx_hs_evm_defconfig index f7418c7..7ccb4f0 100644 --- a/configs/dra7xx_hs_evm_defconfig +++ b/configs/dra7xx_hs_evm_defconfig @@ -82,6 +82,7 @@ CONFIG_USB_DWC3=y CONFIG_USB_DWC3_GADGET=y CONFIG_USB_DWC3_OMAP=y CONFIG_USB_DWC3_PHY_OMAP=y +CONFIG_OMAP_USB_PHY=y CONFIG_USB_STORAGE=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments" diff --git a/configs/igep0032_defconfig b/configs/igep0032_defconfig index 60cce77..b0daee1 100644 --- 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_TWL4030_USB=y CONFIG_FAT_WRITE=y CONFIG_BCH=y CONFIG_OF_LIBFDT=y diff --git a/configs/igep00x0_defconfig b/configs/igep00x0_defconfig index d8ece6b..22dbc70 100644 --- 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_TWL4030_USB=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 570bb3f..e93042e 100644 --- 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_TWL4030_USB=y 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 1fea12a..40b99c4 100644 --- a/configs/omap3_beagle_defconfig +++ b/configs/omap3_beagle_defconfig @@ -49,6 +49,7 @@ CONFIG_USB=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" diff --git a/configs/omap3_logic_defconfig b/configs/omap3_logic_defconfig index a34401f..d282efa 100644 --- a/configs/omap3_logic_defconfig +++ b/configs/omap3_logic_defconfig @@ -51,6 +51,7 @@ CONFIG_USB_EHCI_HCD=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" diff --git a/configs/omap3_zoom1_defconfig b/configs/omap3_zoom1_defconfig index db867b1..1a915c5 100644 --- 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_TWL4030_USB=y CONFIG_FAT_WRITE=y CONFIG_OF_LIBFDT=y diff --git a/configs/sniper_defconfig b/configs/sniper_defconfig index c75b1ba..a3bae56 100644 --- 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_TWL4030_USB=y 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 13e9e49..7de4105 100644 --- 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/phy/Kconfig" + source "drivers/usb/ulpi/Kconfig" comment "USB peripherals" diff --git a/drivers/usb/phy/Kconfig b/drivers/usb/phy/Kconfig new file mode 100644 index 0000000..bcc67a0 --- /dev/null +++ b/drivers/usb/phy/Kconfig @@ -0,0 +1,17 @@ +# +# (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" + +config OMAP_USB_PHY + bool "OMAP PHY" + +config ROCKCHIP_USB2_PHY + bool "Rockchip USB2 PHY" diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h index 302181b..77f8e76 100644 --- a/include/configs/am43xx_evm.h +++ b/include/configs/am43xx_evm.h @@ -77,7 +77,6 @@ #define CONFIG_SYS_USB_FAT_BOOT_PARTITION 1 #define CONFIG_USB_XHCI_OMAP -#define CONFIG_OMAP_USB_PHY #define CONFIG_AM437X_USB2PHY2_HOST #endif diff --git a/include/configs/am57xx_evm.h b/include/configs/am57xx_evm.h index 28618a5..7546b3f 100644 --- a/include/configs/am57xx_evm.h +++ b/include/configs/am57xx_evm.h @@ -92,7 +92,6 @@ /* USB xHCI HOST */ #define CONFIG_USB_XHCI_OMAP -#define CONFIG_OMAP_USB_PHY #define CONFIG_OMAP_USB3PHY1_HOST /* SATA */ diff --git a/include/configs/cl-som-am57x.h b/include/configs/cl-som-am57x.h index 6935b06..4f64672 100644 --- a/include/configs/cl-som-am57x.h +++ b/include/configs/cl-som-am57x.h @@ -77,7 +77,6 @@ /* USB xHCI HOST */ #define CONFIG_USB_XHCI_OMAP -#define CONFIG_OMAP_USB_PHY #define CONFIG_OMAP_USB3PHY1_HOST /* USB Networking options */ diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h index 8abe870..cec99ea 100644 --- a/include/configs/cm_t35.h +++ b/include/configs/cm_t35.h @@ -72,7 +72,6 @@ 115200} /* USB */ -#define CONFIG_TWL4030_USB /* USB device configuration */ #define CONFIG_USB_DEVICE diff --git a/include/configs/cm_t43.h b/include/configs/cm_t43.h index a222491..a564b86 100644 --- a/include/configs/cm_t43.h +++ b/include/configs/cm_t43.h @@ -55,7 +55,6 @@ /* USB support */ #define CONFIG_USB_XHCI_OMAP -#define CONFIG_OMAP_USB_PHY #define CONFIG_AM437X_USB2PHY2_HOST /* SPI Flash support */ diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h index f777d57..ff90b6d 100644 --- a/include/configs/dra7xx_evm.h +++ b/include/configs/dra7xx_evm.h @@ -144,7 +144,6 @@ /* USB xHCI HOST */ #define CONFIG_USB_XHCI_OMAP -#define CONFIG_OMAP_USB_PHY #define CONFIG_OMAP_USB2PHY2_HOST /* SATA */ diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h index 1c02a8c..c52c6ff 100644 --- a/include/configs/nokia_rx51.h +++ b/include/configs/nokia_rx51.h @@ -83,7 +83,6 @@ #define CONFIG_SYS_BAUDRATE_TABLE { 4800, 9600, 19200, 38400, 57600, 115200 } /* USB */ -#define CONFIG_TWL4030_USB /* USB device configuration */ #define CONFIG_USB_DEVICE diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index f21a843..2fc81db 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -43,7 +43,6 @@ #define CONFIG_SYS_I2C_NOPROBES {{0x0, 0x0}} /* USB */ -#define CONFIG_TWL4030_USB 1 /* USB EHCI */ diff --git a/include/configs/omap3_igep00x0.h b/include/configs/omap3_igep00x0.h index 9b815e0..4888176 100644 --- a/include/configs/omap3_igep00x0.h +++ b/include/configs/omap3_igep00x0.h @@ -42,7 +42,6 @@ #define GPIO_IGEP00X0_REVISION_DETECTION 129 /* USB */ -#define CONFIG_TWL4030_USB 1 /* USB device configuration */ #define CONFIG_USB_DEVICE 1 diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h index a4b29f1..5445186 100644 --- a/include/configs/omap3_logic.h +++ b/include/configs/omap3_logic.h @@ -55,7 +55,6 @@ /* USB */ /* TWL4030 */ -#define CONFIG_TWL4030_USB /* Board NAND Info. */ #ifdef CONFIG_NAND diff --git a/include/configs/omap3_zoom1.h b/include/configs/omap3_zoom1.h index e5e4bc4..653790e 100644 --- a/include/configs/omap3_zoom1.h +++ b/include/configs/omap3_zoom1.h @@ -35,7 +35,6 @@ */ /* USB */ -#define CONFIG_TWL4030_USB 1 /* USB device configuration */ #define CONFIG_USB_DEVICE 1 diff --git a/include/configs/rk3188_common.h b/include/configs/rk3188_common.h index 0cb0762..9ab5502 100644 --- a/include/configs/rk3188_common.h +++ b/include/configs/rk3188_common.h @@ -58,7 +58,6 @@ #ifndef CONFIG_SPL_BUILD /* usb otg */ -#define CONFIG_ROCKCHIP_USB2_PHY /* usb host support */ #define ENV_MEM_LAYOUT_SETTINGS \ diff --git a/include/configs/rk3288_common.h b/include/configs/rk3288_common.h index e2f070f..c2bd378 100644 --- a/include/configs/rk3288_common.h +++ b/include/configs/rk3288_common.h @@ -58,7 +58,6 @@ #ifndef CONFIG_SPL_BUILD /* usb otg */ -#define CONFIG_ROCKCHIP_USB2_PHY /* usb mass storage */ #define CONFIG_USB_FUNCTION_MASS_STORAGE diff --git a/include/configs/sniper.h b/include/configs/sniper.h index 09b5a73..99bee4c 100644 --- a/include/configs/sniper.h +++ b/include/configs/sniper.h @@ -113,8 +113,6 @@ * USB gadget */ -#define CONFIG_TWL4030_USB - /* * Environment */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index fdf9e55..d12d0eb 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -1561,7 +1561,6 @@ CONFIG_OMAP_EHCI_PHY2_RESET_GPIO CONFIG_OMAP_EHCI_PHY3_RESET_GPIO CONFIG_OMAP_USB2PHY2_HOST CONFIG_OMAP_USB3PHY1_HOST -CONFIG_OMAP_USB_PHY CONFIG_ORIGEN CONFIG_OS1_ENV_ADDR CONFIG_OS2_ENV_ADDR @@ -1830,7 +1829,6 @@ CONFIG_RMSTP9_ENA CONFIG_ROCKCHIP_CHIP_TAG CONFIG_ROCKCHIP_MAX_INIT_SIZE CONFIG_ROCKCHIP_SDHCI_MAX_FREQ -CONFIG_ROCKCHIP_USB2_PHY CONFIG_ROM_STUBS CONFIG_ROOTFS_OFFSET CONFIG_ROOTPATH @@ -4814,7 +4812,6 @@ CONFIG_TUXX1 CONFIG_TWL4030_INPUT CONFIG_TWL4030_KEYPAD CONFIG_TWL4030_LED -CONFIG_TWL4030_USB CONFIG_TWL6030_INPUT CONFIG_TWL6030_POWER CONFIG_TWR
This converts the following to Kconfig: CONFIG_TWL4030_USB CONFIG_OMAP_USB_PHY CONFIG_ROCKCHIP_USB2_PHY Signed-off-by: Adam Ford <aford173@gmail.com> --- configs/am43xx_evm_defconfig | 1 + configs/am43xx_evm_ethboot_defconfig | 1 + configs/am43xx_evm_qspiboot_defconfig | 1 + configs/am43xx_evm_usbhost_boot_defconfig | 1 + configs/am43xx_hs_evm_defconfig | 1 + configs/am57xx_evm_defconfig | 1 + configs/am57xx_hs_evm_defconfig | 1 + configs/cl-som-am57x_defconfig | 1 + configs/cm_t35_defconfig | 1 + configs/cm_t43_defconfig | 1 + configs/dra7xx_evm_defconfig | 1 + configs/dra7xx_hs_evm_defconfig | 1 + configs/igep0032_defconfig | 1 + configs/igep00x0_defconfig | 1 + configs/nokia_rx51_defconfig | 1 + configs/omap3_beagle_defconfig | 1 + configs/omap3_logic_defconfig | 1 + configs/omap3_zoom1_defconfig | 1 + configs/sniper_defconfig | 1 + drivers/usb/Kconfig | 2 ++ drivers/usb/phy/Kconfig | 17 +++++++++++++++++ include/configs/am43xx_evm.h | 1 - include/configs/am57xx_evm.h | 1 - include/configs/cl-som-am57x.h | 1 - include/configs/cm_t35.h | 1 - include/configs/cm_t43.h | 1 - include/configs/dra7xx_evm.h | 1 - include/configs/nokia_rx51.h | 1 - include/configs/omap3_beagle.h | 1 - include/configs/omap3_igep00x0.h | 1 - include/configs/omap3_logic.h | 1 - include/configs/omap3_zoom1.h | 1 - include/configs/rk3188_common.h | 1 - include/configs/rk3288_common.h | 1 - include/configs/sniper.h | 2 -- scripts/config_whitelist.txt | 3 --- 36 files changed, 38 insertions(+), 18 deletions(-)