kernel: update 3.14 to 3.14.25

[openwrt/openwrt.git] / target / linux / generic / patches-3.8 / 020-ssb_update.patch

diff --git a/target/linux/generic/patches-3.8/020-ssb_update.patch b/target/linux/generic/patches-3.8/020-ssb_update.patch
index 4dd5dad1692c0a0deebe6ff1d0f92802bf3e50b4..7baa17d447073b7c7d03ea73b8601dd757b8b26b 100644 (file)
--- a/target/linux/generic/patches-3.8/020-ssb_update.patch
+++ b/target/linux/generic/patches-3.8/020-ssb_update.patch
@@ -104,7 +104,7 @@
        }
  
        if (updown_tab) {
-@@ -526,8 +524,8 @@ void ssb_pmu_init(struct ssb_chipcommon 
+@@ -526,8 +524,8 @@ void ssb_pmu_init(struct ssb_chipcommon
        pmucap = chipco_read32(cc, SSB_CHIPCO_PMU_CAP);
        cc->pmu.rev = (pmucap & SSB_CHIPCO_PMU_CAP_REVISION);
  
@@ -151,7 +151,7 @@
                return 0;
        }
  }
-@@ -692,8 +687,23 @@ void ssb_pmu_spuravoid_pllupdate(struct 
+@@ -692,8 +687,23 @@ void ssb_pmu_spuravoid_pllupdate(struct
                pmu_ctl = SSB_CHIPCO_PMU_CTL_PLL_UPD;
                break;
        case 43222:
@@ -346,7 +346,7 @@
 +}
 --- a/drivers/ssb/driver_gpio.c
 +++ b/drivers/ssb/driver_gpio.c
-@@ -74,6 +74,16 @@ static void ssb_gpio_chipco_free(struct 
+@@ -74,6 +74,16 @@ static void ssb_gpio_chipco_free(struct
        ssb_chipco_gpio_pullup(&bus->chipco, 1 << gpio, 0);
  }
  
@@ -465,7 +465,7 @@
  }
  
  static void dump_irq(struct ssb_bus *bus)
-@@ -189,34 +210,43 @@ static void ssb_mips_serial_init(struct 
+@@ -189,34 +210,43 @@ static void ssb_mips_serial_init(struct
  static void ssb_mips_flash_detect(struct ssb_mipscore *mcore)
  {
        struct ssb_bus *bus = mcore->dev->bus;
@@ -993,7 +993,7 @@
        SPEX(alpha2[0], SSB_SPROM8_CCODE, 0xff00, 8);
        SPEX(alpha2[1], SSB_SPROM8_CCODE, 0x00ff, 0);
        SPEX(boardflags_lo, SSB_SPROM8_BFLLO, 0xFFFF, 0);
-@@ -743,7 +753,7 @@ static int sprom_extract(struct ssb_bus 
+@@ -743,7 +753,7 @@ static int sprom_extract(struct ssb_bus
        memset(out, 0, sizeof(*out));
  
        out->revision = in[size - 1] & 0x00FF;
@@ -1002,7 +1002,7 @@
        memset(out->et0mac, 0xFF, 6);           /* preset et0 and et1 mac */
        memset(out->et1mac, 0xFF, 6);
  
-@@ -752,7 +762,7 @@ static int sprom_extract(struct ssb_bus 
+@@ -752,7 +762,7 @@ static int sprom_extract(struct ssb_bus
                 * number stored in the SPROM.
                 * Always extract r1. */
                out->revision = 1;
@@ -1011,7 +1011,7 @@
        }
  
        switch (out->revision) {
-@@ -769,9 +779,8 @@ static int sprom_extract(struct ssb_bus 
+@@ -769,9 +779,8 @@ static int sprom_extract(struct ssb_bus
                sprom_extract_r8(out, in);
                break;
        default: