dm: arm: rpi: Move to driver model for USB

Start using driver model for USB on the Raspberry Pi. The dwc2 supports
this now so this is just a config change.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/configs/rpi_2_defconfig b/configs/rpi_2_defconfig
index 9875f5d295008d176d12671ac40d0c228e01d1d4..9b7fee7768bb1f278feac419508034e5fdee1bcd 100644 (file)
--- a/configs/rpi_2_defconfig
+++ b/configs/rpi_2_defconfig
@@ -17,6 +17,7 @@ CONFIG_OF_EMBED=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_BCM2835=y
 CONFIG_USB=y
+CONFIG_DM_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_KEYBOARD=y
 CONFIG_SYS_WHITE_ON_BLACK=y

diff --git a/configs/rpi_3_32b_defconfig b/configs/rpi_3_32b_defconfig
index e4a81b882d1f65a249e1394b66bcd4acbd0d8d6f..8db0a58885a0e3bcd1ced3b3b640fe1327915bbb 100644 (file)
--- a/configs/rpi_3_32b_defconfig
+++ b/configs/rpi_3_32b_defconfig
@@ -19,6 +19,7 @@ CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_BCM2835=y
 # CONFIG_REQUIRE_SERIAL_CONSOLE is not set
 CONFIG_USB=y
+CONFIG_DM_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_KEYBOARD=y
 CONFIG_SYS_WHITE_ON_BLACK=y

diff --git a/configs/rpi_3_defconfig b/configs/rpi_3_defconfig
index e0be6c76f8fc23a2dacbcc6b59feec18315c0f1b..b0c38a9f91d125973838014e81473b984b17434d 100644 (file)
--- a/configs/rpi_3_defconfig
+++ b/configs/rpi_3_defconfig
@@ -19,6 +19,7 @@ CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_BCM2835=y
 # CONFIG_REQUIRE_SERIAL_CONSOLE is not set
 CONFIG_USB=y
+CONFIG_DM_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_KEYBOARD=y
 CONFIG_SYS_WHITE_ON_BLACK=y

diff --git a/configs/rpi_defconfig b/configs/rpi_defconfig
index a07d69800ce0606041e351ee3f914c00ed4f9278..7ee2dee1aaa2f10efbcf85816237cbb276e0093d 100644 (file)
--- a/configs/rpi_defconfig
+++ b/configs/rpi_defconfig
@@ -17,6 +17,7 @@ CONFIG_OF_EMBED=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_BCM2835=y
 CONFIG_USB=y
+CONFIG_DM_USB=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_KEYBOARD=y
 CONFIG_SYS_WHITE_ON_BLACK=y

diff --git a/include/configs/rpi.h b/include/configs/rpi.h
index 732d5b9fbe7989b2dad953bff3c9a44240263324..a2e74f6a4d2242ff48aa1a08ddc202961f349f02 100644 (file)
--- a/include/configs/rpi.h
+++ b/include/configs/rpi.h
@@ -79,11 +79,6 @@
 
 #ifdef CONFIG_CMD_USB
 #define CONFIG_USB_DWC2
-#ifndef CONFIG_BCM2835
-#define CONFIG_USB_DWC2_REG_ADDR 0x3f980000
-#else
-#define CONFIG_USB_DWC2_REG_ADDR 0x20980000
-#endif
 #define CONFIG_USB_HOST_ETHER
 #define CONFIG_USB_ETHER_SMSC95XX
 #define CONFIG_TFTP_TSIZE