Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 6bed24cc62ecd8d7a96c34cf1cf3e5e093f7be62

Authored by Paul Kocialkowski
Committed by Marek Vasut
1 parent 5d6c2f4b5a
Exists in v2017.01-smarct4x and in 33 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf-6.6.52-2.2.0, emb_lf_v2022.04, emb_lf_v2023.04, emb_lf_v2024.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc

sunxi: usb: USB_MUSB_SUNXI move to musb-new Kconfig 

Now that the musb-new driver has a Kconfig, we can move Kconfig options to
enable controllers to it, so that it's easier in e.g. menuconfig.

In addition, this allows declaring support for USB_MUSB_HOST/GADGET in
defconfigs instead of the USB_MUSB_SUNXI controller, that will get selected
automatically when needed.

Signed-off-by: Paul Kocialkowski <contact@paulk.fr>

Showing 23 changed files with 35 additions and 30 deletions Side-by-side Diff

... ... @@ -539,15 +539,6 @@
539 539 endchoice
540 540  
541 541  
542   -config USB_MUSB_SUNXI
543   - bool "Enable sunxi OTG / DRC USB controller in host mode"
544   - default n
545   - ---help---
546   - Say y here to enable support for the sunxi OTG / DRC USB controller
547   - used on almost all sunxi boards. Note currently u-boot can only have
548   - one usb host controller enabled at a time, so enabling this on boards
549   - which also use the ehci host controller will result in build errors.
550   -
551 542 config USB_KEYBOARD
552 543 boolean "Enable USB keyboard support"
553 544 default y
configs/Ainol_AW1_defconfig
Diff comments   View file @ 6bed24c
... ... @@ -11,7 +11,7 @@
11 11 CONFIG_VIDEO_LCD_POWER="PH8"
12 12 CONFIG_VIDEO_LCD_BL_EN="PH7"
13 13 CONFIG_VIDEO_LCD_BL_PWM="PB2"
14   -CONFIG_USB_MUSB_SUNXI=y
  14 +CONFIG_USB_MUSB_HOST=y
15 15 CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-ainol-aw1"
16 16 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
17 17 CONFIG_SPL=y
configs/Ampe_A76_defconfig
Diff comments   View file @ 6bed24c
... ... @@ -10,7 +10,7 @@
10 10 CONFIG_VIDEO_LCD_POWER="AXP0-0"
11 11 CONFIG_VIDEO_LCD_BL_EN="AXP0-1"
12 12 CONFIG_VIDEO_LCD_BL_PWM="PB2"
13   -CONFIG_USB_MUSB_SUNXI=y
  13 +CONFIG_USB_MUSB_HOST=y
14 14 CONFIG_DEFAULT_DEVICE_TREE="sun5i-a13-ampe-a76"
15 15 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
16 16 CONFIG_SPL=y
configs/CSQ_CS908_defconfig
Diff comments   View file @ 6bed24c
... ... @@ -15,5 +15,5 @@
15 15 CONFIG_AXP221_DLDO1_VOLT=3300
16 16 CONFIG_AXP221_ALDO1_VOLT=3300
17 17 CONFIG_USB_EHCI_HCD=y
18   -CONFIG_USB_MUSB_SUNXI=y
  18 +CONFIG_USB_MUSB_HOST=y
configs/Chuwi_V7_CW0825_defconfig
Diff comments   View file @ 6bed24c
... ... @@ -10,7 +10,7 @@
10 10 CONFIG_VIDEO_LCD_BL_EN="PH7"
11 11 CONFIG_VIDEO_LCD_BL_PWM="PB2"
12 12 CONFIG_VIDEO_LCD_PANEL_HITACHI_TX18D42VM=y
13   -CONFIG_USB_MUSB_SUNXI=y
  13 +CONFIG_USB_MUSB_HOST=y
