Add support for DM_USB and DM_USB_DEV to TI's K2G platforms

PATCH Superseded Jean-Jacques Hiblot 3 participants 11 messages Dec 4, 2018 – Dec 6, 2018

Subsystems (5)

Arm (32-bit) USB Generic PHY framework USB xHCI driver +1 more subsystems

lore

Share & tools

lore

Jean-Jacques Hiblot

author

2018-12-04 10:12 UTC #0 lore raw

v2 cover Add support for DM_USB and DM_USB_DEV to TI's K2G platforms

The K2G platforms can use the generic DWC3 driver instead of relying on the keystone-xhci driver.
Benefits are:
- moving toward DM
- brings USB gadget for free
- allows us to remove some code

Tested on:
- K2G EVM

Changes in v2:
- rebased on latest version of u-boot-usb/master
- use DM_USB_GADGET instead of DM_USB_DEV

Jean-Jacques Hiblot (6):
usb: dwc3-generic: make it compatible with "ti,keystone-dwc3"
board: ks2_evm: Enable the USB clocks if DM_USB is used
ARM: dts: k2g-evm: enable USB0 and USB1
PHY: Add phy driver for the keystone USB PHY
usb: host: replace xhci-keystone driver by the generic dwc3 driver
configs: k2g_evm: Enable DFU on K2G EVM

 arch/arm/dts/keystone-k2g-evm.dts    |  28 ++++
 arch/arm/dts/keystone-k2g.dtsi       |  56 ++++++++
 board/ti/ks2_evm/board.c             |  12 ++
 configs/k2e_evm_defconfig            |   7 +
 configs/k2e_hs_evm_defconfig         |   7 +
 configs/k2g_evm_defconfig            |  12 ++
 configs/k2g_hs_evm_defconfig         |  12 ++
 configs/k2hk_evm_defconfig           |   7 +
 configs/k2hk_hs_evm_defconfig        |   7 +
 configs/k2l_evm_defconfig            |   7 +
 configs/k2l_hs_evm_defconfig         |   7 +
 drivers/phy/Kconfig                  |  10 ++
 drivers/phy/Makefile                 |   1 +
 drivers/phy/keystone-usb-phy.c       | 109 ++++++++++++++++
 drivers/usb/dwc3/dwc3-generic.c      |   1 +
 drivers/usb/host/Makefile            |   1 -
 drivers/usb/host/xhci-keystone.c     | 240 -----------------------------------
 include/configs/ti_armv7_keystone2.h |  17 ++-
 18 files changed, 294 insertions(+), 247 deletions(-)
 create mode 100644 drivers/phy/keystone-usb-phy.c
 delete mode 100644 drivers/usb/host/xhci-keystone.c

Signature · 1 line

2.7.4

Jean-Jacques Hiblot

author

2018-12-04 10:12 UTC #1 lore raw

PATCH v2 1/6 usb: dwc3-generic: make it compatible with "ti, keystone-dwc3"

Signed-off-by Jean-Jacques Hiblot <[email protected]>

Reviewed-by Tom Rini <[email protected]>

---

Changes in v2: None

 drivers/usb/dwc3/dwc3-generic.c | 1 +
 1 file changed, 1 insertion(+)

drivers/usb/dwc3/dwc3-generic.c +1 -0

index bc6bba1..0c189b8 100644
@@ -342,6 +342,7 @@ static int dwc3_glue_remove(struct udevice *dev)
 
 static const struct udevice_id dwc3_glue_ids[] = {
 	{ .compatible = "xlnx,zynqmp-dwc3" },
+	{ .compatible = "ti,keystone-dwc3"},
 	{ .compatible = "ti,dwc3", .data = (ulong)&ti_ops },
 	{ }
 };

Signature · 1 line

2.7.4

Jean-Jacques Hiblot

author

2018-12-04 10:12 UTC #2 lore raw

PATCH v2 2/6 board: ks2_evm: Enable the USB clocks if DM_USB is used

In reply to Jean-Jacques Hiblot

Signed-off-by Jean-Jacques Hiblot <[email protected]>

---

Changes in v2: None

 board/ti/ks2_evm/board.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

board/ti/ks2_evm/board.c +12 -0

