sunxi: H6: Enable USB for existing boards

So far USB was not enabled for the Allwinner H6 boards, as the PHY
driver was not ready and the clock gates were missing. Since this is now
fixed, let's add the PHY and the OHCI/EHCI drivers to the build, for
all existing H6 boards.

Signed-off-by: Andre Przywara <andre.przywara@arm.com>
Tested-by: Corentin Labbe <clabbe.montjoie@gmail.com> # Pine-H64
Reviewed-by: Jagan Teki <jagan@amarulasolutions.com>

diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig
index d4e7d89e9e3bc2765c013661d4634911b9fcad7a..ffdf09f29e4e7590330d3ea29d6dee0cdde45d82 100644 (file)
--- a/arch/arm/mach-sunxi/Kconfig
+++ b/arch/arm/mach-sunxi/Kconfig
@@ -300,6 +300,7 @@ config MACH_SUN50I_H6
        select ARM64
        select SUPPORT_SPL
        select FIT
+       select PHY_SUN4I_USB
        select SPL_LOAD_FIT
        select DRAM_SUN50I_H6
 

diff --git a/configs/beelink_gs1_defconfig b/configs/beelink_gs1_defconfig
index eec4edd4c2dd60bae1c1ca864072dac8fce64996..f142cde779f61306bb6f5b783f041736c237c1f8 100644 (file)
--- a/configs/beelink_gs1_defconfig
+++ b/configs/beelink_gs1_defconfig
@@ -14,3 +14,5 @@ CONFIG_MMC_SUNXI_SLOT_EXTRA=2
 CONFIG_DEFAULT_DEVICE_TREE="sun50i-h6-beelink-gs1"
 CONFIG_LED=y
 CONFIG_LED_GPIO=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_OHCI_HCD=y

diff --git a/configs/orangepi_lite2_defconfig b/configs/orangepi_lite2_defconfig
index 2d74fc4053d36b82bb3bbfabfb8aa2c23f354b85..74c11d83551b2d55120b6b76c7c8a90f78e54926 100644 (file)
--- a/configs/orangepi_lite2_defconfig
+++ b/configs/orangepi_lite2_defconfig
@@ -11,3 +11,5 @@ CONFIG_MMC0_CD_PIN="PF6"
 # CONFIG_SPL_DOS_PARTITION is not set
 # CONFIG_SPL_EFI_PARTITION is not set
 CONFIG_DEFAULT_DEVICE_TREE="sun50i-h6-orangepi-lite2"
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_OHCI_HCD=y

diff --git a/configs/orangepi_one_plus_defconfig b/configs/orangepi_one_plus_defconfig
index 3737ecd37890f8dcf2c9c38b495f6ccce154bbe8..f86bb29e34bc914e83f674276707d3c410525764 100644 (file)
--- a/configs/orangepi_one_plus_defconfig
+++ b/configs/orangepi_one_plus_defconfig
@@ -11,3 +11,5 @@ CONFIG_MMC0_CD_PIN="PF6"
 # CONFIG_SPL_DOS_PARTITION is not set
 # CONFIG_SPL_EFI_PARTITION is not set
 CONFIG_DEFAULT_DEVICE_TREE="sun50i-h6-orangepi-one-plus"
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_OHCI_HCD=y

diff --git a/configs/pine_h64_defconfig b/configs/pine_h64_defconfig
index a49bd6618fc80c156825c223de0a31b276047913..dd1368af39c107af86f7713fef55c55b4da2faac 100644 (file)
--- a/configs/pine_h64_defconfig
+++ b/configs/pine_h64_defconfig
@@ -12,3 +12,6 @@ CONFIG_MMC_SUNXI_SLOT_EXTRA=2
 # CONFIG_SPL_DOS_PARTITION is not set
 # CONFIG_SPL_EFI_PARTITION is not set
 CONFIG_DEFAULT_DEVICE_TREE="sun50i-h6-pine-h64"
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_OHCI_HCD=y
+CONFIG_USB3_VBUS_PIN="PL5"