ar71xx: merge unifi outdoor patch into the ubnt-xm one

[openwrt/svn-archive/archive.git] / target / linux / ar71xx / patches-3.3 / 620-MIPS-ath79-OTP-support.patch

diff --git a/target/linux/ar71xx/patches-3.3/620-MIPS-ath79-OTP-support.patch b/target/linux/ar71xx/patches-3.3/620-MIPS-ath79-OTP-support.patch
index 096329291f6f9fdb866380a7c6d94ee7002326c3..7bd17d80d80ea1dc7d4a0460ff60cb75f4804666 100644 (file)
--- a/target/linux/ar71xx/patches-3.3/620-MIPS-ath79-OTP-support.patch
+++ b/target/linux/ar71xx/patches-3.3/620-MIPS-ath79-OTP-support.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/ath79/dev-wmac.c
 +++ b/arch/mips/ath79/dev-wmac.c
-@@ -121,6 +121,137 @@ static void ar934x_wmac_setup(void)
+@@ -139,6 +139,137 @@ static void qca955x_wmac_setup(void)
                ath79_wmac_data.is_clk_25mhz = true;
  }
  
@@ -140,18 +140,18 @@
        if (soc_is_ar913x())
 --- a/arch/mips/ath79/dev-wmac.h
 +++ b/arch/mips/ath79/dev-wmac.h
-@@ -13,5 +13,6 @@
- #define _ATH79_DEV_WMAC_H
+@@ -14,5 +14,6 @@
  
  void ath79_register_wmac(u8 *cal_data, u8 *mac_addr);
+ void ath79_register_wmac_simple(void);
 +bool ar93xx_wmac_read_mac_address(u8 *dest);
  
  #endif /* _ATH79_DEV_WMAC_H */
 --- a/arch/mips/include/asm/mach-ath79/ar71xx_regs.h
 +++ b/arch/mips/include/asm/mach-ath79/ar71xx_regs.h
-@@ -78,6 +78,14 @@
- #define AR934X_EHCI_BASE      0x1b000000
- #define AR934X_EHCI_SIZE      0x1000
+@@ -129,6 +129,14 @@
+ #define QCA955X_NFC_BASE      0x1b000200
+ #define QCA955X_NFC_SIZE      0xb8
  
 +#define AR9300_OTP_BASE               0x14000
 +#define AR9300_OTP_STATUS     0x15f18