qiurui
/
rv1126-uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

UPSTREAM: usb: host: replace xhci-keystone driver by the generic dwc3 driver 

The keystone platforms can use the generic DC3 driver. Removing the
keystone-spcecific xchi driver and add the configuration options to enable
the generic DWC3 driver on all K2 platforms.

Conflicts:
	configs/k2e_evm_defconfig
	configs/k2e_hs_evm_defconfig
	configs/k2g_evm_defconfig
	configs/k2g_hs_evm_defconfig
	configs/k2hk_evm_defconfig
	configs/k2hk_hs_evm_defconfig
	configs/k2l_evm_defconfig
	configs/k2l_hs_evm_defconfig
	drivers/usb/host/xhci-keystone.c

Change-Id: I0d708152a220704d24b86c528ee7ace2b0b05a4a
Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
(cherry picked from commit 4dd76d0f96ab18a2bda622ec4dac822e908dd069)
This commit is contained in:
Jean-Jacques Hiblot 2018-12-04 11:13:00 +01:00 committed by Frank Wang
parent 4323bebbd5
commit 5277273c32
10 changed files with 73 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
configs/k2e_evm_defconfig
View File

@ -34,6 +34,7 @@ CONFIG_ENV_IS_IN_NAND=y
CONFIG_NET_RANDOM_ETHADDR=y CONFIG_NET_RANDOM_ETHADDR=y
CONFIG_DM=y CONFIG_DM=y
CONFIG_TI_AEMIF=y CONFIG_TI_AEMIF=y
CONFIG_MISC=y
# CONFIG_MMC is not set # CONFIG_MMC is not set
CONFIG_NAND=y CONFIG_NAND=y
CONFIG_NAND_DAVINCI=y CONFIG_NAND_DAVINCI=y
@ -42,12 +43,19 @@ CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_STMICRO=y CONFIG_SPI_FLASH_STMICRO=y
CONFIG_PHYLIB=y CONFIG_PHYLIB=y
CONFIG_DM_ETH=y CONFIG_DM_ETH=y
CONFIG_MII=y
CONFIG_PHY=y
CONFIG_NOP_PHY=y
CONFIG_KEYSTONE_USB_PHY=y
CONFIG_DM_SERIAL=y CONFIG_DM_SERIAL=y
CONFIG_SYS_NS16550=y CONFIG_SYS_NS16550=y
CONFIG_SPI=y CONFIG_SPI=y
CONFIG_DM_SPI=y CONFIG_DM_SPI=y
CONFIG_DAVINCI_SPI=y CONFIG_DAVINCI_SPI=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_DM_USB=y
CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_HCD=y
CONFIG_USB_XHCI_DWC3=y CONFIG_USB_XHCI_DWC3=y
CONFIG_USB_DWC3=y
CONFIG_USB_DWC3_GENERIC=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y

8
configs/k2e_hs_evm_defconfig
View File

@ -23,6 +23,7 @@ CONFIG_ENV_IS_IN_NAND=y
CONFIG_NET_RANDOM_ETHADDR=y CONFIG_NET_RANDOM_ETHADDR=y
CONFIG_DM=y CONFIG_DM=y
CONFIG_TI_AEMIF=y CONFIG_TI_AEMIF=y
CONFIG_MISC=y
# CONFIG_MMC is not set # CONFIG_MMC is not set
CONFIG_NAND=y CONFIG_NAND=y
CONFIG_NAND_DAVINCI=y CONFIG_NAND_DAVINCI=y
@ -31,12 +32,19 @@ CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_STMICRO=y CONFIG_SPI_FLASH_STMICRO=y
CONFIG_PHYLIB=y CONFIG_PHYLIB=y
CONFIG_DM_ETH=y CONFIG_DM_ETH=y
CONFIG_MII=y
CONFIG_PHY=y
CONFIG_NOP_PHY=y
CONFIG_KEYSTONE_USB_PHY=y
CONFIG_DM_SERIAL=y CONFIG_DM_SERIAL=y
CONFIG_SYS_NS16550=y CONFIG_SYS_NS16550=y
CONFIG_SPI=y CONFIG_SPI=y
CONFIG_DM_SPI=y CONFIG_DM_SPI=y
CONFIG_DAVINCI_SPI=y CONFIG_DAVINCI_SPI=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_DM_USB=y
CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_HCD=y
CONFIG_USB_XHCI_DWC3=y CONFIG_USB_XHCI_DWC3=y
CONFIG_USB_DWC3=y
CONFIG_USB_DWC3_GENERIC=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y

11
configs/k2g_evm_defconfig
View File

