aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/atheros/patches-3.18
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/atheros/patches-3.18')
-rw-r--r--target/linux/atheros/patches-3.18/100-board.patch24
-rw-r--r--target/linux/atheros/patches-3.18/101-early-printk-support.patch2
-rw-r--r--target/linux/atheros/patches-3.18/102-ar5312_gpio.patch2
-rw-r--r--target/linux/atheros/patches-3.18/103-ar2315_gpio.patch2
-rw-r--r--target/linux/atheros/patches-3.18/105-ar2315_pci.patch2
-rw-r--r--target/linux/atheros/patches-3.18/110-ar2313_ethernet.patch4
-rw-r--r--target/linux/atheros/patches-3.18/130-watchdog.patch2
7 files changed, 19 insertions, 19 deletions
diff --git a/target/linux/atheros/patches-3.18/100-board.patch b/target/linux/atheros/patches-3.18/100-board.patch
index 1dba78d16b..b7a5f2d0cf 100644
--- a/target/linux/atheros/patches-3.18/100-board.patch
+++ b/target/linux/atheros/patches-3.18/100-board.patch
@@ -1,10 +1,10 @@
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
-@@ -154,6 +154,19 @@ config BCM63XX
- help
- Support for BCM63XX based boards
+@@ -96,6 +96,19 @@ config AR7
+ Support for the Texas Instruments AR7 System-on-a-Chip
+ family: TNETD7100, 7200 and 7300.
-+config ATHEROS_AR231X
++config ATH25
+ bool "Atheros 231x/531x SoC support"
+ select CEVT_R4K
+ select CSRC_R4K
@@ -17,9 +17,9 @@
+ help
+ Support for AR231x and AR531x based boards
+
- config MIPS_COBALT
- bool "Cobalt Server"
- select CEVT_R4K
+ config ATH79
+ bool "Atheros AR71XX/AR724X/AR913X based boards"
+ select ARCH_REQUIRE_GPIOLIB
@@ -834,6 +847,7 @@ config MIPS_PARAVIRT
endchoice
@@ -44,20 +44,20 @@
+#
+# Atheros AR531X/AR231X WiSoC
+#
-+platform-$(CONFIG_ATHEROS_AR231X) += ar231x/
-+cflags-$(CONFIG_ATHEROS_AR231X) += -I$(srctree)/arch/mips/include/asm/mach-ar231x
-+load-$(CONFIG_ATHEROS_AR231X) += 0xffffffff80041000
++platform-$(CONFIG_ATH25) += ar231x/
++cflags-$(CONFIG_ATH25) += -I$(srctree)/arch/mips/include/asm/mach-ar231x
++load-$(CONFIG_ATH25) += 0xffffffff80041000
--- /dev/null
+++ b/arch/mips/ar231x/Kconfig
@@ -0,0 +1,9 @@
+config SOC_AR5312
+ bool "Atheros 5312/2312+ support"
-+ depends on ATHEROS_AR231X
++ depends on ATH25
+ default y
+
+config SOC_AR2315
+ bool "Atheros 2315+ support"
-+ depends on ATHEROS_AR231X
++ depends on ATH25
+ default y
--- /dev/null
+++ b/arch/mips/ar231x/Makefile
diff --git a/target/linux/atheros/patches-3.18/101-early-printk-support.patch b/target/linux/atheros/patches-3.18/101-early-printk-support.patch
index 665091fd4e..38560dd697 100644
--- a/target/linux/atheros/patches-3.18/101-early-printk-support.patch
+++ b/target/linux/atheros/patches-3.18/101-early-printk-support.patch
@@ -60,7 +60,7 @@
obj-$(CONFIG_SOC_AR2315) += ar2315.o
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
-@@ -164,6 +164,7 @@ config ATHEROS_AR231X
+@@ -106,6 +106,7 @@ config ATH25
select SYS_SUPPORTS_BIG_ENDIAN
select SYS_SUPPORTS_32BIT_KERNEL
select ARCH_REQUIRE_GPIOLIB
diff --git a/target/linux/atheros/patches-3.18/102-ar5312_gpio.patch b/target/linux/atheros/patches-3.18/102-ar5312_gpio.patch
index b84ff31967..09a2acbadd 100644
--- a/target/linux/atheros/patches-3.18/102-ar5312_gpio.patch
+++ b/target/linux/atheros/patches-3.18/102-ar5312_gpio.patch
@@ -3,7 +3,7 @@
@@ -1,6 +1,7 @@
config SOC_AR5312
bool "Atheros 5312/2312+ support"
- depends on ATHEROS_AR231X
+ depends on ATH25
+ select GPIO_AR5312
default y
diff --git a/target/linux/atheros/patches-3.18/103-ar2315_gpio.patch b/target/linux/atheros/patches-3.18/103-ar2315_gpio.patch
index 38588ee665..33594e6b38 100644
--- a/target/linux/atheros/patches-3.18/103-ar2315_gpio.patch
+++ b/target/linux/atheros/patches-3.18/103-ar2315_gpio.patch
@@ -3,7 +3,7 @@
@@ -7,4 +7,5 @@ config SOC_AR5312
config SOC_AR2315
bool "Atheros 2315+ support"
- depends on ATHEROS_AR231X
+ depends on ATH25
+ select GPIO_AR2315
default y
--- a/arch/mips/ar231x/ar2315.c
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 a0c157eece..6835255b63 100644
--- a/target/linux/atheros/patches-3.18/105-ar2315_pci.patch
+++ b/target/linux/atheros/patches-3.18/105-ar2315_pci.patch
@@ -359,7 +359,7 @@
--- a/arch/mips/ar231x/Kconfig
+++ b/arch/mips/ar231x/Kconfig
@@ -9,3 +9,10 @@ config SOC_AR2315
- depends on ATHEROS_AR231X
+ depends on ATH25
select GPIO_AR2315
default y
+
diff --git a/target/linux/atheros/patches-3.18/110-ar2313_ethernet.patch b/target/linux/atheros/patches-3.18/110-ar2313_ethernet.patch
index 367c6cf8b5..69d22ed3ce 100644
--- a/target/linux/atheros/patches-3.18/110-ar2313_ethernet.patch
+++ b/target/linux/atheros/patches-3.18/110-ar2313_ethernet.patch
@@ -12,7 +12,7 @@
bool "Atheros devices"
default y
- depends on PCI
-+ depends on (PCI || ATHEROS_AR231X)
++ depends on (PCI || ATH25)
---help---
If you have a network (Ethernet) card belonging to this class, say Y
and read the Ethernet-HOWTO, available from
@@ -22,7 +22,7 @@
+config NET_AR231X
+ tristate "Atheros AR231X built-in Ethernet support"
-+ depends on ATHEROS_AR231X
++ depends on ATH25
+ help
+ Support for the AR231x/531x ethernet controller
+
diff --git a/target/linux/atheros/patches-3.18/130-watchdog.patch b/target/linux/atheros/patches-3.18/130-watchdog.patch
index 65ea7d3110..05e965d9c4 100644
--- a/target/linux/atheros/patches-3.18/130-watchdog.patch
+++ b/target/linux/atheros/patches-3.18/130-watchdog.patch
@@ -218,7 +218,7 @@
+config AR2315_WDT
+ tristate "Atheros AR2315+ WiSoCs Watchdog Timer"
-+ depends on ATHEROS_AR231X
++ depends on ATH25
+ help
+ Hardware driver for the built-in watchdog timer on the Atheros
+ AR2315/AR2316 WiSoCs.