kernel: update 3.10 to 3.10.36

[openwrt.git] / target / linux / lantiq / patches-3.10 / 0202-lantiq_ath5k.patch

diff --git a/target/linux/lantiq/patches-3.10/0202-lantiq_ath5k.patch b/target/linux/lantiq/patches-3.10/0202-lantiq_ath5k.patch
index 9806fbb7b73a1cf48c1a635aa08fcf03434ba5cb..8ec9ff45cf0d7c0e155cb9544a87c9b26390c71e 100644 (file)
--- a/target/linux/lantiq/patches-3.10/0202-lantiq_ath5k.patch
+++ b/target/linux/lantiq/patches-3.10/0202-lantiq_ath5k.patch
@@ -1,8 +1,6 @@
-Index: linux-3.10.34/arch/mips/lantiq/xway/ath_eep.c
-===================================================================
---- linux-3.10.34.orig/arch/mips/lantiq/xway/ath_eep.c 2014-03-29 20:17:33.826386600 +0000
-+++ linux-3.10.34/arch/mips/lantiq/xway/ath_eep.c      2014-03-29 20:18:19.610387315 +0000
-@@ -36,6 +36,7 @@
+--- a/arch/mips/lantiq/xway/ath_eep.c
++++ b/arch/mips/lantiq/xway/ath_eep.c
+@@ -36,10 +36,11 @@ static int ath9k_pci_plat_dev_init(struc
        return 0;
  }
  
@@ -10,7 +8,12 @@ Index: linux-3.10.34/arch/mips/lantiq/xway/ath_eep.c
  int __init of_ath9k_eeprom_probe(struct platform_device *pdev)
  {
        struct device_node *np = pdev->dev.of_node, *mtd_np;
-@@ -112,6 +113,12 @@
+-      int mac_offset;
++      int mac_offset, led_pin;
+       u32 mac_inc = 0, pci_slot = 0;
+       int i;
+       struct mtd_info *the_mtd;
+@@ -112,6 +113,18 @@ int __init of_ath9k_eeprom_probe(struct
        if (!of_property_read_u32(np, "ath,pci-slot", &pci_slot)) {
                ltq_pci_ath_fixup(pci_slot, ath9k_pdata.eeprom_data);
                dev_info(&pdev->dev, "pci slot: %u\n", pci_slot);
@@ -20,10 +23,16 @@ Index: linux-3.10.34/arch/mips/lantiq/xway/ath_eep.c
 +                                      PCI_ANY_ID, d)) != NULL)
 +                              pci_fixup_device(pci_fixup_early, d);
 +              }
++      }
++
++      if (!of_property_read_u32(np, "ath,led-pin", &led_pin)) {
++              ath9k_pdata.led_pin = led_pin;
++
++              dev_info(&pdev->dev, "using led pin %d.\n", led_pin);
        }
  
        dev_info(&pdev->dev, "loaded ath9k eeprom\n");
-@@ -132,20 +139,19 @@
+@@ -132,20 +145,19 @@ static struct platform_driver ath9k_eepr
        },
  };
  
@@ -47,7 +56,7 @@ Index: linux-3.10.34/arch/mips/lantiq/xway/ath_eep.c
                return 0;
        return platform_driver_probe(&ath9k_eeprom_driver, of_ath9k_eeprom_probe);
  }
-@@ -247,4 +253,4 @@
+@@ -247,4 +259,4 @@ static int __init of_ath5k_eeprom_init(v
  {
        return platform_driver_probe(&ath5k_eeprom_driver, of_ath5k_eeprom_probe);
  }