Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 7f7409ba6ab937b73f16bac8d83e215db86ace3d

Authored by Hans de Goede
1 parent a51c832cc1
Exists in v2017.01-smarct4x and in 30 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.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: Enable both ehci and otg in host mode on various boards 

Now that the device-model port of the musb mode makes it possible, enable
both the ehci and otg in host mode on boards where the musb is wired up in
host only mode, either via an usb-a receptacle or via an usb <-> sata
converter.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Marek Vasut <marex@denx.de>
Acked-by: Ian Campbell <ijc@hellion.org.uk>

Showing 4 changed files with 6 additions and 0 deletions Inline Diff

configs/CSQ_CS908_defconfig
Diff comments   View file @ 7f7409b
1 CONFIG_ARM=y 1 CONFIG_ARM=y
2 CONFIG_ARCH_SUNXI=y 2 CONFIG_ARCH_SUNXI=y
3 CONFIG_MACH_SUN6I=y 3 CONFIG_MACH_SUN6I=y
4 CONFIG_DRAM_CLK=432 4 CONFIG_DRAM_CLK=432
5 CONFIG_USB1_VBUS_PIN="" 5 CONFIG_USB1_VBUS_PIN=""
6 CONFIG_USB2_VBUS_PIN="" 6 CONFIG_USB2_VBUS_PIN=""
7 CONFIG_DEFAULT_DEVICE_TREE="sun6i-a31s-cs908" 7 CONFIG_DEFAULT_DEVICE_TREE="sun6i-a31s-cs908"
8 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set 8 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
9 CONFIG_SPL=y 9 CONFIG_SPL=y
10 CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC" 10 CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC"
11 # CONFIG_CMD_IMLS is not set 11 # CONFIG_CMD_IMLS is not set
12 # CONFIG_CMD_FLASH is not set 12 # CONFIG_CMD_FLASH is not set
13 # CONFIG_CMD_FPGA is not set 13 # CONFIG_CMD_FPGA is not set
14 CONFIG_ETH_DESIGNWARE=y 14 CONFIG_ETH_DESIGNWARE=y
15 CONFIG_AXP221_DLDO1_VOLT=3300 15 CONFIG_AXP221_DLDO1_VOLT=3300
16 CONFIG_AXP221_ALDO1_VOLT=3300 16 CONFIG_AXP221_ALDO1_VOLT=3300
17 CONFIG_USB_EHCI_HCD=y 17 CONFIG_USB_EHCI_HCD=y
18 CONFIG_USB_MUSB_SUNXI=y
18 19
configs/Mele_A1000G_quad_defconfig
Diff comments   View file @ 7f7409b
1 CONFIG_ARM=y 1 CONFIG_ARM=y
2 CONFIG_ARCH_SUNXI=y 2 CONFIG_ARCH_SUNXI=y
3 CONFIG_MACH_SUN6I=y 3 CONFIG_MACH_SUN6I=y
4 CONFIG_DRAM_ZQ=120 4 CONFIG_DRAM_ZQ=120
5 CONFIG_USB1_VBUS_PIN="PC27" 5 CONFIG_USB1_VBUS_PIN="PC27"
6 CONFIG_USB2_VBUS_PIN="" 6 CONFIG_USB2_VBUS_PIN=""
7 CONFIG_DEFAULT_DEVICE_TREE="sun6i-a31-mele-a1000g-quad" 7 CONFIG_DEFAULT_DEVICE_TREE="sun6i-a31-mele-a1000g-quad"
8 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set 8 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
9 CONFIG_SPL=y 9 CONFIG_SPL=y
10 CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC" 10 CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC"
11 # CONFIG_CMD_IMLS is not set 11 # CONFIG_CMD_IMLS is not set
12 # CONFIG_CMD_FLASH is not set 12 # CONFIG_CMD_FLASH is not set
13 # CONFIG_CMD_FPGA is not set 13 # CONFIG_CMD_FPGA is not set
14 CONFIG_ETH_DESIGNWARE=y 14 CONFIG_ETH_DESIGNWARE=y
15 CONFIG_AXP221_DCDC1_VOLT=3300 15 CONFIG_AXP221_DCDC1_VOLT=3300
16 CONFIG_AXP221_DLDO1_VOLT=3300 16 CONFIG_AXP221_DLDO1_VOLT=3300
17 CONFIG_AXP221_DLDO4_VOLT=3300 17 CONFIG_AXP221_DLDO4_VOLT=3300
18 CONFIG_AXP221_ALDO1_VOLT=3300 18 CONFIG_AXP221_ALDO1_VOLT=3300
19 CONFIG_USB_EHCI_HCD=y 19 CONFIG_USB_EHCI_HCD=y
20 CONFIG_USB_MUSB_SUNXI=y
20 21
configs/Mini-X_defconfig
Diff comments   View file @ 7f7409b
1 CONFIG_ARM=y 1 CONFIG_ARM=y
2 CONFIG_ARCH_SUNXI=y 2 CONFIG_ARCH_SUNXI=y
3 CONFIG_MACH_SUN4I=y 3 CONFIG_MACH_SUN4I=y
4 CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-mini-xplus" 4 CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-mini-xplus"
5 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set 5 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
6 CONFIG_SPL=y 6 CONFIG_SPL=y
7 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER" 7 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER"
8 # CONFIG_CMD_IMLS is not set 8 # CONFIG_CMD_IMLS is not set
9 # CONFIG_CMD_FLASH is not set 9 # CONFIG_CMD_FLASH is not set
10 # CONFIG_CMD_FPGA is not set 10 # CONFIG_CMD_FPGA is not set
11 CONFIG_USB_EHCI_HCD=y 11 CONFIG_USB_EHCI_HCD=y
12 CONFIG_USB_MUSB_SUNXI=y
13 CONFIG_USB0_VBUS_PIN="PB9"
12 14
configs/ba10_tv_box_defconfig
Diff comments   View file @ 7f7409b
1 CONFIG_ARM=y 1 CONFIG_ARM=y
2 CONFIG_ARCH_SUNXI=y 2 CONFIG_ARCH_SUNXI=y
3 CONFIG_MACH_SUN4I=y 3 CONFIG_MACH_SUN4I=y
4 CONFIG_DRAM_CLK=384 4 CONFIG_DRAM_CLK=384
5 CONFIG_DRAM_EMR1=4 5 CONFIG_DRAM_EMR1=4
6 CONFIG_USB2_VBUS_PIN="PH12" 6 CONFIG_USB2_VBUS_PIN="PH12"
7 CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-ba10-tvbox" 7 CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-ba10-tvbox"
8 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set 8 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
9 CONFIG_SPL=y 9 CONFIG_SPL=y
10 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_EMAC" 10 CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_EMAC"
11 # CONFIG_CMD_IMLS is not set 11 # CONFIG_CMD_IMLS is not set
12 # CONFIG_CMD_FLASH is not set 12 # CONFIG_CMD_FLASH is not set
13 # CONFIG_CMD_FPGA is not set 13 # CONFIG_CMD_FPGA is not set
14 CONFIG_USB_EHCI_HCD=y 14 CONFIG_USB_EHCI_HCD=y
15 CONFIG_USB_MUSB_SUNXI=y
16 CONFIG_USB0_VBUS_PIN="PB9"
15 17