diff options
| author | Jonas Gorski <jogo@openwrt.org> | 2015-02-27 17:40:04 +0000 |
|---|---|---|
| committer | Jonas Gorski <jogo@openwrt.org> | 2015-02-27 17:40:04 +0000 |
| commit | b82cb155fced6a99989870c92ebff8248c435fe7 (patch) | |
| tree | a81679b3673389471a37b52989ff7de497b92a86 /target/linux/brcm63xx/patches-3.14/528-board_nb6.patch | |
| parent | eea227c60d593c2fe5692365936703bbebdbd1ad (diff) | |
| download | upstream-b82cb155fced6a99989870c92ebff8248c435fe7.tar.gz upstream-b82cb155fced6a99989870c92ebff8248c435fe7.tar.bz2 upstream-b82cb155fced6a99989870c92ebff8248c435fe7.zip | |
brcm63xx: move buttons and leds to dts files
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
Diffstat (limited to 'target/linux/brcm63xx/patches-3.14/528-board_nb6.patch')
| -rw-r--r-- | target/linux/brcm63xx/patches-3.14/528-board_nb6.patch | 65 |
1 files changed, 16 insertions, 49 deletions
diff --git a/target/linux/brcm63xx/patches-3.14/528-board_nb6.patch b/target/linux/brcm63xx/patches-3.14/528-board_nb6.patch index 94ad4c902c..cf82d94836 100644 --- a/target/linux/brcm63xx/patches-3.14/528-board_nb6.patch +++ b/target/linux/brcm63xx/patches-3.14/528-board_nb6.patch @@ -1,23 +1,25 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -18,6 +18,7 @@ - #if 0 /* FIXME: 3.14 removed non-DT support */ - #include <linux/spi/74x164.h> - #endif +@@ -12,6 +12,8 @@ + #include <linux/string.h> + #include <linux/gpio_keys.h> + #include <linux/input.h> ++#include <linux/platform_device.h> +#include <linux/rtl8367.h> #include <asm/addrspace.h> #include <bcm63xx_board.h> #include <bcm63xx_cpu.h> -@@ -42,6 +43,8 @@ - #define NB4_SPI_GPIO_MOSI 7 - #define NB4_SPI_GPIO_CLK 6 - #define NB4_74HC64_GPIO(X) (NB4_74X164_GPIO_BASE + (X)) +@@ -31,6 +33,9 @@ + #define BCM963XX_KEYS_POLL_INTERVAL 20 + #define BCM963XX_KEYS_DEBOUNCE_INTERVAL (BCM963XX_KEYS_POLL_INTERVAL * 3) + +#define NB6_GPIO_RTL8367_SDA 18 +#define NB6_GPIO_RTL8367_SCK 20 - - #define CT6373_PID_OFFSET 0xff80 - #define CT6373_74X164_GPIO_BASE 64 -@@ -2370,6 +2373,104 @@ static struct board_info __initdata boar ++ + /* + * known 3368 boards + */ +@@ -1350,6 +1355,69 @@ static struct board_info __initdata boar }; #endif /* CONFIG_BCM63XX_CPU_6358 */ @@ -79,41 +81,6 @@ + }, + }, + -+ .buttons = { -+ { -+ .desc = "reset", -+ .gpio = 24, -+ .type = EV_KEY, -+ .code = KEY_RESTART, -+ .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL, -+ .active_low = 1, -+ }, -+ { -+ .desc = "wps", -+ .gpio = 25, -+ .type = EV_KEY, -+ .code = KEY_WPS_BUTTON, -+ .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL, -+ .active_low = 1, -+ }, -+ { -+ .desc = "wlan", -+ .gpio = 12, -+ .type = EV_KEY, -+ .code = KEY_WLAN, -+ .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL, -+ .active_low = 1, -+ }, -+ { -+ .desc = "service", -+ .gpio = 10, -+ .type = EV_KEY, -+ .code = BTN_0, -+ .debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL, -+ .active_low = 1, -+ }, -+ }, -+ + .devs = nb6_devices, + .num_devs = ARRAY_SIZE(nb6_devices), +}; @@ -122,7 +89,7 @@ /* * known 6368 boards */ -@@ -2573,6 +2674,10 @@ static const struct board_info __initcon +@@ -1501,6 +1569,10 @@ static const struct board_info __initcon &board_DVAG3810BN, #endif @@ -133,7 +100,7 @@ #ifdef CONFIG_BCM63XX_CPU_6368 &board_96368mvwg, &board_96368mvngr, -@@ -2636,6 +2741,9 @@ static struct of_device_id const bcm963x +@@ -1564,6 +1636,9 @@ static struct of_device_id const bcm963x { .compatible = "t-com,spw303v", .data = &board_spw303v, }, { .compatible = "telsey,cpva642", .data = &board_CPVA642, }, #endif |