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/640-MIPS-ath79-add-QCA955x-wmac-reset.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/640-MIPS-ath79-add-QCA955x-wmac-reset.patch')
| -rw-r--r-- | target/linux/ar71xx/patches-4.4/640-MIPS-ath79-add-QCA955x-wmac-reset.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/ar71xx/patches-4.4/640-MIPS-ath79-add-QCA955x-wmac-reset.patch b/target/linux/ar71xx/patches-4.4/640-MIPS-ath79-add-QCA955x-wmac-reset.patch index 8aa5957a71..8ddb81c33c 100644 --- a/target/linux/ar71xx/patches-4.4/640-MIPS-ath79-add-QCA955x-wmac-reset.patch +++ b/target/linux/ar71xx/patches-4.4/640-MIPS-ath79-add-QCA955x-wmac-reset.patch @@ -20,7 +20,7 @@ #define AR71XX_UART_BASE (AR71XX_APB_BASE + 0x00020000) #define AR71XX_UART_SIZE 0x100 #define AR71XX_USB_CTRL_BASE (AR71XX_APB_BASE + 0x00030000) -@@ -222,6 +222,9 @@ +@@ -229,6 +229,9 @@ #define QCA953X_DDR_REG_FLUSH_PCIE 0xa8 #define QCA953X_DDR_REG_FLUSH_WMAC 0xac @@ -68,7 +68,7 @@ + ath79_wmac_data.external_reset = ar955x_wmac_reset; } - static void qca956x_wmac_setup(void) + #define AR93XX_WMAC_SIZE \ --- a/arch/mips/ath79/common.h +++ b/arch/mips/ath79/common.h @@ -19,6 +19,8 @@ |