X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=target%2Flinux%2Far71xx%2Fpatches-3.18%2F603-MIPS-ath79-ap121-fixes.patch;h=36139b09051ad232a6919a85713364bff96fdca0;hb=8a777768a8fa405be605b41104cb4f2abad1829d;hp=b385b9e00b76176001a6956919be02854152f774;hpb=1200296d38ac828c0d4c04928e85b24542c2307d;p=oweals%2Fopenwrt.git

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 b385b9e00b..36139b0905 100644
--- 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);