kernel: update 3.18 to 3.18.14

[openwrt/openwrt.git] / target / linux / ar71xx / patches-3.18 / 603-MIPS-ath79-ap121-fixes.patch

diff --git a/target/linux/ar71xx/patches-3.18/603-MIPS-ath79-ap121-fixes.patch b/target/linux/ar71xx/patches-3.18/603-MIPS-ath79-ap121-fixes.patch
index 36139b09051ad232a6919a85713364bff96fdca0..706e5afdfe6aef78b41177553e636263a8a590e7 100644 (file)
--- a/target/linux/ar71xx/patches-3.18/603-MIPS-ath79-ap121-fixes.patch
+++ b/target/linux/ar71xx/patches-3.18/603-MIPS-ath79-ap121-fixes.patch
@@ -45,26 +45,22 @@
  };
  
 -static struct spi_board_info ap121_spi_info[] = {
--      {
++static struct gpio_led ap121_mini_leds_gpio[] __initdata = {
+       {
 -              .bus_num        = 0,
 -              .chip_select    = 0,
 -              .max_speed_hz   = 25000000,
 -              .modalias       = "mx25l1606e",
 -      }
--};
--
--static struct ath79_spi_platform_data ap121_spi_data = {
--      .bus_num        = 0,
--      .num_chipselect = 1,
--};
-+static struct gpio_led ap121_mini_leds_gpio[] __initdata = {
-+      {
 +              .name           = "ap121:green:wlan",
 +              .gpio           = AP121_MINI_GPIO_LED_WLAN,
 +              .active_low     = 0,
 +      },
-+};
-+
+ };
+ 
+-static struct ath79_spi_platform_data ap121_spi_data = {
+-      .bus_num        = 0,
+-      .num_chipselect = 1,
 +static struct gpio_keys_button ap121_mini_gpio_keys[] __initdata = {
 +      {
 +              .desc           = "jumpstart button",
@@ -82,8 +78,8 @@
 +              .gpio           = AP121_MINI_GPIO_BTN_RESET,
 +              .active_low     = 1,
 +      }
-+};
-+
+ };
+ 
 +static void __init ap121_common_setup(void)
 +{
 +      u8 *art = (u8 *) KSEG1ADDR(0x1fff0000);
@@ -103,7 +99,7 @@
 +      /* WAN port */
 +      ath79_register_eth(0);
 +}
- 
++
  static void __init ap121_setup(void)
  {
 -      u8 *cal_data = (u8 *) KSEG1ADDR(AP121_CAL_DATA_ADDR);