hak5
/
openwrt-owl
mirror of https://github.com/hak5/openwrt-owl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

atheros: v3.18: move GPIO patches behind PCI 

Move GPIO patches behind PCI patch, since they are not yet merged
upstream.

Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com>

SVN-Revision: 44728
owl
Felix Fietkau 2015-03-13 03:01:37 +00:00
parent eb370470d8
commit 6d29a8bc64
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
target/linux/atheros/patches-3.18/105-ar2315_pci.patch
View File

@ -524,9 +524,9 @@
+} +}
--- a/arch/mips/ath25/Kconfig --- a/arch/mips/ath25/Kconfig
+++ b/arch/mips/ath25/Kconfig +++ b/arch/mips/ath25/Kconfig
@@ -9,3 +9,10 @@ config SOC_AR2315 @@ -7,3 +7,10 @@ config SOC_AR2315
bool "Atheros 2315+ support"
depends on ATH25 depends on ATH25
select GPIO_AR2315
default y default y
+ +
+config PCI_AR2315 +config PCI_AR2315
@ -548,7 +548,7 @@
else if (pending & CAUSEF_IP2) else if (pending & CAUSEF_IP2)
do_IRQ(AR2315_IRQ_MISC); do_IRQ(AR2315_IRQ_MISC);
else if (pending & CAUSEF_IP7) else if (pending & CAUSEF_IP7)
@@ -460,10 +464,62 @@ void __init ar2315_plat_mem_setup(void) @@ -429,10 +433,62 @@ void __init ar2315_plat_mem_setup(void)
_machine_restart = ar2315_restart; _machine_restart = ar2315_restart;
} }

0
target/linux/atheros/patches-3.18/102-ar5312_gpio.patch → target/linux/atheros/patches-3.18/107-ar5312_gpio.patch
View File

8
target/linux/atheros/patches-3.18/103-ar2315_gpio.patch → target/linux/atheros/patches-3.18/108-ar2315_gpio.patch
View File

@ -1,14 +1,16 @@
--- a/arch/mips/ath25/Kconfig --- a/arch/mips/ath25/Kconfig
+++ b/arch/mips/ath25/Kconfig +++ b/arch/mips/ath25/Kconfig
@@ -7,4 +7,5 @@ config SOC_AR5312 @@ -7,6 +7,7 @@ config SOC_AR5312
config SOC_AR2315 config SOC_AR2315
bool "Atheros 2315+ support" bool "Atheros 2315+ support"
depends on ATH25 depends on ATH25
+ select GPIO_AR2315 + select GPIO_AR2315
default y default y
config PCI_AR2315
--- a/arch/mips/ath25/ar2315.c --- a/arch/mips/ath25/ar2315.c
+++ b/arch/mips/ath25/ar2315.c +++ b/arch/mips/ath25/ar2315.c
@@ -236,6 +236,32 @@ static struct platform_device ar2315_wdt @@ -240,6 +240,32 @@ static struct platform_device ar2315_wdt
.num_resources = ARRAY_SIZE(ar2315_wdt_res) .num_resources = ARRAY_SIZE(ar2315_wdt_res)
}; };
@ -41,7 +43,7 @@
#ifdef CONFIG_LEDS_GPIO #ifdef CONFIG_LEDS_GPIO
static struct gpio_led ar2315_leds[6]; static struct gpio_led ar2315_leds[6];
static struct gpio_led_platform_data ar2315_led_data = { static struct gpio_led_platform_data ar2315_led_data = {
@@ -286,6 +312,11 @@ void __init ar2315_init_devices(void) @@ -290,6 +316,11 @@ void __init ar2315_init_devices(void)
ath25_find_config(AR2315_SPI_READ_BASE, AR2315_SPI_READ_SIZE); ath25_find_config(AR2315_SPI_READ_BASE, AR2315_SPI_READ_SIZE);
ar2315_eth_data.macaddr = ath25_board.config->enet0_mac; ar2315_eth_data.macaddr = ath25_board.config->enet0_mac;