ar71xx: add ath79_wmac_register_simple helper

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 34645

diff --git a/target/linux/ar71xx/patches-3.3/522-MIPS-ath79-add-ath79_wmac_register_simple-helper.patch b/target/linux/ar71xx/patches-3.3/522-MIPS-ath79-add-ath79_wmac_register_simple-helper.patch
new file mode 100644 (file)
index 0000000..acf2a3f
--- /dev/null
+++ b/target/linux/ar71xx/patches-3.3/522-MIPS-ath79-add-ath79_wmac_register_simple-helper.patch
@@ -0,0 +1,21 @@
+--- a/arch/mips/ath79/dev-wmac.c
++++ b/arch/mips/ath79/dev-wmac.c
+@@ -163,3 +163,9 @@ void __init ath79_register_wmac(u8 *cal_
+ 
+       platform_device_register(&ath79_wmac_device);
+ }
++
++void __init ath79_register_wmac_simple(void)
++{
++      ath79_register_wmac(NULL, NULL);
++      ath79_wmac_data.eeprom_name = "soc_wmac.eeprom";
++}
+--- a/arch/mips/ath79/dev-wmac.h
++++ b/arch/mips/ath79/dev-wmac.h
+@@ -13,5 +13,6 @@
+ #define _ATH79_DEV_WMAC_H
+ 
+ void ath79_register_wmac(u8 *cal_data, u8 *mac_addr);
++void ath79_register_wmac_simple(void);
+ 
+ #endif /* _ATH79_DEV_WMAC_H */

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 087dbc0829b56eb09080ff5be157bb0f5798d563..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
@@ -140,10 +140,10 @@
        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 */

diff --git a/target/linux/ar71xx/patches-3.3/621-MIPS-ath79-add-ath79_wmac_disable_25ghz-helpers.patch b/target/linux/ar71xx/patches-3.3/621-MIPS-ath79-add-ath79_wmac_disable_25ghz-helpers.patch
index ca5900b17e7fd17aac0e5edf5df2ba3b39f23442..bada5a8976dd6ecfcba2ec8b9771f7ede0203cc3 100644 (file)
--- a/target/linux/ar71xx/patches-3.3/621-MIPS-ath79-add-ath79_wmac_disable_25ghz-helpers.patch
+++ b/target/linux/ar71xx/patches-3.3/621-MIPS-ath79-add-ath79_wmac_disable_25ghz-helpers.patch
@@ -19,10 +19,10 @@
        if (soc_is_ar913x())
 --- a/arch/mips/ath79/dev-wmac.h
 +++ b/arch/mips/ath79/dev-wmac.h
-@@ -13,6 +13,9 @@
- #define _ATH79_DEV_WMAC_H
+@@ -14,6 +14,9 @@
  
  void ath79_register_wmac(u8 *cal_data, u8 *mac_addr);
+ void ath79_register_wmac_simple(void);
 +void ath79_wmac_disable_2ghz(void);
 +void ath79_wmac_disable_5ghz(void);
 +

diff --git a/target/linux/ar71xx/patches-3.6/522-MIPS-ath79-add-ath79_wmac_register_simple-helper.patch b/target/linux/ar71xx/patches-3.6/522-MIPS-ath79-add-ath79_wmac_register_simple-helper.patch
new file mode 100644 (file)
index 0000000..acf2a3f
--- /dev/null
+++ b/target/linux/ar71xx/patches-3.6/522-MIPS-ath79-add-ath79_wmac_register_simple-helper.patch
@@ -0,0 +1,21 @@
+--- a/arch/mips/ath79/dev-wmac.c
++++ b/arch/mips/ath79/dev-wmac.c
+@@ -163,3 +163,9 @@ void __init ath79_register_wmac(u8 *cal_
+ 
+       platform_device_register(&ath79_wmac_device);
+ }
++
++void __init ath79_register_wmac_simple(void)
++{
++      ath79_register_wmac(NULL, NULL);
++      ath79_wmac_data.eeprom_name = "soc_wmac.eeprom";
++}
+--- a/arch/mips/ath79/dev-wmac.h
++++ b/arch/mips/ath79/dev-wmac.h
+@@ -13,5 +13,6 @@
+ #define _ATH79_DEV_WMAC_H
+ 
+ void ath79_register_wmac(u8 *cal_data, u8 *mac_addr);
++void ath79_register_wmac_simple(void);
+ 
+ #endif /* _ATH79_DEV_WMAC_H */

diff --git a/target/linux/ar71xx/patches-3.6/620-MIPS-ath79-OTP-support.patch b/target/linux/ar71xx/patches-3.6/620-MIPS-ath79-OTP-support.patch
index 087dbc0829b56eb09080ff5be157bb0f5798d563..7bd17d80d80ea1dc7d4a0460ff60cb75f4804666 100644 (file)
--- a/target/linux/ar71xx/patches-3.6/620-MIPS-ath79-OTP-support.patch
+++ b/target/linux/ar71xx/patches-3.6/620-MIPS-ath79-OTP-support.patch
@@ -140,10 +140,10 @@
        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 */

diff --git a/target/linux/ar71xx/patches-3.6/621-MIPS-ath79-add-ath79_wmac_disable_25ghz-helpers.patch b/target/linux/ar71xx/patches-3.6/621-MIPS-ath79-add-ath79_wmac_disable_25ghz-helpers.patch
index ca5900b17e7fd17aac0e5edf5df2ba3b39f23442..bada5a8976dd6ecfcba2ec8b9771f7ede0203cc3 100644 (file)
--- a/target/linux/ar71xx/patches-3.6/621-MIPS-ath79-add-ath79_wmac_disable_25ghz-helpers.patch
+++ b/target/linux/ar71xx/patches-3.6/621-MIPS-ath79-add-ath79_wmac_disable_25ghz-helpers.patch
@@ -19,10 +19,10 @@
        if (soc_is_ar913x())
 --- a/arch/mips/ath79/dev-wmac.h
 +++ b/arch/mips/ath79/dev-wmac.h
-@@ -13,6 +13,9 @@
- #define _ATH79_DEV_WMAC_H
+@@ -14,6 +14,9 @@
  
  void ath79_register_wmac(u8 *cal_data, u8 *mac_addr);
+ void ath79_register_wmac_simple(void);
 +void ath79_wmac_disable_2ghz(void);
 +void ath79_wmac_disable_5ghz(void);
 +