ar71xx: spi cleanup for ap121, db120, ubnt-xm and ap136

[oweals/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 b385b9e00b76176001a6956919be02854152f774..36139b09051ad232a6919a85713364bff96fdca0 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
@@ -40,29 +40,33 @@
  
  static struct gpio_led ap121_leds_gpio[] __initdata = {
        {
-@@ -58,41 +67,78 @@ static struct gpio_keys_button ap121_gpi
+@@ -58,35 +67,78 @@ static struct gpio_keys_button ap121_gpi
        }
  };
  
--static struct ath79_spi_controller_data ap121_spi0_data = {
--      .cs_type = ATH79_SPI_CS_TYPE_INTERNAL,
--      .cs_line = 0,
+-static struct spi_board_info ap121_spi_info[] = {
+-      {
+-              .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 spi_board_info ap121_spi_info[] = {
++};
++
 +static struct gpio_keys_button ap121_mini_gpio_keys[] __initdata = {
-       {
--              .bus_num        = 0,
--              .chip_select    = 0,
--              .max_speed_hz   = 25000000,
--              .modalias       = "mx25l1606e",
--              .controller_data = &ap121_spi0_data,
++      {
 +              .desc           = "jumpstart button",
 +              .type           = EV_KEY,
 +              .code           = KEY_WPS_BUTTON,
@@ -77,13 +81,9 @@
 +              .debounce_interval = AP121_KEYS_DEBOUNCE_INTERVAL,
 +              .gpio           = AP121_MINI_GPIO_BTN_RESET,
 +              .active_low     = 1,
-       }
- };
- 
--static struct ath79_spi_platform_data ap121_spi_data = {
--      .bus_num        = 0,
--      .num_chipselect = 1,
--};
++      }
++};
++
 +static void __init ap121_common_setup(void)
 +{
 +      u8 *art = (u8 *) KSEG1ADDR(0x1fff0000);