aboutsummaryrefslogtreecommitdiffstats
path: root/package/boot/uboot-sunxi/patches/100-sun6i-alternate-on-UART2.patch
diff options
context:
space:
mode:
authorZoltan Herpai <wigyori@uid0.hu>2016-12-27 16:00:41 +0100
committerGitHub <noreply@github.com>2016-12-27 16:00:41 +0100
commit187ad058ee1f21b1d78ff86fe2fc42459f10457b (patch)
treec34448b5d917975d8a6f6b5ccbbebe4f67443e9f /package/boot/uboot-sunxi/patches/100-sun6i-alternate-on-UART2.patch
parent5ecf7a9b2804ed5dc6fc0389c95656c6695568a0 (diff)
parent52b0b6ea7a440b4cf3c9eb33557be7ad63e23f77 (diff)
downloadmaster-187ad058-187ad058ee1f21b1d78ff86fe2fc42459f10457b.tar.gz
master-187ad058-187ad058ee1f21b1d78ff86fe2fc42459f10457b.tar.bz2
master-187ad058-187ad058ee1f21b1d78ff86fe2fc42459f10457b.zip
Merge pull request #291 from wigyori/sunxi-uboot-fixesHEADmaster
sunxi: uboot-sunxi: update to 2016.11
Diffstat (limited to 'package/boot/uboot-sunxi/patches/100-sun6i-alternate-on-UART2.patch')
-rw-r--r--package/boot/uboot-sunxi/patches/100-sun6i-alternate-on-UART2.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/package/boot/uboot-sunxi/patches/100-sun6i-alternate-on-UART2.patch b/package/boot/uboot-sunxi/patches/100-sun6i-alternate-on-UART2.patch
index bf5dc66e1a..b3d9ba0409 100644
--- a/package/boot/uboot-sunxi/patches/100-sun6i-alternate-on-UART2.patch
+++ b/package/boot/uboot-sunxi/patches/100-sun6i-alternate-on-UART2.patch
@@ -6,11 +6,11 @@ Subject: sun6i: define alternate-function for UART2 on GPG
--- a/arch/arm/include/asm/arch-sunxi/gpio.h
+++ b/arch/arm/include/asm/arch-sunxi/gpio.h
-@@ -180,6 +180,7 @@ enum sunxi_gpio_number {
+@@ -185,6 +185,7 @@ enum sunxi_gpio_number {
#define SUN6I_GPG_SDC1 2
#define SUN8I_GPG_SDC1 2
#define SUN6I_GPG_TWI3 2
+#define SUN6I_GPG_UART2 2
#define SUN5I_GPG_UART1 4
- #define SUN4I_GPH_SDC1 5
+ #define SUN6I_GPH_PWM 2