index 72709c0..c888306 100644
@@ -61,6 +61,18 @@ int dram_init(void)
 
 int board_init(void)
 {
+#if CONFIG_IS_ENABLED(DM_USB)
+	int rc = psc_enable_module(KS2_LPSC_USB);
+
+	if (rc)
+		puts("Cannot enable USB0 module");
+#ifdef KS2_LPSC_USB_1
+	rc = psc_enable_module(KS2_LPSC_USB_1);
+	if (rc)
+		puts("Cannot enable USB1 module");
+#endif
+#endif
+
 	gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
 
 	return 0;

Signature · 1 line

2.7.4

Tom Rini

2018-12-05 03:12 UTC #3 lore raw

PATCH v2 2/6 board: ks2_evm: Enable the USB clocks if DM_USB is used

Quoted 1 line · Jean-Jacques Hiblot

Signed-off-by Jean-Jacques Hiblot <[email protected]>

Reviewed-by Tom Rini <[email protected]>

Signature · 8 lines

Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20181204/dda36c8c/attachment.sig>

Jean-Jacques Hiblot

author

2018-12-04 10:12 UTC #4 lore raw

PATCH v2 3/6 ARM: dts: k2g-evm: enable USB0 and USB1

In reply to Jean-Jacques Hiblot

Signed-off-by Jean-Jacques Hiblot <[email protected]>

---

Changes in v2: None

 arch/arm/dts/keystone-k2g-evm.dts | 28 ++++++++++++++++++++
 arch/arm/dts/keystone-k2g.dtsi    | 56 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 84 insertions(+)

arch/arm/dts/keystone-k2g-evm.dts +28 -0

index ad746c7..6c9de25 100644
@@ -33,6 +33,34 @@
 	};
 };
 
+&keystone_usb0 {
+	status = "okay";
+};
+
+&usb0_phy {
+	status = "okay";
+	compatible = "nop-phy";
+};
+
+&usb0 {
+	dr_mode = "host";
+	status = "okay";
+};
+
+&keystone_usb1 {
+	status = "okay";
+};
+
+&usb1_phy {
+	compatible = "nop-phy";
+	status = "okay";
+};
+
+&usb1 {
+	dr_mode = "peripheral";
+	status = "okay";
+};
+
 &gbe0 {
 	phy-handle = <&ethphy0>;
 };

arch/arm/dts/keystone-k2g.dtsi +56 -0

61 lines not on this page · raw message

Signature · 1 line

2.7.4

Tom Rini

2018-12-05 03:12 UTC #5 lore raw

PATCH v2 3/6 ARM: dts: k2g-evm: enable USB0 and USB1

Quoted 1 line · Jean-Jacques Hiblot

Signed-off-by Jean-Jacques Hiblot <[email protected]>

Reviewed-by Tom Rini <[email protected]>

Signature · 8 lines

Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20181204/86c63e04/attachment.sig>

Jean-Jacques Hiblot

author

2018-12-04 10:12 UTC #6 lore raw

PATCH v2 4/6 PHY: Add phy driver for the keystone USB PHY

In reply to Jean-Jacques Hiblot

Signed-off-by Jean-Jacques Hiblot <[email protected]>

Reviewed-by Tom Rini <[email protected]>

---

Changes in v2: None

 drivers/phy/Kconfig            |  10 ++++
 drivers/phy/Makefile           |   1 +
 drivers/phy/keystone-usb-phy.c | 109 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 120 insertions(+)
 create mode 100644 drivers/phy/keystone-usb-phy.c

drivers/phy/Kconfig +10 -0

index 3921e39..825ee7c 100644
@@ -164,4 +164,14 @@ config OMAP_USB2_PHY
 
 	  This PHY is found on OMAP devices supporting USB2.
 
+
+config KEYSTONE_USB_PHY
+	bool "Support TI Keystone USB PHY"
+	depends on PHY
+	depends on ARCH_KEYSTONE
+	help
+	  Support for the USB PHY found on some Keystone (k2) processors
+
+	  This PHY is found on some Keystone (K2) devices supporting USB.
+
 endmenu

drivers/phy/Makefile +1 -0

index 53dd5bd..099551d 100644
@@ -18,3 +18,4 @@ obj-$(CONFIG_PHY_STM32_USBPHYC) += phy-stm32-usbphyc.o
 obj-$(CONFIG_MESON_GXL_USB_PHY) += meson-gxl-usb2.o meson-gxl-usb3.o
 obj-$(CONFIG_MSM8916_USB_PHY) += msm8916-usbh-phy.o
 obj-$(CONFIG_OMAP_USB2_PHY) += omap-usb2-phy.o
