diff options
author | Felix Fietkau <nbd@openwrt.org> | 2014-07-31 23:40:49 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2014-07-31 23:40:49 +0000 |
commit | 3c7cd63b7208b559e1ffa37368e3917338c9f7cb (patch) | |
tree | 7e48408a207d4b00730938769a648c61334f4691 /target/linux/cns3xxx/patches-3.10/040-fiq_support.patch | |
parent | 6944689e96e00427aeb5bd67e4ecbcb85222705c (diff) | |
download | upstream-3c7cd63b7208b559e1ffa37368e3917338c9f7cb.tar.gz upstream-3c7cd63b7208b559e1ffa37368e3917338c9f7cb.tar.bz2 upstream-3c7cd63b7208b559e1ffa37368e3917338c9f7cb.zip |
cns3xxx: update to linux 3.10
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 41917
Diffstat (limited to 'target/linux/cns3xxx/patches-3.10/040-fiq_support.patch')
-rw-r--r-- | target/linux/cns3xxx/patches-3.10/040-fiq_support.patch | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/target/linux/cns3xxx/patches-3.10/040-fiq_support.patch b/target/linux/cns3xxx/patches-3.10/040-fiq_support.patch new file mode 100644 index 0000000000..25a59c15c0 --- /dev/null +++ b/target/linux/cns3xxx/patches-3.10/040-fiq_support.patch @@ -0,0 +1,40 @@ +--- a/arch/arm/mach-cns3xxx/Kconfig ++++ b/arch/arm/mach-cns3xxx/Kconfig +@@ -9,6 +9,7 @@ config ARCH_CNS3XXX + select HAVE_ARM_SCU if SMP + select HAVE_ARM_TWD if LOCAL_TIMERS + select HAVE_SMP ++ select FIQ + help + Support for Cavium Networks CNS3XXX platform. + +--- a/arch/arm/mach-cns3xxx/Makefile ++++ b/arch/arm/mach-cns3xxx/Makefile +@@ -5,5 +5,5 @@ cns3xxx-y += core.o pm.o + cns3xxx-$(CONFIG_ATAGS) += devices.o + cns3xxx-$(CONFIG_PCI) += pcie.o + cns3xxx-$(CONFIG_MACH_CNS3420VB) += cns3420vb.o +-cns3xxx-$(CONFIG_SMP) += platsmp.o headsmp.o ++cns3xxx-$(CONFIG_SMP) += platsmp.o headsmp.o cns3xxx_fiq.o + cns3xxx-$(CONFIG_HOTPLUG_CPU) += hotplug.o +--- a/arch/arm/mach-cns3xxx/cns3xxx.h ++++ b/arch/arm/mach-cns3xxx/cns3xxx.h +@@ -267,6 +267,7 @@ + #define MISC_PCIE_INT_MASK(x) MISC_MEM_MAP(0x978 + (x) * 0x100) + #define MISC_PCIE_INT_STATUS(x) MISC_MEM_MAP(0x97C + (x) * 0x100) + ++#define MISC_FIQ_CPU(x) MISC_MEM_MAP(0xA58 - (x) * 0x4) + /* + * Power management and clock control + */ +--- a/arch/arm/mm/Kconfig ++++ b/arch/arm/mm/Kconfig +@@ -806,7 +806,7 @@ config KUSER_HELPERS + + config DMA_CACHE_RWFO + bool "Enable read/write for ownership DMA cache maintenance" +- depends on CPU_V6K && SMP ++ depends on CPU_V6K && SMP && !ARCH_CNS3XXX + default y + help + The Snoop Control Unit on ARM11MPCore does not detect the |