diff options
| author | Tom Rini <trini@konsulko.com> | 2021-12-09 08:43:30 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-12-09 08:43:30 -0500 |
| commit | 1530ad5becf330c6094e995e340d920df2b43699 (patch) | |
| tree | c8757eb5ff74c48de9802e48474555da08535145 | |
| parent | 558002a0f2230bedf6b38716f3ed86a92fc9010b (diff) | |
| parent | fbd9207e7fe3712b372ca9889a2a82402161fd27 (diff) | |
Merge branch 'master' of https://source.denx.de/u-boot/custodians/u-boot-sunxi
This fixes two regressions: eMMC operation on boards with WiFi (so using
three MMC devices), and a repeated wrong error message in USB gadget
mode (fastboot, ums).
| -rw-r--r-- | arch/arm/dts/sunxi-u-boot.dtsi | 2 | ||||
| -rw-r--r-- | board/sunxi/board.c | 8 |
2 files changed, 2 insertions, 8 deletions
diff --git a/arch/arm/dts/sunxi-u-boot.dtsi b/arch/arm/dts/sunxi-u-boot.dtsi index b7244c1112..f2d7361b84 100644 --- a/arch/arm/dts/sunxi-u-boot.dtsi +++ b/arch/arm/dts/sunxi-u-boot.dtsi @@ -13,7 +13,7 @@ / { aliases { mmc0 = &mmc0; -#if CONFIG_MMC_SUNXI_EXTRA_SLOT == 2 +#if CONFIG_MMC_SUNXI_SLOT_EXTRA == 2 mmc1 = &mmc2; #endif }; diff --git a/board/sunxi/board.c b/board/sunxi/board.c index 4f5747c34a..fdbcd40269 100644 --- a/board/sunxi/board.c +++ b/board/sunxi/board.c @@ -698,13 +698,7 @@ int g_dnl_board_usb_cable_connected(void) return ret; } - ret = sun4i_usb_phy_vbus_detect(&phy); - if (ret == 1) { - pr_err("A charger is plugged into the OTG\n"); - return -ENODEV; - } - - return ret; + return sun4i_usb_phy_vbus_detect(&phy); } #endif |