diff options
| author | Felix Fietkau <nbd@nbd.name> | 2017-04-18 09:59:54 +0200 |
|---|---|---|
| committer | Felix Fietkau <nbd@nbd.name> | 2017-04-26 10:29:45 +0200 |
| commit | 837285b83221963739cda81911d8004f30f9afb0 (patch) | |
| tree | d32bf44f10674643120214d4edc2355c897fe524 /target/linux/ar71xx/patches-4.4/820-MIPS-ath79-add_gpio_function2_setup.patch | |
| parent | ad0c1d3a310554af94659d82f75ecb5e9013baeb (diff) | |
| download | upstream-837285b83221963739cda81911d8004f30f9afb0.tar.gz upstream-837285b83221963739cda81911d8004f30f9afb0.tar.bz2 upstream-837285b83221963739cda81911d8004f30f9afb0.zip | |
ar71xx: fold 641-MIPS-ath79-fix-AR934x-OTP-offsets.patch into the patch that it fixes
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'target/linux/ar71xx/patches-4.4/820-MIPS-ath79-add_gpio_function2_setup.patch')
| -rw-r--r-- | target/linux/ar71xx/patches-4.4/820-MIPS-ath79-add_gpio_function2_setup.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/ar71xx/patches-4.4/820-MIPS-ath79-add_gpio_function2_setup.patch b/target/linux/ar71xx/patches-4.4/820-MIPS-ath79-add_gpio_function2_setup.patch index 6b331587d1..4d72a6c67d 100644 --- a/target/linux/ar71xx/patches-4.4/820-MIPS-ath79-add_gpio_function2_setup.patch +++ b/target/linux/ar71xx/patches-4.4/820-MIPS-ath79-add_gpio_function2_setup.patch @@ -48,7 +48,7 @@ functions on the Arduino Yun. void __iomem *reg = ath79_gpio_get_function_reg(); --- a/arch/mips/include/asm/mach-ath79/ar71xx_regs.h +++ b/arch/mips/include/asm/mach-ath79/ar71xx_regs.h -@@ -855,6 +855,7 @@ +@@ -862,6 +862,7 @@ #define AR71XX_GPIO_REG_INT_PENDING 0x20 #define AR71XX_GPIO_REG_INT_ENABLE 0x24 #define AR71XX_GPIO_REG_FUNC 0x28 @@ -56,7 +56,7 @@ functions on the Arduino Yun. #define AR934X_GPIO_REG_OUT_FUNC0 0x2c #define AR934X_GPIO_REG_OUT_FUNC1 0x30 -@@ -979,6 +980,8 @@ +@@ -986,6 +987,8 @@ #define AR724X_GPIO_FUNC_UART_EN BIT(1) #define AR724X_GPIO_FUNC_JTAG_DISABLE BIT(0) |