diff options
| author | Zoltan Herpai <wigyori@uid0.hu> | 2016-11-23 19:41:24 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-23 19:41:24 +0100 |
| commit | fee8b58d42c5b155d91929a2148033eac0b26018 (patch) | |
| tree | 90c6e6efe69a480f1ed9cb7ded42548fab0ef4c2 /package/boot/uboot-sunxi/patches/017-usb-add-support-for-usb3-vbus-pin.patch | |
| parent | 10ccba1ba8759e1f1bbfb5471e9fe6b197979139 (diff) | |
| parent | 9e2f8fa1e5df297c172ce1472eb076c3c0b27cad (diff) | |
| download | master-187ad058-fee8b58d42c5b155d91929a2148033eac0b26018.tar.gz master-187ad058-fee8b58d42c5b155d91929a2148033eac0b26018.tar.bz2 master-187ad058-fee8b58d42c5b155d91929a2148033eac0b26018.zip | |
Merge pull request #241 from wigyori/sunxi-uboot-fixes
uboot-sunxi: fix default config for OLIMEX A13 SOM
Diffstat (limited to 'package/boot/uboot-sunxi/patches/017-usb-add-support-for-usb3-vbus-pin.patch')
| -rw-r--r-- | package/boot/uboot-sunxi/patches/017-usb-add-support-for-usb3-vbus-pin.patch | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/package/boot/uboot-sunxi/patches/017-usb-add-support-for-usb3-vbus-pin.patch b/package/boot/uboot-sunxi/patches/017-usb-add-support-for-usb3-vbus-pin.patch index 8c67063688..098fe72035 100644 --- a/package/boot/uboot-sunxi/patches/017-usb-add-support-for-usb3-vbus-pin.patch +++ b/package/boot/uboot-sunxi/patches/017-usb-add-support-for-usb3-vbus-pin.patch @@ -12,8 +12,6 @@ Acked-by: Ian Campbell <ijc@hellion.org.uk> board/sunxi/Kconfig | 6 ++++++ 2 files changed, 7 insertions(+) -diff --git a/arch/arm/cpu/armv7/sunxi/usb_phy.c b/arch/arm/cpu/armv7/sunxi/usb_phy.c -index 6ac96cc..0749fbd 100644 --- a/arch/arm/cpu/armv7/sunxi/usb_phy.c +++ b/arch/arm/cpu/armv7/sunxi/usb_phy.c @@ -76,6 +76,7 @@ static int get_vbus_gpio(int index) @@ -24,11 +22,9 @@ index 6ac96cc..0749fbd 100644 } return -EINVAL; } -diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig -index 5e9d3af..5e72fac 100644 --- a/board/sunxi/Kconfig +++ b/board/sunxi/Kconfig -@@ -342,6 +342,12 @@ config USB2_VBUS_PIN +@@ -341,6 +341,12 @@ config USB2_VBUS_PIN ---help--- See USB1_VBUS_PIN help text. |