+obj-$(CONFIG_KEYSTONE_USB_PHY) += keystone-usb-phy.o

drivers/phy/keystone-usb-phy.c new file +109 -0

109 lines not on this page · raw message

Signature · 1 line

2.7.4

Jean-Jacques Hiblot

author

2018-12-04 10:13 UTC #7 lore raw

PATCH v2 5/6 usb: host: replace xhci-keystone driver by the generic dwc3 driver

In reply to Jean-Jacques Hiblot

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.

Signed-off-by Jean-Jacques Hiblot <[email protected]>

Reviewed-by Tom Rini <[email protected]>

---

Changes in v2: None

 configs/k2e_evm_defconfig            |   7 +
 configs/k2e_hs_evm_defconfig         |   7 +
 configs/k2g_evm_defconfig            |   6 +
 configs/k2g_hs_evm_defconfig         |   6 +
 configs/k2hk_evm_defconfig           |   7 +
 configs/k2hk_hs_evm_defconfig        |   7 +
 configs/k2l_evm_defconfig            |   7 +
 configs/k2l_hs_evm_defconfig         |   7 +
 drivers/usb/host/Makefile            |   1 -
 drivers/usb/host/xhci-keystone.c     | 240 -----------------------------------
 include/configs/ti_armv7_keystone2.h |   7 -
 11 files changed, 54 insertions(+), 248 deletions(-)
 delete mode 100644 drivers/usb/host/xhci-keystone.c

configs/k2e_evm_defconfig +7 -0

index 67b1f30..03a1ceb 100644
@@ -37,6 +37,7 @@ CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_DM=y
 CONFIG_SYS_I2C_DAVINCI=y
 CONFIG_TI_AEMIF=y
+CONFIG_MISC=y
 # CONFIG_MMC is not set
 CONFIG_NAND=y
 CONFIG_NAND_DAVINCI=y

@@ -47,13 +48,19 @@ CONFIG_PHYLIB=y
 CONFIG_PHY_MARVELL=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_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_DAVINCI_SPI=y
 CONFIG_USB=y
+CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
+CONFIG_USB_DWC3=y
+CONFIG_USB_DWC3_GENERIC=y
 CONFIG_USB_STORAGE=y
 CONFIG_DRIVER_TI_KEYSTONE_NET=y

configs/k2e_hs_evm_defconfig +7 -0

index 1abda84..bb7b314 100644
@@ -30,6 +30,7 @@ CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_DM=y
 CONFIG_SYS_I2C_DAVINCI=y
 CONFIG_TI_AEMIF=y
+CONFIG_MISC=y
 # CONFIG_MMC is not set
 CONFIG_NAND=y
 CONFIG_NAND_DAVINCI=y

@@ -40,13 +41,19 @@ CONFIG_PHYLIB=y
 CONFIG_PHY_MARVELL=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_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_DAVINCI_SPI=y
 CONFIG_USB=y
+CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
+CONFIG_USB_DWC3=y
+CONFIG_USB_DWC3_GENERIC=y
 CONFIG_USB_STORAGE=y
 CONFIG_DRIVER_TI_KEYSTONE_NET=y

configs/k2g_evm_defconfig +6 -0

index bc4b92b..95c835a 100644
@@ -36,6 +36,7 @@ CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_DM=y
 # CONFIG_BLK is not set
 CONFIG_SYS_I2C_DAVINCI=y
+CONFIG_MISC=y
 CONFIG_DM_MMC=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_NAND=y

@@ -50,6 +51,8 @@ CONFIG_PHY_MARVELL=y
 CONFIG_PHY_MICREL=y
 CONFIG_DM_ETH=y
 CONFIG_MII=y
+CONFIG_PHY=y
+CONFIG_NOP_PHY=y
 CONFIG_REMOTEPROC_TI_POWER=y
 CONFIG_DM_SERIAL=y
 CONFIG_SYS_NS16550=y

@@ -57,7 +60,10 @@ CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_DAVINCI_SPI=y
 CONFIG_USB=y
+CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
+CONFIG_USB_DWC3=y
+CONFIG_USB_DWC3_GENERIC=y
 CONFIG_USB_STORAGE=y
 CONFIG_DRIVER_TI_KEYSTONE_NET=y