@ -32,6 +32,8 @@ CONFIG_OF_CONTROL=y
CONFIG_OF_LIST="keystone-k2g-generic keystone-k2g-evm keystone-k2g-ice" CONFIG_OF_LIST="keystone-k2g-generic keystone-k2g-evm keystone-k2g-ice"
CONFIG_DM=y CONFIG_DM=y
# CONFIG_BLK is not set # CONFIG_BLK is not set
CONFIG_SYS_I2C_DAVINCI=y
CONFIG_MISC=y
CONFIG_DM_MMC=y CONFIG_DM_MMC=y
CONFIG_MMC_OMAP_HS=y CONFIG_MMC_OMAP_HS=y
CONFIG_NAND=y CONFIG_NAND=y
@ -45,6 +47,12 @@ CONFIG_SPI_FLASH_STMICRO=y
CONFIG_PHYLIB=y CONFIG_PHYLIB=y
CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL=y
CONFIG_DM_ETH=y CONFIG_DM_ETH=y
<<<<<<< HEAD
=======
CONFIG_MII=y
CONFIG_PHY=y
CONFIG_NOP_PHY=y
>>>>>>> 4dd76d0... usb: host: replace xhci-keystone driver by the generic dwc3 driver
CONFIG_REMOTEPROC_TI_POWER=y CONFIG_REMOTEPROC_TI_POWER=y
CONFIG_DM_SERIAL=y CONFIG_DM_SERIAL=y
CONFIG_SYS_NS16550=y CONFIG_SYS_NS16550=y
@ -52,6 +60,9 @@ CONFIG_SPI=y
CONFIG_DM_SPI=y CONFIG_DM_SPI=y
CONFIG_DAVINCI_SPI=y CONFIG_DAVINCI_SPI=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_DM_USB=y
CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_HCD=y
CONFIG_USB_XHCI_DWC3=y CONFIG_USB_XHCI_DWC3=y
CONFIG_USB_DWC3=y
CONFIG_USB_DWC3_GENERIC=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y

11
configs/k2g_hs_evm_defconfig
View File

@ -20,6 +20,8 @@ CONFIG_EFI_PARTITION=y
CONFIG_OF_CONTROL=y CONFIG_OF_CONTROL=y
CONFIG_DM=y CONFIG_DM=y
# CONFIG_BLK is not set # CONFIG_BLK is not set
CONFIG_SYS_I2C_DAVINCI=y
CONFIG_MISC=y
CONFIG_DM_MMC=y CONFIG_DM_MMC=y
CONFIG_MMC_OMAP_HS=y CONFIG_MMC_OMAP_HS=y
CONFIG_NAND=y CONFIG_NAND=y
@ -33,6 +35,12 @@ CONFIG_SPI_FLASH_STMICRO=y
CONFIG_PHYLIB=y CONFIG_PHYLIB=y
CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL=y
CONFIG_DM_ETH=y CONFIG_DM_ETH=y
<<<<<<< HEAD
=======
CONFIG_MII=y
CONFIG_PHY=y
CONFIG_NOP_PHY=y
>>>>>>> 4dd76d0... usb: host: replace xhci-keystone driver by the generic dwc3 driver
CONFIG_REMOTEPROC_TI_POWER=y CONFIG_REMOTEPROC_TI_POWER=y
CONFIG_DM_SERIAL=y CONFIG_DM_SERIAL=y
CONFIG_SYS_NS16550=y CONFIG_SYS_NS16550=y
@ -40,6 +48,9 @@ CONFIG_SPI=y
CONFIG_DM_SPI=y CONFIG_DM_SPI=y
CONFIG_DAVINCI_SPI=y CONFIG_DAVINCI_SPI=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_DM_USB=y
CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_HCD=y
CONFIG_USB_XHCI_DWC3=y CONFIG_USB_XHCI_DWC3=y
CONFIG_USB_DWC3=y
CONFIG_USB_DWC3_GENERIC=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y

11
configs/k2hk_evm_defconfig
View File