14 14 CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-chuwi-v7-cw0825"
15 15 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
16 16 CONFIG_SPL=y
configs/Et_q8_v1_6_defconfig
Diff comments   View file @ 6bed24c
... ... @@ -11,7 +11,7 @@
11 11 CONFIG_VIDEO_LCD_POWER="PH7"
12 12 CONFIG_VIDEO_LCD_BL_EN="PH6"
13 13 CONFIG_VIDEO_LCD_BL_PWM="PH0"
14   -CONFIG_USB_MUSB_SUNXI=y
  14 +CONFIG_USB_MUSB_HOST=y
15 15 CONFIG_DEFAULT_DEVICE_TREE="sun8i-a33-et-q8-v1.6"
16 16 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
17 17 CONFIG_SPL=y
configs/Hyundai_A7HD_defconfig
Diff comments   View file @ 6bed24c
... ... @@ -12,7 +12,7 @@
12 12 CONFIG_VIDEO_LCD_BL_PWM="PB2"
13 13 # CONFIG_VIDEO_LCD_BL_PWM_ACTIVE_LOW is not set
14 14 CONFIG_VIDEO_LCD_PANEL_LVDS=y
15   -CONFIG_USB_MUSB_SUNXI=y
  15 +CONFIG_USB_MUSB_HOST=y
16 16 CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-hyundai-a7hd"
17 17 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
18 18 CONFIG_SPL=y
configs/Ippo_q8h_v1_2_a33_1024x600_defconfig
Diff comments   View file @ 6bed24c
... ... @@ -12,7 +12,7 @@
12 12 CONFIG_VIDEO_LCD_POWER="PH7"
13 13 CONFIG_VIDEO_LCD_BL_EN="PH6"
14 14 CONFIG_VIDEO_LCD_BL_PWM="PH0"
15   -CONFIG_USB_MUSB_SUNXI=y
  15 +CONFIG_USB_MUSB_HOST=y
16 16 CONFIG_DEFAULT_DEVICE_TREE="sun8i-a33-ippo-q8h-v1.2"
17 17 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
18 18 CONFIG_SPL=y
configs/Ippo_q8h_v1_2_defconfig
Diff comments   View file @ 6bed24c
... ... @@ -12,7 +12,7 @@
12 12 CONFIG_VIDEO_LCD_POWER="PH7"
13 13 CONFIG_VIDEO_LCD_BL_EN="PH6"
14 14 CONFIG_VIDEO_LCD_BL_PWM="PH0"
15   -CONFIG_USB_MUSB_SUNXI=y
  15 +CONFIG_USB_MUSB_HOST=y
16 16 CONFIG_DEFAULT_DEVICE_TREE="sun8i-a23-ippo-q8h-v1.2"
17 17 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
18 18 CONFIG_SPL=y
configs/Ippo_q8h_v5_defconfig
Diff comments   View file @ 6bed24c
... ... @@ -12,7 +12,7 @@
12 12 CONFIG_VIDEO_LCD_POWER="PH7"
13 13 CONFIG_VIDEO_LCD_BL_EN="PH6"
14 14 CONFIG_VIDEO_LCD_BL_PWM="PH0"
15   -CONFIG_USB_MUSB_SUNXI=y
  15 +CONFIG_USB_MUSB_HOST=y
16 16 CONFIG_DEFAULT_DEVICE_TREE="sun8i-a23-ippo-q8h-v5"
17 17 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
18 18 CONFIG_SPL=y
configs/MSI_Primo81_defconfig
Diff comments   View file @ 6bed24c
... ... @@ -10,7 +10,7 @@
10 10 CONFIG_VIDEO_LCD_BL_EN="PA25"
11 11 CONFIG_VIDEO_LCD_BL_PWM="PH13"
12 12 CONFIG_VIDEO_LCD_PANEL_MIPI_4_LANE_513_MBPS_VIA_SSD2828=y
13   -CONFIG_USB_MUSB_SUNXI=y
  13 +CONFIG_USB_MUSB_HOST=y