configs/k2g_hs_evm_defconfig +6 -0

index 66d8220..47c30a6 100644
@@ -29,6 +29,7 @@ CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_DM=y
 # CONFIG_BLK is not set
 CONFIG_SYS_I2C_DAVINCI=y
+CONFIG_MISC=y
 CONFIG_DM_MMC=y
 CONFIG_MMC_OMAP_HS=y
 CONFIG_NAND=y

@@ -43,6 +44,8 @@ CONFIG_PHY_MARVELL=y
 CONFIG_PHY_MICREL=y
 CONFIG_DM_ETH=y
 CONFIG_MII=y
+CONFIG_PHY=y
+CONFIG_NOP_PHY=y
 CONFIG_REMOTEPROC_TI_POWER=y
 CONFIG_DM_SERIAL=y
 CONFIG_SYS_NS16550=y

@@ -50,7 +53,10 @@ CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_DAVINCI_SPI=y
 CONFIG_USB=y
+CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
+CONFIG_USB_DWC3=y
+CONFIG_USB_DWC3_GENERIC=y
 CONFIG_USB_STORAGE=y
 CONFIG_DRIVER_TI_KEYSTONE_NET=y

configs/k2hk_evm_defconfig +7 -0

index f66d922..700fafd 100644
@@ -37,6 +37,7 @@ CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_DM=y
 CONFIG_SYS_I2C_DAVINCI=y
 CONFIG_TI_AEMIF=y
+CONFIG_MISC=y
 # CONFIG_MMC is not set
 CONFIG_NAND=y
 CONFIG_NAND_DAVINCI=y

@@ -47,13 +48,19 @@ CONFIG_PHYLIB=y
 CONFIG_PHY_MARVELL=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_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_DAVINCI_SPI=y
 CONFIG_USB=y
+CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
+CONFIG_USB_DWC3=y
+CONFIG_USB_DWC3_GENERIC=y
 CONFIG_USB_STORAGE=y
 CONFIG_DRIVER_TI_KEYSTONE_NET=y

configs/k2hk_hs_evm_defconfig +7 -0

index dd91a51..a6caccc 100644
@@ -30,6 +30,7 @@ CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_DM=y
 CONFIG_SYS_I2C_DAVINCI=y
 CONFIG_TI_AEMIF=y
+CONFIG_MISC=y
 # CONFIG_MMC is not set
 CONFIG_NAND=y
 CONFIG_NAND_DAVINCI=y

@@ -40,13 +41,19 @@ CONFIG_PHYLIB=y
 CONFIG_PHY_MARVELL=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_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_DAVINCI_SPI=y
 CONFIG_USB=y
+CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
+CONFIG_USB_DWC3=y
+CONFIG_USB_DWC3_GENERIC=y
 CONFIG_USB_STORAGE=y
 CONFIG_DRIVER_TI_KEYSTONE_NET=y

configs/k2l_evm_defconfig +7 -0

index 4f04caa..cb63808 100644
@@ -37,6 +37,7 @@ CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_DM=y
 CONFIG_SYS_I2C_DAVINCI=y
 CONFIG_TI_AEMIF=y
+CONFIG_MISC=y
 # CONFIG_MMC is not set
 CONFIG_NAND=y
 CONFIG_NAND_DAVINCI=y

@@ -47,13 +48,19 @@ CONFIG_PHYLIB=y
 CONFIG_PHY_MARVELL=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_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_DAVINCI_SPI=y
 CONFIG_USB=y
+CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
+CONFIG_USB_DWC3=y
+CONFIG_USB_DWC3_GENERIC=y
 CONFIG_USB_STORAGE=y
 CONFIG_DRIVER_TI_KEYSTONE_NET=y

configs/k2l_hs_evm_defconfig +7 -0

index 9ce23de..4ce7801 100644
@@ -29,6 +29,7 @@ CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_DM=y
 CONFIG_SYS_I2C_DAVINCI=y
 CONFIG_TI_AEMIF=y
+CONFIG_MISC=y
 # CONFIG_MMC is not set
 CONFIG_NAND=y
 CONFIG_NAND_DAVINCI=y

@@ -39,13 +40,19 @@ CONFIG_PHYLIB=y
 CONFIG_PHY_MARVELL=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_SYS_NS16550=y
 CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_DAVINCI_SPI=y
 CONFIG_USB=y
