diff options
Diffstat (limited to 'target/linux/oxnas/patches-3.14')
13 files changed, 60 insertions, 118 deletions
diff --git a/target/linux/oxnas/patches-3.14/010-arm_introduce-dma-fiq-irq-broadcast.patch b/target/linux/oxnas/patches-3.14/010-arm_introduce-dma-fiq-irq-broadcast.patch index ed01fe128e..25a28e89be 100644 --- a/target/linux/oxnas/patches-3.14/010-arm_introduce-dma-fiq-irq-broadcast.patch +++ b/target/linux/oxnas/patches-3.14/010-arm_introduce-dma-fiq-irq-broadcast.patch @@ -1,7 +1,5 @@ -Index: linux-3.14.18/arch/arm/include/asm/glue-cache.h -=================================================================== ---- linux-3.14.18.orig/arch/arm/include/asm/glue-cache.h -+++ linux-3.14.18/arch/arm/include/asm/glue-cache.h +--- a/arch/arm/include/asm/glue-cache.h ++++ b/arch/arm/include/asm/glue-cache.h @@ -156,11 +156,19 @@ extern inline void nop_dma_unmap_area(co #define __cpuc_flush_user_range __glue(_CACHE,_flush_user_cache_range) #define __cpuc_coherent_kern_range __glue(_CACHE,_coherent_kern_range) @@ -22,11 +20,9 @@ Index: linux-3.14.18/arch/arm/include/asm/glue-cache.h #endif #endif -Index: linux-3.14.18/arch/arm/mm/Kconfig -=================================================================== ---- linux-3.14.18.orig/arch/arm/mm/Kconfig -+++ linux-3.14.18/arch/arm/mm/Kconfig -@@ -843,6 +843,17 @@ config DMA_CACHE_RWFO +--- a/arch/arm/mm/Kconfig ++++ b/arch/arm/mm/Kconfig +@@ -844,6 +844,17 @@ config DMA_CACHE_RWFO in hardware, other workarounds are needed (e.g. cache maintenance broadcasting in software via FIQ). @@ -44,10 +40,8 @@ Index: linux-3.14.18/arch/arm/mm/Kconfig config OUTER_CACHE bool -Index: linux-3.14.18/arch/arm/mm/flush.c -=================================================================== ---- linux-3.14.18.orig/arch/arm/mm/flush.c -+++ linux-3.14.18/arch/arm/mm/flush.c +--- a/arch/arm/mm/flush.c ++++ b/arch/arm/mm/flush.c @@ -291,7 +291,11 @@ void flush_dcache_page(struct page *page mapping = page_mapping(page); diff --git a/target/linux/oxnas/patches-3.14/100-obtain-reset-controller-from-device-tree.patch b/target/linux/oxnas/patches-3.14/100-obtain-reset-controller-from-device-tree.patch index 3b3947c6bf..4ea90dc174 100644 --- a/target/linux/oxnas/patches-3.14/100-obtain-reset-controller-from-device-tree.patch +++ b/target/linux/oxnas/patches-3.14/100-obtain-reset-controller-from-device-tree.patch @@ -1,7 +1,5 @@ -Index: linux-3.13.7/drivers/reset/core.c -=================================================================== ---- linux-3.13.7.orig/drivers/reset/core.c -+++ linux-3.13.7/drivers/reset/core.c +--- a/drivers/reset/core.c ++++ b/drivers/reset/core.c @@ -127,15 +127,16 @@ int reset_control_deassert(struct reset_ EXPORT_SYMBOL_GPL(reset_control_deassert); @@ -75,10 +73,8 @@ Index: linux-3.13.7/drivers/reset/core.c EXPORT_SYMBOL_GPL(reset_control_get); /** -Index: linux-3.13.7/include/linux/reset.h -=================================================================== ---- linux-3.13.7.orig/include/linux/reset.h -+++ linux-3.13.7/include/linux/reset.h +--- a/include/linux/reset.h ++++ b/include/linux/reset.h @@ -1,6 +1,8 @@ #ifndef _LINUX_RESET_H_ #define _LINUX_RESET_H_ diff --git a/target/linux/oxnas/patches-3.14/250-add-plxtech-vendor-prefix.patch b/target/linux/oxnas/patches-3.14/250-add-plxtech-vendor-prefix.patch index c08754d6e5..12ad87d761 100644 --- a/target/linux/oxnas/patches-3.14/250-add-plxtech-vendor-prefix.patch +++ b/target/linux/oxnas/patches-3.14/250-add-plxtech-vendor-prefix.patch @@ -1,7 +1,5 @@ -Index: linux-3.14.18/Documentation/devicetree/bindings/vendor-prefixes.txt -=================================================================== ---- linux-3.14.18.orig/Documentation/devicetree/bindings/vendor-prefixes.txt -+++ linux-3.14.18/Documentation/devicetree/bindings/vendor-prefixes.txt +--- a/Documentation/devicetree/bindings/vendor-prefixes.txt ++++ b/Documentation/devicetree/bindings/vendor-prefixes.txt @@ -65,6 +65,7 @@ onnn ON Semiconductor Corp. panasonic Panasonic Corporation phytec PHYTEC Messtechnik GmbH diff --git a/target/linux/oxnas/patches-3.14/300-introduce-oxnas-platform.patch b/target/linux/oxnas/patches-3.14/300-introduce-oxnas-platform.patch index b6e2efb851..9b6802d1b6 100644 --- a/target/linux/oxnas/patches-3.14/300-introduce-oxnas-platform.patch +++ b/target/linux/oxnas/patches-3.14/300-introduce-oxnas-platform.patch @@ -1,7 +1,5 @@ -Index: linux-3.14.18/arch/arm/Kconfig -=================================================================== ---- linux-3.14.18.orig/arch/arm/Kconfig -+++ linux-3.14.18/arch/arm/Kconfig +--- a/arch/arm/Kconfig ++++ b/arch/arm/Kconfig @@ -367,6 +367,17 @@ config ARCH_VERSATILE help This enables support for ARM Ltd Versatile board. @@ -29,10 +27,8 @@ Index: linux-3.14.18/arch/arm/Kconfig source "arch/arm/mach-picoxcell/Kconfig" source "arch/arm/mach-pxa/Kconfig" -Index: linux-3.14.18/arch/arm/Makefile -=================================================================== ---- linux-3.14.18.orig/arch/arm/Makefile -+++ linux-3.14.18/arch/arm/Makefile +--- a/arch/arm/Makefile ++++ b/arch/arm/Makefile @@ -183,6 +183,7 @@ machine-$(CONFIG_ARCH_NSPIRE) += nspire machine-$(CONFIG_ARCH_OMAP1) += omap1 machine-$(CONFIG_ARCH_OMAP2PLUS) += omap2 @@ -41,10 +37,8 @@ Index: linux-3.14.18/arch/arm/Makefile machine-$(CONFIG_ARCH_PICOXCELL) += picoxcell machine-$(CONFIG_ARCH_PXA) += pxa machine-$(CONFIG_ARCH_REALVIEW) += realview -Index: linux-3.14.18/arch/arm/boot/dts/Makefile -=================================================================== ---- linux-3.14.18.orig/arch/arm/boot/dts/Makefile -+++ linux-3.14.18/arch/arm/boot/dts/Makefile +--- a/arch/arm/boot/dts/Makefile ++++ b/arch/arm/boot/dts/Makefile @@ -233,6 +233,7 @@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420 am43x-epos-evm.dtb \ dra7-evm.dtb @@ -53,10 +47,8 @@ Index: linux-3.14.18/arch/arm/boot/dts/Makefile dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb dtb-$(CONFIG_ARCH_U8500) += ste-snowball.dtb \ ste-hrefprev60-stuib.dtb \ -Index: linux-3.14.18/arch/arm/tools/mach-types -=================================================================== ---- linux-3.14.18.orig/arch/arm/tools/mach-types -+++ linux-3.14.18/arch/arm/tools/mach-types +--- a/arch/arm/tools/mach-types ++++ b/arch/arm/tools/mach-types @@ -228,6 +228,7 @@ edb9302a MACH_EDB9302A EDB9302A 1127 edb9307a MACH_EDB9307A EDB9307A 1128 omap_3430sdp MACH_OMAP_3430SDP OMAP_3430SDP 1138 @@ -65,10 +57,8 @@ Index: linux-3.14.18/arch/arm/tools/mach-types micro9m MACH_MICRO9M MICRO9M 1169 bug MACH_BUG BUG 1179 at91sam9263ek MACH_AT91SAM9263EK AT91SAM9263EK 1202 -Index: linux-3.14.18/drivers/clk/Makefile -=================================================================== ---- linux-3.14.18.orig/drivers/clk/Makefile -+++ linux-3.14.18/drivers/clk/Makefile +--- a/drivers/clk/Makefile ++++ b/drivers/clk/Makefile @@ -19,6 +19,7 @@ obj-$(CONFIG_MACH_LOONGSON1) += clk-ls1 obj-$(CONFIG_COMMON_CLK_MAX77686) += clk-max77686.o obj-$(CONFIG_ARCH_NOMADIK) += clk-nomadik.o diff --git a/target/linux/oxnas/patches-3.14/310-oxnas-clocksource.patch b/target/linux/oxnas/patches-3.14/310-oxnas-clocksource.patch index 1eb74debcf..1795a2a229 100644 --- a/target/linux/oxnas/patches-3.14/310-oxnas-clocksource.patch +++ b/target/linux/oxnas/patches-3.14/310-oxnas-clocksource.patch @@ -1,7 +1,5 @@ -Index: linux-3.14.18/drivers/clocksource/Kconfig -=================================================================== ---- linux-3.14.18.orig/drivers/clocksource/Kconfig -+++ linux-3.14.18/drivers/clocksource/Kconfig +--- a/drivers/clocksource/Kconfig ++++ b/drivers/clocksource/Kconfig @@ -140,3 +140,9 @@ config VF_PIT_TIMER bool help @@ -12,10 +10,8 @@ Index: linux-3.14.18/drivers/clocksource/Kconfig + select CLKSRC_MMIO + help + This option enables support for the oxnas rps timers. -Index: linux-3.14.18/drivers/clocksource/Makefile -=================================================================== ---- linux-3.14.18.orig/drivers/clocksource/Makefile -+++ linux-3.14.18/drivers/clocksource/Makefile +--- a/drivers/clocksource/Makefile ++++ b/drivers/clocksource/Makefile @@ -37,3 +37,5 @@ obj-$(CONFIG_ARM_ARCH_TIMER) += arm_arc obj-$(CONFIG_ARM_GLOBAL_TIMER) += arm_global_timer.o obj-$(CONFIG_CLKSRC_METAG_GENERIC) += metag_generic.o diff --git a/target/linux/oxnas/patches-3.14/320-oxnas-irqchip.patch b/target/linux/oxnas/patches-3.14/320-oxnas-irqchip.patch index 6406a3f554..b319fd3bf8 100644 --- a/target/linux/oxnas/patches-3.14/320-oxnas-irqchip.patch +++ b/target/linux/oxnas/patches-3.14/320-oxnas-irqchip.patch @@ -1,7 +1,5 @@ -Index: linux-3.14.18/drivers/irqchip/Kconfig -=================================================================== ---- linux-3.14.18.orig/drivers/irqchip/Kconfig -+++ linux-3.14.18/drivers/irqchip/Kconfig +--- a/drivers/irqchip/Kconfig ++++ b/drivers/irqchip/Kconfig @@ -10,6 +10,11 @@ config ARM_GIC config GIC_NON_BANKED bool @@ -14,10 +12,8 @@ Index: linux-3.14.18/drivers/irqchip/Kconfig config ARM_NVIC bool select IRQ_DOMAIN -Index: linux-3.14.18/drivers/irqchip/Makefile -=================================================================== ---- linux-3.14.18.orig/drivers/irqchip/Makefile -+++ linux-3.14.18/drivers/irqchip/Makefile +--- a/drivers/irqchip/Makefile ++++ b/drivers/irqchip/Makefile @@ -20,6 +20,7 @@ obj-$(CONFIG_IMGPDC_IRQ) += irq-imgpdc. obj-$(CONFIG_SIRF_IRQ) += irq-sirfsoc.o obj-$(CONFIG_RENESAS_INTC_IRQPIN) += irq-renesas-intc-irqpin.o @@ -26,11 +22,9 @@ Index: linux-3.14.18/drivers/irqchip/Makefile obj-$(CONFIG_VERSATILE_FPGA_IRQ) += irq-versatile-fpga.o obj-$(CONFIG_ARCH_NSPIRE) += irq-zevio.o obj-$(CONFIG_ARCH_VT8500) += irq-vt8500.o -Index: linux-3.14.18/drivers/irqchip/irq-gic.c -=================================================================== ---- linux-3.14.18.orig/drivers/irqchip/irq-gic.c -+++ linux-3.14.18/drivers/irqchip/irq-gic.c -@@ -1015,6 +1015,7 @@ IRQCHIP_DECLARE(gic_400, "arm,gic-400", +--- a/drivers/irqchip/irq-gic.c ++++ b/drivers/irqchip/irq-gic.c +@@ -1015,6 +1015,7 @@ IRQCHIP_DECLARE(gic_400, "arm,gic-400", IRQCHIP_DECLARE(cortex_a15_gic, "arm,cortex-a15-gic", gic_of_init); IRQCHIP_DECLARE(cortex_a9_gic, "arm,cortex-a9-gic", gic_of_init); IRQCHIP_DECLARE(cortex_a7_gic, "arm,cortex-a7-gic", gic_of_init); diff --git a/target/linux/oxnas/patches-3.14/330-oxnas-pinctrl.patch b/target/linux/oxnas/patches-3.14/330-oxnas-pinctrl.patch index 60caca361d..5451962b4b 100644 --- a/target/linux/oxnas/patches-3.14/330-oxnas-pinctrl.patch +++ b/target/linux/oxnas/patches-3.14/330-oxnas-pinctrl.patch @@ -1,7 +1,5 @@ -Index: linux-3.14.18/drivers/pinctrl/Kconfig -=================================================================== ---- linux-3.14.18.orig/drivers/pinctrl/Kconfig -+++ linux-3.14.18/drivers/pinctrl/Kconfig +--- a/drivers/pinctrl/Kconfig ++++ b/drivers/pinctrl/Kconfig @@ -87,6 +87,15 @@ config PINCTRL_AT91 help Say Y here to enable the at91 pinctrl driver @@ -18,10 +16,8 @@ Index: linux-3.14.18/drivers/pinctrl/Kconfig config PINCTRL_BAYTRAIL bool "Intel Baytrail GPIO pin control" depends on GPIOLIB && ACPI && X86 -Index: linux-3.14.18/drivers/pinctrl/Makefile -=================================================================== ---- linux-3.14.18.orig/drivers/pinctrl/Makefile -+++ linux-3.14.18/drivers/pinctrl/Makefile +--- a/drivers/pinctrl/Makefile ++++ b/drivers/pinctrl/Makefile @@ -67,6 +67,7 @@ obj-$(CONFIG_PINCTRL_LANTIQ) += pinctrl- obj-$(CONFIG_PINCTRL_TB10X) += pinctrl-tb10x.o obj-$(CONFIG_PINCTRL_ST) += pinctrl-st.o diff --git a/target/linux/oxnas/patches-3.14/340-oxnas-pcie.patch b/target/linux/oxnas/patches-3.14/340-oxnas-pcie.patch index ca0ccb83c8..b5546a0e95 100644 --- a/target/linux/oxnas/patches-3.14/340-oxnas-pcie.patch +++ b/target/linux/oxnas/patches-3.14/340-oxnas-pcie.patch @@ -1,7 +1,5 @@ -Index: linux-3.14.18/drivers/pci/host/Kconfig -=================================================================== ---- linux-3.14.18.orig/drivers/pci/host/Kconfig -+++ linux-3.14.18/drivers/pci/host/Kconfig +--- a/drivers/pci/host/Kconfig ++++ b/drivers/pci/host/Kconfig @@ -33,4 +33,9 @@ config PCI_RCAR_GEN2 There are 3 internal PCI controllers available with a single built-in EHCI/OHCI host controller present on each one. @@ -12,10 +10,8 @@ Index: linux-3.14.18/drivers/pci/host/Kconfig + select PCIEPORTBUS + endmenu -Index: linux-3.14.18/drivers/pci/host/Makefile -=================================================================== ---- linux-3.14.18.orig/drivers/pci/host/Makefile -+++ linux-3.14.18/drivers/pci/host/Makefile +--- a/drivers/pci/host/Makefile ++++ b/drivers/pci/host/Makefile @@ -4,3 +4,4 @@ obj-$(CONFIG_PCI_IMX6) += pci-imx6.o obj-$(CONFIG_PCI_MVEBU) += pci-mvebu.o obj-$(CONFIG_PCI_TEGRA) += pci-tegra.o diff --git a/target/linux/oxnas/patches-3.14/350-oxnas-reset.patch b/target/linux/oxnas/patches-3.14/350-oxnas-reset.patch index 820d70b2df..8878868d4d 100644 --- a/target/linux/oxnas/patches-3.14/350-oxnas-reset.patch +++ b/target/linux/oxnas/patches-3.14/350-oxnas-reset.patch @@ -1,7 +1,5 @@ -Index: linux-3.14.18/drivers/reset/Kconfig -=================================================================== ---- linux-3.14.18.orig/drivers/reset/Kconfig -+++ linux-3.14.18/drivers/reset/Kconfig +--- a/drivers/reset/Kconfig ++++ b/drivers/reset/Kconfig @@ -11,3 +11,7 @@ menuconfig RESET_CONTROLLER via GPIOs or SoC-internal reset controller modules. @@ -10,10 +8,8 @@ Index: linux-3.14.18/drivers/reset/Kconfig +config RESET_CONTROLLER_OXNAS + bool + select RESET_CONTROLLER -Index: linux-3.14.18/drivers/reset/Makefile -=================================================================== ---- linux-3.14.18.orig/drivers/reset/Makefile -+++ linux-3.14.18/drivers/reset/Makefile +--- a/drivers/reset/Makefile ++++ b/drivers/reset/Makefile @@ -1,2 +1,3 @@ obj-$(CONFIG_RESET_CONTROLLER) += core.o +obj-$(CONFIG_RESET_CONTROLLER_OXNAS) += reset-ox820.o diff --git a/target/linux/oxnas/patches-3.14/400-oxnas-nand.patch b/target/linux/oxnas/patches-3.14/400-oxnas-nand.patch index a5a1b02aeb..942bd2d922 100644 --- a/target/linux/oxnas/patches-3.14/400-oxnas-nand.patch +++ b/target/linux/oxnas/patches-3.14/400-oxnas-nand.patch @@ -1,7 +1,5 @@ -Index: linux-3.14.18/drivers/mtd/nand/Kconfig -=================================================================== ---- linux-3.14.18.orig/drivers/mtd/nand/Kconfig -+++ linux-3.14.18/drivers/mtd/nand/Kconfig +--- a/drivers/mtd/nand/Kconfig ++++ b/drivers/mtd/nand/Kconfig @@ -510,4 +510,12 @@ config MTD_NAND_XWAY Enables support for NAND Flash chips on Lantiq XWAY SoCs. NAND is attached to the External Bus Unit (EBU). @@ -15,10 +13,8 @@ Index: linux-3.14.18/drivers/mtd/nand/Kconfig + to the STATIC Unit. + endif # MTD_NAND -Index: linux-3.14.18/drivers/mtd/nand/Makefile -=================================================================== ---- linux-3.14.18.orig/drivers/mtd/nand/Makefile -+++ linux-3.14.18/drivers/mtd/nand/Makefile +--- a/drivers/mtd/nand/Makefile ++++ b/drivers/mtd/nand/Makefile @@ -49,5 +49,6 @@ obj-$(CONFIG_MTD_NAND_JZ4740) += jz4740 obj-$(CONFIG_MTD_NAND_GPMI_NAND) += gpmi-nand/ obj-$(CONFIG_MTD_NAND_XWAY) += xway_nand.o diff --git a/target/linux/oxnas/patches-3.14/500-oxnas-sata.patch b/target/linux/oxnas/patches-3.14/500-oxnas-sata.patch index d203734a43..d999ad6c06 100644 --- a/target/linux/oxnas/patches-3.14/500-oxnas-sata.patch +++ b/target/linux/oxnas/patches-3.14/500-oxnas-sata.patch @@ -1,7 +1,5 @@ -Index: linux-3.14.18/drivers/ata/Kconfig -=================================================================== ---- linux-3.14.18.orig/drivers/ata/Kconfig -+++ linux-3.14.18/drivers/ata/Kconfig +--- a/drivers/ata/Kconfig ++++ b/drivers/ata/Kconfig @@ -330,6 +330,13 @@ config SATA_VITESSE If unsure, say N. @@ -16,10 +14,8 @@ Index: linux-3.14.18/drivers/ata/Kconfig comment "PATA SFF controllers with BMDMA" config PATA_ALI -Index: linux-3.14.18/drivers/ata/Makefile -=================================================================== ---- linux-3.14.18.orig/drivers/ata/Makefile -+++ linux-3.14.18/drivers/ata/Makefile +--- a/drivers/ata/Makefile ++++ b/drivers/ata/Makefile @@ -31,6 +31,7 @@ obj-$(CONFIG_SATA_SVW) += sata_svw.o obj-$(CONFIG_SATA_ULI) += sata_uli.o obj-$(CONFIG_SATA_VIA) += sata_via.o diff --git a/target/linux/oxnas/patches-3.14/800-oxnas-ehci.patch b/target/linux/oxnas/patches-3.14/800-oxnas-ehci.patch index 94e62a910f..6e5de9721f 100644 --- a/target/linux/oxnas/patches-3.14/800-oxnas-ehci.patch +++ b/target/linux/oxnas/patches-3.14/800-oxnas-ehci.patch @@ -1,7 +1,5 @@ -Index: linux-3.14.18/drivers/usb/host/Kconfig -=================================================================== ---- linux-3.14.18.orig/drivers/usb/host/Kconfig -+++ linux-3.14.18/drivers/usb/host/Kconfig +--- a/drivers/usb/host/Kconfig ++++ b/drivers/usb/host/Kconfig @@ -273,6 +273,13 @@ config USB_OCTEON_EHCI USB 2.0 device support. All CN6XXX based chips with USB are supported. @@ -16,10 +14,8 @@ Index: linux-3.14.18/drivers/usb/host/Kconfig endif # USB_EHCI_HCD config USB_OXU210HP_HCD -Index: linux-3.14.18/drivers/usb/host/Makefile -=================================================================== ---- linux-3.14.18.orig/drivers/usb/host/Makefile -+++ linux-3.14.18/drivers/usb/host/Makefile +--- a/drivers/usb/host/Makefile ++++ b/drivers/usb/host/Makefile @@ -37,6 +37,7 @@ obj-$(CONFIG_USB_EHCI_HCD_AT91) += ehci- obj-$(CONFIG_USB_EHCI_MSM) += ehci-msm.o obj-$(CONFIG_USB_EHCI_TEGRA) += ehci-tegra.o diff --git a/target/linux/oxnas/patches-3.14/900-more-boards.patch b/target/linux/oxnas/patches-3.14/900-more-boards.patch index 04bbfaa657..206488b868 100644 --- a/target/linux/oxnas/patches-3.14/900-more-boards.patch +++ b/target/linux/oxnas/patches-3.14/900-more-boards.patch @@ -1,7 +1,5 @@ -Index: linux-3.14.18/arch/arm/boot/dts/Makefile -=================================================================== ---- linux-3.14.18.orig/arch/arm/boot/dts/Makefile -+++ linux-3.14.18/arch/arm/boot/dts/Makefile +--- a/arch/arm/boot/dts/Makefile ++++ b/arch/arm/boot/dts/Makefile @@ -233,7 +233,10 @@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420 am43x-epos-evm.dtb \ dra7-evm.dtb |