From b82cb155fced6a99989870c92ebff8248c435fe7 Mon Sep 17 00:00:00 2001
From: Jonas Gorski <jogo@openwrt.org>
Date: Fri, 27 Feb 2015 17:40:04 +0000
Subject: brcm63xx: move buttons and leds to dts files
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Register buttons and leds through DT for all available dts,
and remove them from the board files.

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
[jogo: remove leds/buttons from board files
       fix wrong led polarities for dsl-274xb-c2, cpva642, p870hw
       comment out spi-gpio and associated leds]

Signed-off-by: Jonas Gorski <jogo@openwrt.org>

SVN-Revision: 44566
---
 .../patches-3.14/561-board_WAP-5813n.patch         | 70 ++++------------------
 1 file changed, 10 insertions(+), 60 deletions(-)

(limited to 'target/linux/brcm63xx/patches-3.14/561-board_WAP-5813n.patch')

diff --git a/target/linux/brcm63xx/patches-3.14/561-board_WAP-5813n.patch b/target/linux/brcm63xx/patches-3.14/561-board_WAP-5813n.patch
index 94b8778a10..1cc35476bc 100644
--- a/target/linux/brcm63xx/patches-3.14/561-board_WAP-5813n.patch
+++ b/target/linux/brcm63xx/patches-3.14/561-board_WAP-5813n.patch
@@ -1,14 +1,16 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -13,6 +13,7 @@
- #include <linux/gpio_keys.h>
+@@ -14,7 +14,9 @@
  #include <linux/input.h>
  #include <linux/pci_ids.h>
-+#include <linux/platform_data/b53.h>
  #include <linux/platform_device.h>
- #include <linux/spi/spi.h>
- #include <linux/spi/spi_gpio.h>
-@@ -4143,6 +4144,117 @@ static struct board_info __initdata boar
++#include <linux/platform_data/b53.h>
+ #include <linux/rtl8367.h>
++#include <linux/spi/spi.h>
+ #include <asm/addrspace.h>
+ #include <bcm63xx_board.h>
+ #include <bcm63xx_cpu.h>
+@@ -1919,6 +1921,65 @@ static struct board_info __initdata boar
  	.has_ohci0 = 1,
  	.has_ehci0 = 1,
  };
@@ -60,58 +62,6 @@
 +		},
 +	},
 +
-+	.leds = {
-+		{
-+			.name		= "WAP-5813n:green:power",
-+			.gpio		= 22,
-+			.default_trigger = "default-on",
-+		},
-+		{
-+			.name		= "WAP-5813n:red:power",
-+			.gpio		= 24,
-+		},
-+		{
-+			.name		= "WAP-5813n:green:inet",
-+			.gpio		= 5,
-+		},
-+		{
-+			.name		= "WAP-5813n:red:inet",
-+			.gpio		= 31,
-+		},
-+		{
-+			.name		= "WAP-5813n:green:wps",
-+			.gpio		= 23,
-+			.active_low	= 1,
-+		},
-+	},
-+
-+	.buttons = {
-+		{
-+			.desc		= "wlan",
-+			.gpio		= 32,
-+			.active_low	= 1,
-+			.type		= EV_KEY,
-+			.code		= KEY_WLAN,
-+			.debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
-+		},
-+		{
-+			.desc		= "reset",
-+			.gpio		= 34,
-+			.active_low	= 1,
-+			.type		= EV_KEY,
-+			.code		= KEY_RESTART,
-+			.debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
-+		},
-+		{
-+			.desc		= "wps",
-+			.gpio		= 35,
-+			.active_low	= 1,
-+			.type		= EV_KEY,
-+			.code		= KEY_WPS_BUTTON,
-+			.debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
-+		},
-+	},
-+
 +	.fallback_sprom = {
 +		.type 				= SPROM_BCM43222,
 +		.pci_bus			= 0,
@@ -126,7 +76,7 @@
  #endif /* CONFIG_BCM63XX_CPU_6368 */
  
  /*
-@@ -4522,6 +4634,7 @@ static const struct board_info __initcon
+@@ -2298,6 +2359,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6368
  	&board_96368mvwg,
  	&board_96368mvngr,
@@ -134,7 +84,7 @@
  #endif
  #ifdef CONFIG_BCM63XX_CPU_63268
  	&board_963268bu_p300,
-@@ -4603,6 +4716,7 @@ static struct of_device_id const bcm963x
+@@ -2379,6 +2441,7 @@ static struct of_device_id const bcm963x
  #ifdef CONFIG_BCM63XX_CPU_6368
  	{ .compatible = "brcm,bcm96368mvngr", .data = &board_96368mvngr, },
  	{ .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, },
-- 
cgit v1.2.3