+CONFIG_DM_USB=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
+CONFIG_USB_DWC3=y
+CONFIG_USB_DWC3_GENERIC=y
 CONFIG_USB_STORAGE=y
 CONFIG_DRIVER_TI_KEYSTONE_NET=y

drivers/usb/host/Makefile +0 -1

index 285c20a..948683a 100644
@@ -50,7 +50,6 @@ obj-$(CONFIG_USB_XHCI_DWC3) += xhci-dwc3.o
 obj-$(CONFIG_USB_XHCI_DWC3_OF_SIMPLE) += dwc3-of-simple.o
 obj-$(CONFIG_USB_XHCI_ROCKCHIP) += xhci-rockchip.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_FSL) += xhci-fsl.o
 obj-$(CONFIG_USB_XHCI_MVEBU) += xhci-mvebu.o

drivers/usb/host/xhci-keystone.c deleted +0 ~~-240~~

240 lines not on this page · raw message

include/configs/ti_armv7_keystone2.h +0 -7

index 5e504f6..fae72e7 100644
@@ -169,13 +169,6 @@
 #define CONFIG_SYS_NAND_MAX_CHIPS		1
 #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 */
 #define CONFIG_MX_CYCLIC
 #define CONFIG_TIMESTAMP

Signature · 1 line

2.7.4

Jean-Jacques Hiblot

author

2018-12-04 10:13 UTC #8 lore raw

PATCH v2 6/6 configs: k2g_evm: Enable DFU on K2G EVM

In reply to Jean-Jacques Hiblot

The K2G evm uses the generic DWC3 driver. DFU can thus be enabled. Enabling DFU for easier firmware update.

Signed-off-by Jean-Jacques Hiblot <[email protected]>

---

Changes in v2:
- rebased on latest version of u-boot-usb/master
- use DM_USB_GADGET instead of DM_USB_DEV

 configs/k2g_evm_defconfig            |  6 ++++++
 configs/k2g_hs_evm_defconfig         |  6 ++++++
 include/configs/ti_armv7_keystone2.h | 12 ++++++++++++
 3 files changed, 24 insertions(+)

configs/k2g_evm_defconfig +6 -0

index 95c835a..8a07039 100644
@@ -35,6 +35,7 @@ CONFIG_MULTI_DTB_FIT=y
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_DM=y
 # CONFIG_BLK is not set
+CONFIG_DFU_MMC=y
 CONFIG_SYS_I2C_DAVINCI=y
 CONFIG_MISC=y
 CONFIG_DM_MMC=y

@@ -61,9 +62,14 @@ CONFIG_DM_SPI=y
 CONFIG_DAVINCI_SPI=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
+CONFIG_DM_USB_GADGET=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_USB_DWC3=y
+CONFIG_USB_DWC3_GADGET=y
 CONFIG_USB_DWC3_GENERIC=y
 CONFIG_USB_STORAGE=y
 CONFIG_DRIVER_TI_KEYSTONE_NET=y
+CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_USB_FUNCTION_SDP=y

configs/k2g_hs_evm_defconfig +6 -0

index 47c30a6..5f91f11 100644
@@ -28,6 +28,7 @@ CONFIG_MULTI_DTB_FIT=y
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
 CONFIG_DM=y
 # CONFIG_BLK is not set
+CONFIG_DFU_MMC=y
 CONFIG_SYS_I2C_DAVINCI=y
 CONFIG_MISC=y
 CONFIG_DM_MMC=y

@@ -54,9 +55,14 @@ CONFIG_DM_SPI=y
 CONFIG_DAVINCI_SPI=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
+CONFIG_DM_USB_GADGET=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_DWC3=y
 CONFIG_USB_DWC3=y
+CONFIG_USB_DWC3_GADGET=y
 CONFIG_USB_DWC3_GENERIC=y
 CONFIG_USB_STORAGE=y
 CONFIG_DRIVER_TI_KEYSTONE_NET=y
+CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_DOWNLOAD=y
+CONFIG_USB_FUNCTION_SDP=y

include/configs/ti_armv7_keystone2.h +12 -0

index fae72e7..0c7d664 100644
@@ -169,6 +169,17 @@
 #define CONFIG_SYS_NAND_MAX_CHIPS		1
 #define CONFIG_SYS_NAND_NO_SUBPAGE_WRITE
 
