brcm63xx: move buttons and leds to dts files

[openwrt/svn-archive/archive.git] / target / linux / brcm63xx / patches-3.14 / 413-BCM63XX-allow-providing-fixup-data-in-board-data.patch

diff --git a/target/linux/brcm63xx/patches-3.14/413-BCM63XX-allow-providing-fixup-data-in-board-data.patch b/target/linux/brcm63xx/patches-3.14/413-BCM63XX-allow-providing-fixup-data-in-board-data.patch
index 7991fad0e386488a45f787c2994ffb598ef7a633..09600057c5a4ecfc9f7ef6bf402d728ff5d8f4a2 100644 (file)
--- a/target/linux/brcm63xx/patches-3.14/413-BCM63XX-allow-providing-fixup-data-in-board-data.patch
+++ b/target/linux/brcm63xx/patches-3.14/413-BCM63XX-allow-providing-fixup-data-in-board-data.patch
@@ -8,35 +8,25 @@ Subject: [PATCH 58/72] BCM63XX: allow providing fixup data in board data
  arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h |   10 ++++++++++
  2 files changed, 18 insertions(+), 1 deletion(-)
 
---- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
-+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -33,6 +33,7 @@
+--- a/arch/mips/bcm63xx/boards/board_common.c
++++ b/arch/mips/bcm63xx/boards/board_common.c
+@@ -36,6 +36,7 @@
  #include <bcm63xx_dev_usb_ohci.h>
  #include <bcm63xx_dev_usb_usbd.h>
  #include <board_bcm963xx.h>
 +#include <pci_ath9k_fixup.h>
  
- #include <uapi/linux/bcm933xx_hcs.h>
- #include <uapi/linux/bcm963xx_tag.h>
-@@ -969,6 +970,7 @@ int __init board_register_devices(void)
+ #include "board_common.h"
+ 
+@@ -196,6 +197,7 @@ int __init board_register_devices(void)
        int button_count = 0;
        int led_count = 0;
        int usbh_ports = 0;
 +      int i;
  
-       if (board.has_uart0)
-               bcm63xx_uart_register(0);
-@@ -1014,7 +1016,8 @@ int __init board_register_devices(void)
-        * do this after registering enet devices
-        */
- #ifdef CONFIG_SSB_PCIHOST
--      if (!bcm63xx_nvram_get_mac_address(bcm63xx_sprom.il0mac)) {
-+      if (!board.has_caldata &&
-+          !bcm63xx_nvram_get_mac_address(bcm63xx_sprom.il0mac)) {
-               memcpy(bcm63xx_sprom.et0mac, bcm63xx_sprom.il0mac, ETH_ALEN);
-               memcpy(bcm63xx_sprom.et1mac, bcm63xx_sprom.il0mac, ETH_ALEN);
-               if (ssb_arch_register_fallback_sprom(
-@@ -1061,5 +1064,9 @@ int __init board_register_devices(void)
+ #if CONFIG_OF
+       if (of_have_populated_dt()) {
+@@ -296,6 +298,10 @@ int __init board_register_devices(void)
                platform_device_register(&bcm63xx_gpio_keys_device);
        }
  
@@ -46,17 +36,18 @@ Subject: [PATCH 58/72] BCM63XX: allow providing fixup data in board data
 +
        return 0;
  }
+ 
 --- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
 +++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h
-@@ -8,6 +8,7 @@
- #include <bcm63xx_dev_enet.h>
+@@ -10,6 +10,7 @@
  #include <bcm63xx_dev_usb_usbd.h>
  #include <bcm63xx_dev_dsp.h>
+ #include <bcm63xx_fallback_sprom.h>
 +#include <pci_ath9k_fixup.h>
  
  /*
   * flash mapping
-@@ -15,6 +16,11 @@
+@@ -17,6 +18,11 @@
  #define BCM963XX_CFE_VERSION_OFFSET   0x570
  #define BCM963XX_NVRAM_OFFSET         0x580
  
@@ -68,10 +59,10 @@ Subject: [PATCH 58/72] BCM63XX: allow providing fixup data in board data
  /*
   * board definition
   */
-@@ -34,6 +40,10 @@ struct board_info {
-       unsigned int    has_dsp:1;
+@@ -37,6 +43,10 @@ struct board_info {
        unsigned int    has_uart0:1;
        unsigned int    has_uart1:1;
+       unsigned int    use_fallback_sprom:1;
 +      unsigned int    has_caldata:2;
 +
 +      /* wifi calibration data config */