14 14 # CONFIG_USB_KEYBOARD is not set
15 15 CONFIG_DEFAULT_DEVICE_TREE="sun6i-a31s-primo81"
16 16 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
configs/Mele_A1000G_quad_defconfig
Diff comments   View file @ 6bed24c
... ... @@ -17,5 +17,5 @@
17 17 CONFIG_AXP221_DLDO4_VOLT=3300
18 18 CONFIG_AXP221_ALDO1_VOLT=3300
19 19 CONFIG_USB_EHCI_HCD=y
20   -CONFIG_USB_MUSB_SUNXI=y
  20 +CONFIG_USB_MUSB_HOST=y
configs/Mini-X_defconfig
Diff comments   View file @ 6bed24c
... ... @@ -9,6 +9,6 @@
9 9 # CONFIG_CMD_FLASH is not set
10 10 # CONFIG_CMD_FPGA is not set
11 11 CONFIG_USB_EHCI_HCD=y
12   -CONFIG_USB_MUSB_SUNXI=y
  12 +CONFIG_USB_MUSB_HOST=y
13 13 CONFIG_USB0_VBUS_PIN="PB9"
configs/TZX-Q8-713B7_defconfig
Diff comments   View file @ 6bed24c
... ... @@ -10,7 +10,7 @@
10 10 CONFIG_VIDEO_LCD_POWER="AXP0-0"
11 11 CONFIG_VIDEO_LCD_BL_EN="AXP0-1"
12 12 CONFIG_VIDEO_LCD_BL_PWM="PB2"
13   -CONFIG_USB_MUSB_SUNXI=y
  13 +CONFIG_USB_MUSB_HOST=y
14 14 CONFIG_DEFAULT_DEVICE_TREE="sun5i-a13-tzx-q8-713b7"
15 15 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
16 16 CONFIG_SPL=y
configs/UTOO_P66_defconfig
Diff comments   View file @ 6bed24c
... ... @@ -15,7 +15,7 @@
15 15 CONFIG_VIDEO_LCD_BL_EN="AXP0-1"
16 16 CONFIG_VIDEO_LCD_BL_PWM="PB2"
17 17 CONFIG_VIDEO_LCD_TL059WV5C0=y
18   -CONFIG_USB_MUSB_SUNXI=y
  18 +CONFIG_USB_MUSB_HOST=y
19 19 CONFIG_DEFAULT_DEVICE_TREE="sun5i-a13-utoo-p66"
20 20 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
21 21 CONFIG_SPL=y
configs/Yones_Toptech_BD1078_defconfig
Diff comments   View file @ 6bed24c
... ... @@ -16,7 +16,7 @@
16 16 CONFIG_VIDEO_LCD_BL_PWM="PB2"
17 17 # CONFIG_VIDEO_LCD_BL_PWM_ACTIVE_LOW is not set
18 18 CONFIG_VIDEO_LCD_PANEL_LVDS=y
19   -CONFIG_USB_MUSB_SUNXI=y
  19 +CONFIG_USB_MUSB_HOST=y
20 20 CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-yones-toptech-bd1078"
21 21 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
22 22 CONFIG_SPL=y
configs/ba10_tv_box_defconfig
Diff comments   View file @ 6bed24c
... ... @@ -12,6 +12,6 @@
12 12 # CONFIG_CMD_FLASH is not set
13 13 # CONFIG_CMD_FPGA is not set
14 14 CONFIG_USB_EHCI_HCD=y
15   -CONFIG_USB_MUSB_SUNXI=y
  15 +CONFIG_USB_MUSB_HOST=y