@ -34,6 +34,7 @@ CONFIG_ENV_IS_IN_NAND=y
CONFIG_NET_RANDOM_ETHADDR=y CONFIG_NET_RANDOM_ETHADDR=y
CONFIG_DM=y CONFIG_DM=y
CONFIG_TI_AEMIF=y CONFIG_TI_AEMIF=y
CONFIG_MISC=y
# CONFIG_MMC is not set # CONFIG_MMC is not set
CONFIG_NAND=y CONFIG_NAND=y
CONFIG_NAND_DAVINCI=y CONFIG_NAND_DAVINCI=y
@ -42,12 +43,22 @@ CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_STMICRO=y CONFIG_SPI_FLASH_STMICRO=y
CONFIG_PHYLIB=y CONFIG_PHYLIB=y
CONFIG_DM_ETH=y CONFIG_DM_ETH=y
<<<<<<< HEAD
=======
CONFIG_MII=y
CONFIG_PHY=y
CONFIG_NOP_PHY=y
CONFIG_KEYSTONE_USB_PHY=y
>>>>>>> 4dd76d0... usb: host: replace xhci-keystone driver by the generic dwc3 driver
CONFIG_DM_SERIAL=y CONFIG_DM_SERIAL=y
CONFIG_SYS_NS16550=y CONFIG_SYS_NS16550=y
CONFIG_SPI=y CONFIG_SPI=y
CONFIG_DM_SPI=y CONFIG_DM_SPI=y
CONFIG_DAVINCI_SPI=y CONFIG_DAVINCI_SPI=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_DM_USB=y
CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_HCD=y
CONFIG_USB_XHCI_DWC3=y CONFIG_USB_XHCI_DWC3=y
CONFIG_USB_DWC3=y
CONFIG_USB_DWC3_GENERIC=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y

8
configs/k2hk_hs_evm_defconfig
View File

@ -23,6 +23,7 @@ CONFIG_ENV_IS_IN_NAND=y
CONFIG_NET_RANDOM_ETHADDR=y CONFIG_NET_RANDOM_ETHADDR=y
CONFIG_DM=y CONFIG_DM=y
CONFIG_TI_AEMIF=y CONFIG_TI_AEMIF=y
CONFIG_MISC=y
# CONFIG_MMC is not set # CONFIG_MMC is not set
CONFIG_NAND=y CONFIG_NAND=y
CONFIG_NAND_DAVINCI=y CONFIG_NAND_DAVINCI=y
@ -31,12 +32,19 @@ CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_STMICRO=y CONFIG_SPI_FLASH_STMICRO=y
CONFIG_PHYLIB=y CONFIG_PHYLIB=y
CONFIG_DM_ETH=y CONFIG_DM_ETH=y
CONFIG_MII=y
CONFIG_PHY=y
CONFIG_NOP_PHY=y
CONFIG_KEYSTONE_USB_PHY=y
CONFIG_DM_SERIAL=y CONFIG_DM_SERIAL=y
CONFIG_SYS_NS16550=y CONFIG_SYS_NS16550=y
CONFIG_SPI=y CONFIG_SPI=y
CONFIG_DM_SPI=y CONFIG_DM_SPI=y
CONFIG_DAVINCI_SPI=y CONFIG_DAVINCI_SPI=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_DM_USB=y
CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_HCD=y
CONFIG_USB_XHCI_DWC3=y CONFIG_USB_XHCI_DWC3=y
CONFIG_USB_DWC3=y
CONFIG_USB_DWC3_GENERIC=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y

8
configs/k2l_evm_defconfig
View File

@ -34,6 +34,7 @@ CONFIG_ENV_IS_IN_NAND=y
CONFIG_NET_RANDOM_ETHADDR=y CONFIG_NET_RANDOM_ETHADDR=y
CONFIG_DM=y CONFIG_DM=y
CONFIG_TI_AEMIF=y CONFIG_TI_AEMIF=y
CONFIG_MISC=y
# CONFIG_MMC is not set # CONFIG_MMC is not set
CONFIG_NAND=y CONFIG_NAND=y
CONFIG_NAND_DAVINCI=y CONFIG_NAND_DAVINCI=y
@ -42,12 +43,19 @@ CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_STMICRO=y CONFIG_SPI_FLASH_STMICRO=y
CONFIG_PHYLIB=y CONFIG_PHYLIB=y
CONFIG_DM_ETH=y CONFIG_DM_ETH=y
CONFIG_MII=y
CONFIG_PHY=y
CONFIG_NOP_PHY=y
CONFIG_KEYSTONE_USB_PHY=y
CONFIG_DM_SERIAL=y CONFIG_DM_SERIAL=y
CONFIG_SYS_NS16550=y CONFIG_SYS_NS16550=y
CONFIG_SPI=y CONFIG_SPI=y
CONFIG_DM_SPI=y CONFIG_DM_SPI=y
CONFIG_DAVINCI_SPI=y CONFIG_DAVINCI_SPI=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_DM_USB=y
CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_HCD=y
CONFIG_USB_XHCI_DWC3=y CONFIG_USB_XHCI_DWC3=y
CONFIG_USB_DWC3=y
CONFIG_USB_DWC3_GENERIC=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y

