aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/atheros/patches-3.18/105-ar2315_pci.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2015-03-13 02:58:58 +0000
committerFelix Fietkau <nbd@openwrt.org>2015-03-13 02:58:58 +0000
commit96bfba8286568804498978209a3c930656b9bf90 (patch)
tree6108e89d8782c14ff5d05023985aa607bee7a377 /target/linux/atheros/patches-3.18/105-ar2315_pci.patch
parentf305457b87c0916695c2681d0353e83fbc7afff6 (diff)
downloadmaster-187ad058-96bfba8286568804498978209a3c930656b9bf90.tar.gz
master-187ad058-96bfba8286568804498978209a3c930656b9bf90.tar.bz2
master-187ad058-96bfba8286568804498978209a3c930656b9bf90.zip
atheros: v3.18: update names and declarations
Sync functions, variables and enums names with upstream. Mostly replace 'ar231x_' prefix by 'ath25_'. No functional changes, except few 'int' -> 'unsigned' changes. Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44712 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/atheros/patches-3.18/105-ar2315_pci.patch')
-rw-r--r--target/linux/atheros/patches-3.18/105-ar2315_pci.patch10
1 files changed, 5 insertions, 5 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 d86e9b7901..9d8954f846 100644
--- a/target/linux/atheros/patches-3.18/105-ar2315_pci.patch
+++ b/target/linux/atheros/patches-3.18/105-ar2315_pci.patch
@@ -371,7 +371,7 @@
+ default y
--- a/arch/mips/ath25/ar2315.c
+++ b/arch/mips/ath25/ar2315.c
-@@ -77,6 +77,10 @@ ar2315_irq_dispatch(void)
+@@ -76,6 +76,10 @@ static void ar2315_irq_dispatch(void)
do_IRQ(AR2315_IRQ_WLAN0_INTRS);
else if (pending & CAUSEF_IP4)
do_IRQ(AR2315_IRQ_ENET0_INTRS);
@@ -382,9 +382,9 @@
else if (pending & CAUSEF_IP2)
do_IRQ(AR2315_IRQ_MISC_INTRS);
else if (pending & CAUSEF_IP7)
-@@ -457,3 +461,18 @@ ar2315_plat_setup(void)
- ar231x_serial_setup(AR2315_UART0, AR2315_MISC_IRQ_UART0,
- ar2315_apb_frequency());
+@@ -445,3 +449,18 @@ void __init ar2315_plat_mem_setup(void)
+ ath25_serial_setup(AR2315_UART0, AR2315_MISC_IRQ_UART0,
+ ar2315_apb_frequency());
}
+
+#ifdef CONFIG_PCI_AR2315
@@ -392,7 +392,7 @@
+{
+ struct platform_device *pdev;
+
-+ if (!is_2315() || ar231x_devtype != DEV_TYPE_AR2315)
++ if (!is_ar2315() || ath25_soc != ATH25_SOC_AR2315)
+ return -ENODEV;
+
+ pdev = platform_device_register_simple("ar2315-pci", -1, NULL, 0);