+#define DFU_ALT_INFO_MMC \
+	"dfu_alt_info_mmc=" \
+	"MLO fat 0 1;" \
+	"u-boot.img fat 0 1;" \
+	"uEnv.txt fat 0 1\0"
+
+/* DFU settings */
+#define DFUARGS \
+	"dfu_bufsiz=0x10000\0" \
+	DFU_ALT_INFO_MMC \
+
 /* U-Boot general configuration */
 #define CONFIG_MX_CYCLIC
 #define CONFIG_TIMESTAMP

@@ -207,6 +218,7 @@
 #define CONFIG_EXTRA_ENV_SETTINGS					\
 	DEFAULT_LINUX_BOOT_ENV						\
 	CONFIG_EXTRA_ENV_KS2_BOARD_SETTINGS				\
+	DFUARGS								\
 	"bootdir=/boot\0" \
 	"tftp_root=/\0"							\
 	"nfs_root=/export\0"						\

Signature · 1 line

2.7.4

Tom Rini

2018-12-05 03:12 UTC #9 lore raw

PATCH v2 6/6 configs: k2g_evm: Enable DFU on K2G EVM

Quoted 5 lines · Jean-Jacques Hiblot

The K2G evm uses the generic DWC3 driver. DFU can thus be enabled. Enabling DFU for easier firmware update.
Signed-off-by Jean-Jacques Hiblot <[email protected]>

Reviewed-by Tom Rini <[email protected]>

Signature · 8 lines

Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20181204/3fc80bc3/attachment.sig>

Lukasz Majewski

2018-12-06 22:09 UTC #10 lore raw

v2 cover Add support for DM_USB and DM_USB_DEV to TI's K2G platforms

In reply to Jean-Jacques Hiblot

Hi Jean-Jacques, Marek,

Quoted 10 lines

The K2G platforms can use the generic DWC3 driver instead of relying on the keystone-xhci driver.
Benefits are:
- moving toward DM
- brings USB gadget for free
- allows us to remove some code
Tested on:
- K2G EVM

I'm not sure if I shall wait for Marek's PR to Tom (preferred) or send new PR to Marek?

Marek what do you think?

Quoted 30 lines

Changes in v2:
- rebased on latest version of u-boot-usb/master
- use DM_USB_GADGET instead of DM_USB_DEV
Jean-Jacques Hiblot (6):
usb: dwc3-generic: make it compatible with "ti,keystone-dwc3"
board: ks2_evm: Enable the USB clocks if DM_USB is used
ARM: dts: k2g-evm: enable USB0 and USB1
PHY: Add phy driver for the keystone USB PHY
usb: host: replace xhci-keystone driver by the generic dwc3 driver
configs: k2g_evm: Enable DFU on K2G EVM
 arch/arm/dts/keystone-k2g-evm.dts    |  28 ++++
 arch/arm/dts/keystone-k2g.dtsi       |  56 ++++++++
 board/ti/ks2_evm/board.c             |  12 ++
 configs/k2e_evm_defconfig            |   7 +
 configs/k2e_hs_evm_defconfig         |   7 +
 configs/k2g_evm_defconfig            |  12 ++
 configs/k2g_hs_evm_defconfig         |  12 ++
 configs/k2hk_evm_defconfig           |   7 +
 configs/k2hk_hs_evm_defconfig        |   7 +
 configs/k2l_evm_defconfig            |   7 +
 configs/k2l_hs_evm_defconfig         |   7 +
 drivers/phy/Kconfig                  |  10 ++
 drivers/phy/Makefile                 |   1 +
 drivers/phy/keystone-usb-phy.c       | 109 ++++++++++++++++
 drivers/usb/dwc3/dwc3-generic.c      |   1 +
 drivers/usb/host/Makefile            |   1 -
 drivers/usb/host/xhci-keystone.c     | 240

Quoted 6 lines

-----------------------------------
include/configs/ti_armv7_keystone2.h | 17 ++- 18 files changed, 294 insertions(+), 247 deletions(-) create mode 100644 drivers/phy/keystone-usb-phy.c delete mode 100644 drivers/usb/host/xhci-keystone.c

Best regards,

Lukasz Majewski

DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: lukma at denx.de -------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20181206/d3307e58/attachment.sig>