diff options
author | Felix Fietkau <nbd@openwrt.org> | 2015-03-13 03:01:21 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2015-03-13 03:01:21 +0000 |
commit | f1a27581401a61281c228b77186a011ab07115c5 (patch) | |
tree | b4b8c47db7813e6286f97c0c447a55407c5d45ac /target/linux/atheros/patches-3.18/105-ar2315_pci.patch | |
parent | 7ac3fd1f5d23f3420ee6cb59d27310d9322fa16b (diff) | |
download | upstream-f1a27581401a61281c228b77186a011ab07115c5.tar.gz upstream-f1a27581401a61281c228b77186a011ab07115c5.tar.bz2 upstream-f1a27581401a61281c228b77186a011ab07115c5.zip |
atheros: v3.18: update register names
Make register names more consistent, mostly add appropriate prefix
(AR5312_ or AR2315_) or _BASE suffix. Also add macro to simplify mask
and shift operation.
No functional changes.
Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44726 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.patch | 16 |
1 files changed, 8 insertions, 8 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 f182cb7350..0814c711e5 100644 --- a/target/linux/atheros/patches-3.18/105-ar2315_pci.patch +++ b/target/linux/atheros/patches-3.18/105-ar2315_pci.patch @@ -521,15 +521,15 @@ --- a/arch/mips/ath25/ar2315.c +++ b/arch/mips/ath25/ar2315.c @@ -137,6 +137,10 @@ static void ar2315_irq_dispatch(void) - do_IRQ(AR2315_IRQ_WLAN0_INTRS); + do_IRQ(AR2315_IRQ_WLAN0); else if (pending & CAUSEF_IP4) - do_IRQ(AR2315_IRQ_ENET0_INTRS); + do_IRQ(AR2315_IRQ_ENET0); +#ifdef CONFIG_PCI_AR2315 + else if (pending & CAUSEF_IP5) + do_IRQ(AR2315_IRQ_LCBUS_PCI); +#endif else if (pending & CAUSEF_IP2) - do_IRQ(AR2315_IRQ_MISC_INTRS); + do_IRQ(AR2315_IRQ_MISC); else if (pending & CAUSEF_IP7) @@ -440,8 +444,60 @@ void __init ar2315_plat_mem_setup(void) _machine_restart = ar2315_restart; @@ -540,14 +540,14 @@ + { + .name = "ar2315-pci-ctrl", + .flags = IORESOURCE_MEM, -+ .start = AR2315_PCI, -+ .end = AR2315_PCI + AR2315_PCI_SIZE - 1, ++ .start = AR2315_PCI_BASE, ++ .end = AR2315_PCI_BASE + AR2315_PCI_SIZE - 1, + }, + { + .name = "ar2315-pci-ext", + .flags = IORESOURCE_MEM, -+ .start = AR2315_PCIEXT, -+ .end = AR2315_PCIEXT + AR2315_PCIEXT_SZ - 1, ++ .start = AR2315_PCI_EXT_BASE, ++ .end = AR2315_PCI_EXT_BASE + AR2315_PCI_EXT_SIZE - 1, + }, + { + .name = "ar2315-pci", @@ -560,7 +560,7 @@ + void __init ar2315_arch_init(void) { - ath25_serial_setup(AR2315_UART0, AR2315_MISC_IRQ_UART0, + ath25_serial_setup(AR2315_UART0_BASE, AR2315_MISC_IRQ_UART0, ar2315_apb_frequency()); + +#ifdef CONFIG_PCI_AR2315 |