16 16 CONFIG_USB0_VBUS_PIN="PB9"
configs/forfun_q88db_defconfig
Diff comments   View file @ 6bed24c
... ... @@ -9,7 +9,7 @@
9 9 CONFIG_VIDEO_LCD_POWER="AXP0-0"
10 10 CONFIG_VIDEO_LCD_BL_EN="AXP0-1"
11 11 CONFIG_VIDEO_LCD_BL_PWM="PB2"
12   -CONFIG_USB_MUSB_SUNXI=y
  12 +CONFIG_USB_MUSB_HOST=y
13 13 CONFIG_DEFAULT_DEVICE_TREE="sun5i-a13-forfun-q88db"
14 14 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
15 15 CONFIG_SPL=y
configs/ga10h_v1_1_defconfig
Diff comments   View file @ 6bed24c
... ... @@ -14,7 +14,7 @@
14 14 CONFIG_VIDEO_LCD_BL_EN="PH6"
15 15 CONFIG_VIDEO_LCD_BL_PWM="PH0"
16 16 CONFIG_VIDEO_LCD_PANEL_LVDS=y
17   -CONFIG_USB_MUSB_SUNXI=y
  17 +CONFIG_USB_MUSB_HOST=y
18 18 CONFIG_DEFAULT_DEVICE_TREE="sun8i-a33-ga10h-v1.1"
19 19 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
20 20 CONFIG_SPL=y
configs/iNet_3F_defconfig
Diff comments   View file @ 6bed24c
... ... @@ -11,7 +11,7 @@
11 11 CONFIG_VIDEO_LCD_BL_EN="PH7"
12 12 CONFIG_VIDEO_LCD_BL_PWM="PB2"
13 13 CONFIG_VIDEO_LCD_PANEL_LVDS=y
14   -CONFIG_USB_MUSB_SUNXI=y
  14 +CONFIG_USB_MUSB_HOST=y
15 15 CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-inet-3f"
16 16 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
17 17 CONFIG_SPL=y
configs/iNet_3W_defconfig
Diff comments   View file @ 6bed24c
... ... @@ -11,7 +11,7 @@
11 11 CONFIG_VIDEO_LCD_POWER="PH8"
12 12 CONFIG_VIDEO_LCD_BL_EN="PH7"
13 13 CONFIG_VIDEO_LCD_BL_PWM="PB2"
14   -CONFIG_USB_MUSB_SUNXI=y
  14 +CONFIG_USB_MUSB_HOST=y
15 15 CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-inet-3w"
16 16 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
17 17 CONFIG_SPL=y
configs/iNet_86VS_defconfig
Diff comments   View file @ 6bed24c
... ... @@ -9,7 +9,7 @@
9 9 CONFIG_VIDEO_LCD_POWER="AXP0-0"
10 10 CONFIG_VIDEO_LCD_BL_EN="AXP0-1"
11 11 CONFIG_VIDEO_LCD_BL_PWM="PB2"
12   -CONFIG_USB_MUSB_SUNXI=y
  12 +CONFIG_USB_MUSB_HOST=y
13 13 CONFIG_DEFAULT_DEVICE_TREE="sun5i-a13-inet-86vs"
14 14 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
15 15 CONFIG_SPL=y
drivers/usb/musb-new/Kconfig
Diff comments   View file @ 6bed24c
... ... @@ -12,4 +12,18 @@
12 12 bool "MUSB gadget mode support"
13 13 help
14 14 Enables the MUSB USB dual-role controller in gadget mode.
  15 +
  16 +if USB_MUSB_HOST || USB_MUSB_GADGET
  17 +
  18 +config USB_MUSB_SUNXI
  19 + bool "Enable sunxi OTG / DRC USB controller"
  20 + depends on ARCH_SUNXI
  21 + default y
  22 + ---help---
  23 + Say y here to enable support for the sunxi OTG / DRC USB controller
  24 + used on almost all sunxi boards. Note currently u-boot can only have
  25 + one usb host controller enabled at a time, so enabling this on boards
  26 + which also use the ehci host controller will result in build errors.
  27 +
  28 +endif