CC: kernel: update kernel 3.18 to version 3.18.23

[15.05/openwrt.git] / target / linux / ramips / patches-3.18 / 0300-mt7628_fixes.patch

diff --git a/target/linux/ramips/patches-3.18/0300-mt7628_fixes.patch b/target/linux/ramips/patches-3.18/0300-mt7628_fixes.patch
index 1a5a0ba..8b7a405 100644 (file)
--- a/target/linux/ramips/patches-3.18/0300-mt7628_fixes.patch
+++ b/target/linux/ramips/patches-3.18/0300-mt7628_fixes.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/ralink/mt7620.c
 +++ b/arch/mips/ralink/mt7620.c
-@@ -101,28 +101,28 @@
+@@ -101,28 +101,28 @@ static struct rt2880_pmx_group mt7620a_p
  };
  
  static struct rt2880_pmx_func pwm1_grp_mt7628[] = {
@@ -35,7 +35,7 @@
        FUNC("pwm", 2, 45, 2),
        FUNC("gpio", 1, 45, 2),
        FUNC("uart1", 0, 45, 2),
-@@ -165,7 +165,7 @@
+@@ -165,7 +165,7 @@ static struct rt2880_pmx_func spi_cs1_gr
        FUNC("-", 3, 6, 1),
        FUNC("refclk", 2, 6, 1),
        FUNC("gpio", 1, 6, 1),
@@ -44,7 +44,7 @@
  };
  
  static struct rt2880_pmx_func spis_grp_mt7628[] = {
-@@ -182,27 +182,43 @@
+@@ -182,27 +182,43 @@ static struct rt2880_pmx_func gpio_grp_m
        FUNC("gpio", 0, 11, 1),
  };
  
@@ -107,7 +107,7 @@
        GRP_G("uart2", uart2_grp_mt7628, MT7628_GPIO_MODE_MASK, 1, MT7628_GPIO_MODE_UART2),
        GRP_G("uart1", uart1_grp_mt7628, MT7628_GPIO_MODE_MASK, 1, MT7628_GPIO_MODE_UART1),
        GRP_G("i2c", i2c_grp_mt7628, MT7628_GPIO_MODE_MASK, 1, MT7628_GPIO_MODE_I2C),
-@@ -216,6 +232,8 @@
+@@ -216,6 +232,8 @@ static struct rt2880_pmx_group mt7628an_
        GRP_G("spi cs1", spi_cs1_grp_mt7628, MT7628_GPIO_MODE_MASK, 1, MT7628_GPIO_MODE_CS1),
        GRP_G("spis", spis_grp_mt7628, MT7628_GPIO_MODE_MASK, 1, MT7628_GPIO_MODE_SPIS),
        GRP_G("gpio", gpio_grp_mt7628, MT7628_GPIO_MODE_MASK, 1, MT7628_GPIO_MODE_GPIO),
@@ -116,7 +116,7 @@
        { 0 }
  };
  
-@@ -529,7 +547,11 @@
+@@ -532,7 +550,11 @@ void prom_soc_init(struct ralink_soc_inf
                (rev & CHIP_REV_ECO_MASK));
  
        cfg0 = __raw_readl(sysc + SYSC_REG_SYSTEM_CONFIG0);