8
configs/k2l_hs_evm_defconfig
View File

@ -27,6 +27,7 @@ CONFIG_ENV_IS_IN_NAND=y
CONFIG_NET_RANDOM_ETHADDR=y CONFIG_NET_RANDOM_ETHADDR=y
CONFIG_DM=y CONFIG_DM=y
CONFIG_TI_AEMIF=y CONFIG_TI_AEMIF=y
CONFIG_MISC=y
# CONFIG_MMC is not set # CONFIG_MMC is not set
CONFIG_NAND=y CONFIG_NAND=y
CONFIG_NAND_DAVINCI=y CONFIG_NAND_DAVINCI=y
@ -36,12 +37,19 @@ CONFIG_SPI_FLASH_STMICRO=y
CONFIG_PHYLIB=y CONFIG_PHYLIB=y
CONFIG_PHY_MARVELL=y CONFIG_PHY_MARVELL=y
CONFIG_DM_ETH=y CONFIG_DM_ETH=y
CONFIG_MII=y
CONFIG_PHY=y
CONFIG_NOP_PHY=y
CONFIG_KEYSTONE_USB_PHY=y
CONFIG_DM_SERIAL=y CONFIG_DM_SERIAL=y
CONFIG_SYS_NS16550=y CONFIG_SYS_NS16550=y
CONFIG_SPI=y CONFIG_SPI=y
CONFIG_DM_SPI=y CONFIG_DM_SPI=y
CONFIG_DAVINCI_SPI=y CONFIG_DAVINCI_SPI=y
CONFIG_USB=y CONFIG_USB=y
CONFIG_DM_USB=y
CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_HCD=y
CONFIG_USB_XHCI_DWC3=y CONFIG_USB_XHCI_DWC3=y
CONFIG_USB_DWC3=y
CONFIG_USB_DWC3_GENERIC=y
CONFIG_USB_STORAGE=y CONFIG_USB_STORAGE=y

1
drivers/usb/host/Makefile
View File

@ -52,7 +52,6 @@ obj-$(CONFIG_USB_XHCI_DWC3) += xhci-dwc3.o
obj-$(CONFIG_USB_XHCI_DWC3_OF_SIMPLE) += dwc3-of-simple.o obj-$(CONFIG_USB_XHCI_DWC3_OF_SIMPLE) += dwc3-of-simple.o
obj-$(CONFIG_USB_XHCI_ROCKCHIP) += xhci-rockchip.o obj-$(CONFIG_USB_XHCI_ROCKCHIP) += xhci-rockchip.o
obj-$(CONFIG_USB_XHCI_ZYNQMP) += xhci-zynqmp.o obj-$(CONFIG_USB_XHCI_ZYNQMP) += xhci-zynqmp.o
obj-$(CONFIG_USB_XHCI_KEYSTONE) += xhci-keystone.o
obj-$(CONFIG_USB_XHCI_EXYNOS) += xhci-exynos5.o obj-$(CONFIG_USB_XHCI_EXYNOS) += xhci-exynos5.o
obj-$(CONFIG_USB_XHCI_FSL) += xhci-fsl.o obj-$(CONFIG_USB_XHCI_FSL) += xhci-fsl.o
obj-$(CONFIG_USB_XHCI_MVEBU) += xhci-mvebu.o obj-$(CONFIG_USB_XHCI_MVEBU) += xhci-mvebu.o

7
include/configs/ti_armv7_keystone2.h
View File

@ -182,13 +182,6 @@
#define CONFIG_SYS_NAND_MAX_CHIPS 1 #define CONFIG_SYS_NAND_MAX_CHIPS 1
#define CONFIG_SYS_NAND_NO_SUBPAGE_WRITE #define CONFIG_SYS_NAND_NO_SUBPAGE_WRITE
/* USB Configuration */
#define CONFIG_USB_XHCI_KEYSTONE
#define CONFIG_USB_SS_BASE KS2_USB_SS_BASE
#define CONFIG_USB_HOST_XHCI_BASE KS2_USB_HOST_XHCI_BASE
#define CONFIG_DEV_USB_PHY_BASE KS2_DEV_USB_PHY_BASE
#define CONFIG_USB_PHY_CFG_BASE KS2_USB_PHY_CFG_BASE
/* U-Boot general configuration */ /* U-Boot general configuration */
#define CONFIG_MISC_INIT_R #define CONFIG_MISC_INIT_R
#define CONFIG_MX_CYCLIC #define CONFIG_MX_CYCLIC