summaryrefslogtreecommitdiffstats
path: root/target/linux/cns3xxx/patches-3.3/055-pcie_io.patch
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2013-03-10 01:01:55 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2013-03-10 01:01:55 +0000
commit8271ceb3a1a2473200cba0c800561692730f121d (patch)
tree60c7e9d7c4b1dd74f207ff27603113416b5a278e /target/linux/cns3xxx/patches-3.3/055-pcie_io.patch
parent05fcef1b467640a2698e8f9ca911f1931caa62e8 (diff)
cns3xxx: remove linux 3.3 support
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35916 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/cns3xxx/patches-3.3/055-pcie_io.patch')
-rw-r--r--target/linux/cns3xxx/patches-3.3/055-pcie_io.patch77
1 files changed, 0 insertions, 77 deletions
diff --git a/target/linux/cns3xxx/patches-3.3/055-pcie_io.patch b/target/linux/cns3xxx/patches-3.3/055-pcie_io.patch
deleted file mode 100644
index 3f589e77b..000000000
--- a/target/linux/cns3xxx/patches-3.3/055-pcie_io.patch
+++ /dev/null
@@ -1,77 +0,0 @@
---- a/arch/arm/mach-cns3xxx/core.c
-+++ b/arch/arm/mach-cns3xxx/core.c
-@@ -69,6 +69,16 @@ static struct map_desc cns3xxx_io_desc[]
- .pfn = __phys_to_pfn(CNS3XXX_SSP_BASE),
- .length = SZ_4K,
- .type = MT_DEVICE,
-+ }, {
-+ .virtual = CNS3XXX_PCIE0_IO_BASE_VIRT,
-+ .pfn = __phys_to_pfn(CNS3XXX_PCIE0_IO_BASE),
-+ .length = SZ_16M,
-+ .type = MT_DEVICE,
-+ }, {
-+ .virtual = CNS3XXX_PCIE1_IO_BASE_VIRT,
-+ .pfn = __phys_to_pfn(CNS3XXX_PCIE1_IO_BASE),
-+ .length = SZ_16M,
-+ .type = MT_DEVICE,
- },
- };
-
-@@ -83,13 +93,13 @@ void __init cns3xxx_map_io(void)
- /* used by entry-macro.S */
- void __init cns3xxx_init_irq(void)
- {
-- gic_init(0, 29, __io(CNS3XXX_TC11MP_GIC_DIST_BASE_VIRT),
-- __io(CNS3XXX_TC11MP_GIC_CPU_BASE_VIRT));
-+ gic_init(0, 29, (void __iomem *) CNS3XXX_TC11MP_GIC_DIST_BASE_VIRT,
-+ (void __iomem *) CNS3XXX_TC11MP_GIC_CPU_BASE_VIRT);
- }
-
- void cns3xxx_power_off(void)
- {
-- u32 __iomem *pm_base = __io(CNS3XXX_PM_BASE_VIRT);
-+ u32 __iomem *pm_base = (void __iomem *) CNS3XXX_PM_BASE_VIRT;
- u32 clkctrl;
-
- printk(KERN_INFO "powering system down...\n");
-@@ -248,7 +258,7 @@ static void __init __cns3xxx_timer_init(
-
- static void __init cns3xxx_timer_init(void)
- {
-- cns3xxx_tmr1 = __io(CNS3XXX_TIMER1_2_3_BASE_VIRT);
-+ cns3xxx_tmr1 = (void __iomem *) CNS3XXX_TIMER1_2_3_BASE_VIRT;
-
- __cns3xxx_timer_init(IRQ_CNS3XXX_TIMER0);
- }
---- a/arch/arm/mach-cns3xxx/devices.c
-+++ b/arch/arm/mach-cns3xxx/devices.c
-@@ -98,7 +98,7 @@ static struct platform_device cns3xxx_sd
-
- void __init cns3xxx_sdhci_init(void)
- {
-- u32 __iomem *gpioa = __io(CNS3XXX_MISC_BASE_VIRT + 0x0014);
-+ u32 __iomem *gpioa = (void __iomem *) (CNS3XXX_MISC_BASE_VIRT + 0x0014);
- u32 gpioa_pins = __raw_readl(gpioa);
-
- /* MMC/SD pins share with GPIOA */
---- a/arch/arm/mach-cns3xxx/include/mach/io.h
-+++ b/arch/arm/mach-cns3xxx/include/mach/io.h
-@@ -9,9 +9,17 @@
- #ifndef __MACH_IO_H
- #define __MACH_IO_H
-
-+#include "cns3xxx.h"
-+
- #define IO_SPACE_LIMIT 0xffffffff
-
--#define __io(a) __typesafe_io(a)
-+static inline void __iomem *__io(unsigned long addr)
-+{
-+ return (void __iomem *)((addr - CNS3XXX_PCIE0_IO_BASE)
-+ + CNS3XXX_PCIE0_IO_BASE_VIRT);
-+}
-+
-+#define __io(a) __io(a)
- #define __mem_pci(a) (a)
-
- #endif