aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2015-03-13 03:01:37 +0000
committerFelix Fietkau <nbd@openwrt.org>2015-03-13 03:01:37 +0000
commit6d29a8bc64830d3f0c26eafe47880f84aeb425e8 (patch)
treea7b4ecd4822e95403bb988874fbcbfeb16f28aa8 /target
parenteb370470d8928c910ce75a23bc67b22d8a4e2883 (diff)
downloadupstream-6d29a8bc64830d3f0c26eafe47880f84aeb425e8.tar.gz
upstream-6d29a8bc64830d3f0c26eafe47880f84aeb425e8.tar.bz2
upstream-6d29a8bc64830d3f0c26eafe47880f84aeb425e8.zip
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
Diffstat (limited to 'target')
-rw-r--r--target/linux/atheros/patches-3.18/105-ar2315_pci.patch6
-rw-r--r--target/linux/atheros/patches-3.18/107-ar5312_gpio.patch (renamed from target/linux/atheros/patches-3.18/102-ar5312_gpio.patch)0
-rw-r--r--target/linux/atheros/patches-3.18/108-ar2315_gpio.patch (renamed from target/linux/atheros/patches-3.18/103-ar2315_gpio.patch)8
3 files changed, 8 insertions, 6 deletions
diff --git a/target/linux/atheros/patches-3.18/105-ar2315_pci.patch b/target/linux/atheros/patches-3.18/105-ar2315_pci.patch
index 4de4f3ab8b..8e3dfa1349 100644
--- a/target/linux/atheros/patches-3.18/105-ar2315_pci.patch
+++ b/target/linux/atheros/patches-3.18/105-ar2315_pci.patch
@@ -524,9 +524,9 @@
+}
--- a/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
- select GPIO_AR2315
default y
+
+config PCI_AR2315
@@ -548,7 +548,7 @@
else if (pending & CAUSEF_IP2)
do_IRQ(AR2315_IRQ_MISC);
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;
}
diff --git a/target/linux/atheros/patches-3.18/102-ar5312_gpio.patch b/target/linux/atheros/patches-3.18/107-ar5312_gpio.patch
index 56ac81ee40..56ac81ee40 100644
--- a/target/linux/atheros/patches-3.18/102-ar5312_gpio.patch
+++ b/target/linux/atheros/patches-3.18/107-ar5312_gpio.patch
diff --git a/target/linux/atheros/patches-3.18/103-ar2315_gpio.patch b/target/linux/atheros/patches-3.18/108-ar2315_gpio.patch
index 4b8117151d..d85fc15d7e 100644
--- a/target/linux/atheros/patches-3.18/103-ar2315_gpio.patch
+++ b/target/linux/atheros/patches-3.18/108-ar2315_gpio.patch
@@ -1,14 +1,16 @@
--- a/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
bool "Atheros 2315+ support"
depends on ATH25
+ select GPIO_AR2315
default y
+
+ config PCI_AR2315
--- a/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)
};
@@ -41,7 +43,7 @@
#ifdef CONFIG_LEDS_GPIO
static struct gpio_led ar2315_leds[6];
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);
ar2315_eth_data.macaddr = ath25_board.config->enet0_mac;