diff options
| author | Luka Perkov <luka@openwrt.org> | 2014-09-10 21:40:19 +0000 |
|---|---|---|
| committer | Luka Perkov <luka@openwrt.org> | 2014-09-10 21:40:19 +0000 |
| commit | 02629d8f87303a03e3ac36f48c508242d9b8cb09 (patch) | |
| tree | 250a83e0d0e2cf5c7fe49e0a2087f3739f4509c2 /target/linux/ipq806x | |
| parent | 7be0ed78e7cf578aa89996d408703ea2ab79a1e8 (diff) | |
| download | upstream-02629d8f87303a03e3ac36f48c508242d9b8cb09.tar.gz upstream-02629d8f87303a03e3ac36f48c508242d9b8cb09.tar.bz2 upstream-02629d8f87303a03e3ac36f48c508242d9b8cb09.zip | |
kernel: update 3.14 to 3.14.18
Targets were build tested and patches are refreshed.
Signed-off-by: Luka Perkov <luka@openwrt.org>
SVN-Revision: 42463
Diffstat (limited to 'target/linux/ipq806x')
179 files changed, 362 insertions, 1914 deletions
diff --git a/target/linux/ipq806x/Makefile b/target/linux/ipq806x/Makefile index 38f342feb6..6207c9126f 100644 --- a/target/linux/ipq806x/Makefile +++ b/target/linux/ipq806x/Makefile @@ -9,7 +9,7 @@ FEATURES:=squashfs CPU_TYPE:=cortex-a7 MAINTAINER:=John Crispin <blogic@openwrt.org> -LINUX_VERSION:=3.14.16 +LINUX_VERSION:=3.14.18 KERNELNAME="Image dtbs" diff --git a/target/linux/ipq806x/patches/0001-ARM-dts-msm-split-out-msm8660-and-msm8960-soc-into-d.patch b/target/linux/ipq806x/patches/0001-ARM-dts-msm-split-out-msm8660-and-msm8960-soc-into-d.patch index 52d4cf313e..97c89b219a 100644 --- a/target/linux/ipq806x/patches/0001-ARM-dts-msm-split-out-msm8660-and-msm8960-soc-into-d.patch +++ b/target/linux/ipq806x/patches/0001-ARM-dts-msm-split-out-msm8660-and-msm8960-soc-into-d.patch @@ -18,8 +18,6 @@ Signed-off-by: Kumar Gala <galak@codeaurora.org> create mode 100644 arch/arm/boot/dts/qcom-msm8660.dtsi create mode 100644 arch/arm/boot/dts/qcom-msm8960.dtsi -diff --git a/arch/arm/boot/dts/qcom-msm8660-surf.dts b/arch/arm/boot/dts/qcom-msm8660-surf.dts -index 68a72f5..169bad9 100644 --- a/arch/arm/boot/dts/qcom-msm8660-surf.dts +++ b/arch/arm/boot/dts/qcom-msm8660-surf.dts @@ -1,63 +1,6 @@ @@ -87,9 +85,6 @@ index 68a72f5..169bad9 100644 - qcom,controller-type = "pmic-arbiter"; - }; }; -diff --git a/arch/arm/boot/dts/qcom-msm8660.dtsi b/arch/arm/boot/dts/qcom-msm8660.dtsi -new file mode 100644 -index 0000000..69d6c4e --- /dev/null +++ b/arch/arm/boot/dts/qcom-msm8660.dtsi @@ -0,0 +1,63 @@ @@ -156,8 +151,6 @@ index 0000000..69d6c4e + qcom,controller-type = "pmic-arbiter"; + }; +}; -diff --git a/arch/arm/boot/dts/qcom-msm8960-cdp.dts b/arch/arm/boot/dts/qcom-msm8960-cdp.dts -index 7c30de4..a58fb88 100644 --- a/arch/arm/boot/dts/qcom-msm8960-cdp.dts +++ b/arch/arm/boot/dts/qcom-msm8960-cdp.dts @@ -1,70 +1,6 @@ @@ -232,9 +225,6 @@ index 7c30de4..a58fb88 100644 - qcom,controller-type = "pmic-arbiter"; - }; }; -diff --git a/arch/arm/boot/dts/qcom-msm8960.dtsi b/arch/arm/boot/dts/qcom-msm8960.dtsi -new file mode 100644 -index 0000000..ff00282 --- /dev/null +++ b/arch/arm/boot/dts/qcom-msm8960.dtsi @@ -0,0 +1,70 @@ @@ -308,6 +298,3 @@ index 0000000..ff00282 + qcom,controller-type = "pmic-arbiter"; + }; +}; --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0002-ARM-msm-Remove-pen_release-usage.patch b/target/linux/ipq806x/patches/0002-ARM-msm-Remove-pen_release-usage.patch index 72b6618e23..19eaae62e5 100644 --- a/target/linux/ipq806x/patches/0002-ARM-msm-Remove-pen_release-usage.patch +++ b/target/linux/ipq806x/patches/0002-ARM-msm-Remove-pen_release-usage.patch @@ -19,11 +19,9 @@ Signed-off-by: Kumar Gala <galak@codeaurora.org> 4 files changed, 8 insertions(+), 101 deletions(-) delete mode 100644 arch/arm/mach-msm/headsmp.S -diff --git a/arch/arm/mach-msm/Makefile b/arch/arm/mach-msm/Makefile -index 8e307a1..721f27f 100644 --- a/arch/arm/mach-msm/Makefile +++ b/arch/arm/mach-msm/Makefile -@@ -19,7 +19,7 @@ obj-$(CONFIG_MSM_SCM) += scm.o scm-boot.o +@@ -19,7 +19,7 @@ obj-$(CONFIG_MSM_SCM) += scm.o scm-boot. CFLAGS_scm.o :=$(call as-instr,.arch_extension sec,-DREQUIRES_SEC=1) obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o @@ -32,9 +30,6 @@ index 8e307a1..721f27f 100644 obj-$(CONFIG_MACH_TROUT) += board-trout.o board-trout-gpio.o board-trout-mmc.o devices-msm7x00.o obj-$(CONFIG_MACH_TROUT) += board-trout.o board-trout-gpio.o board-trout-mmc.o board-trout-panel.o devices-msm7x00.o -diff --git a/arch/arm/mach-msm/headsmp.S b/arch/arm/mach-msm/headsmp.S -deleted file mode 100644 -index 6c62c3f..0000000 --- a/arch/arm/mach-msm/headsmp.S +++ /dev/null @@ -1,39 +0,0 @@ @@ -77,11 +72,9 @@ index 6c62c3f..0000000 - .align -1: .long . - .long pen_release -diff --git a/arch/arm/mach-msm/hotplug.c b/arch/arm/mach-msm/hotplug.c -index 326a872..cea80fc 100644 --- a/arch/arm/mach-msm/hotplug.c +++ b/arch/arm/mach-msm/hotplug.c -@@ -24,33 +24,10 @@ static inline void cpu_leave_lowpower(void) +@@ -24,33 +24,10 @@ static inline void cpu_leave_lowpower(vo static inline void platform_do_lowpower(unsigned int cpu) { @@ -119,8 +112,6 @@ index 326a872..cea80fc 100644 } /* -diff --git a/arch/arm/mach-msm/platsmp.c b/arch/arm/mach-msm/platsmp.c -index f10a1f5..3721b31 100644 --- a/arch/arm/mach-msm/platsmp.c +++ b/arch/arm/mach-msm/platsmp.c @@ -12,13 +12,10 @@ @@ -160,7 +151,7 @@ index f10a1f5..3721b31 100644 * Synchronise with the boot thread. */ spin_lock(&boot_lock); -@@ -57,7 +47,7 @@ static void msm_secondary_init(unsigned int cpu) +@@ -57,7 +47,7 @@ static void msm_secondary_init(unsigned static void prepare_cold_cpu(unsigned int cpu) { int ret; @@ -169,7 +160,7 @@ index f10a1f5..3721b31 100644 SCM_FLAG_COLDBOOT_CPU1); if (ret == 0) { void __iomem *sc1_base_ptr; -@@ -75,7 +65,6 @@ static void prepare_cold_cpu(unsigned int cpu) +@@ -75,7 +65,6 @@ static void prepare_cold_cpu(unsigned in static int msm_boot_secondary(unsigned int cpu, struct task_struct *idle) { @@ -177,7 +168,7 @@ index f10a1f5..3721b31 100644 static int cold_boot_done; /* Only need to bring cpu out of reset this way once */ -@@ -91,39 +80,19 @@ static int msm_boot_secondary(unsigned int cpu, struct task_struct *idle) +@@ -91,39 +80,19 @@ static int msm_boot_secondary(unsigned i spin_lock(&boot_lock); /* @@ -218,6 +209,3 @@ index f10a1f5..3721b31 100644 } /* --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0003-ARM-msm-kill-off-hotplug.c.patch b/target/linux/ipq806x/patches/0003-ARM-msm-kill-off-hotplug.c.patch index b6e9bbac57..79aa96f24a 100644 --- a/target/linux/ipq806x/patches/0003-ARM-msm-kill-off-hotplug.c.patch +++ b/target/linux/ipq806x/patches/0003-ARM-msm-kill-off-hotplug.c.patch @@ -16,11 +16,9 @@ Signed-off-by: Kumar Gala <galak@codeaurora.org> 4 files changed, 7 insertions(+), 53 deletions(-) delete mode 100644 arch/arm/mach-msm/hotplug.c -diff --git a/arch/arm/mach-msm/Makefile b/arch/arm/mach-msm/Makefile -index 721f27f..8327f60 100644 --- a/arch/arm/mach-msm/Makefile +++ b/arch/arm/mach-msm/Makefile -@@ -18,7 +18,6 @@ obj-$(CONFIG_MSM_SCM) += scm.o scm-boot.o +@@ -18,7 +18,6 @@ obj-$(CONFIG_MSM_SCM) += scm.o scm-boot. CFLAGS_scm.o :=$(call as-instr,.arch_extension sec,-DREQUIRES_SEC=1) @@ -28,11 +26,9 @@ index 721f27f..8327f60 100644 obj-$(CONFIG_SMP) += platsmp.o obj-$(CONFIG_MACH_TROUT) += board-trout.o board-trout-gpio.o board-trout-mmc.o devices-msm7x00.o -diff --git a/arch/arm/mach-msm/common.h b/arch/arm/mach-msm/common.h -index 33c7725..0a4899b 100644 --- a/arch/arm/mach-msm/common.h +++ b/arch/arm/mach-msm/common.h -@@ -24,7 +24,6 @@ extern void __iomem *__msm_ioremap_caller(phys_addr_t phys_addr, size_t size, +@@ -24,7 +24,6 @@ extern void __iomem *__msm_ioremap_calle unsigned int mtype, void *caller); extern struct smp_operations msm_smp_ops; @@ -40,9 +36,6 @@ index 33c7725..0a4899b 100644 struct msm_mmc_platform_data; -diff --git a/arch/arm/mach-msm/hotplug.c b/arch/arm/mach-msm/hotplug.c -deleted file mode 100644 -index cea80fc..0000000 --- a/arch/arm/mach-msm/hotplug.c +++ /dev/null @@ -1,51 +0,0 @@ @@ -97,8 +90,6 @@ index cea80fc..0000000 - */ - cpu_leave_lowpower(); -} -diff --git a/arch/arm/mach-msm/platsmp.c b/arch/arm/mach-msm/platsmp.c -index 3721b31..251a91e 100644 --- a/arch/arm/mach-msm/platsmp.c +++ b/arch/arm/mach-msm/platsmp.c @@ -29,6 +29,13 @@ extern void secondary_startup(void); @@ -115,6 +106,3 @@ index 3721b31..251a91e 100644 static inline int get_core_count(void) { /* 1 + the PART[1:0] field of MIDR */ --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0004-clocksource-qcom-Move-clocksource-code-out-of-mach-m.patch b/target/linux/ipq806x/patches/0004-clocksource-qcom-Move-clocksource-code-out-of-mach-m.patch index fd730c1e47..c726d3f982 100644 --- a/target/linux/ipq806x/patches/0004-clocksource-qcom-Move-clocksource-code-out-of-mach-m.patch +++ b/target/linux/ipq806x/patches/0004-clocksource-qcom-Move-clocksource-code-out-of-mach-m.patch @@ -20,8 +20,6 @@ Signed-off-by: Kumar Gala <galak@codeaurora.org> delete mode 100644 arch/arm/mach-msm/timer.c create mode 100644 drivers/clocksource/qcom-timer.c -diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig -index 9625cf3..3c4eca7 100644 --- a/arch/arm/mach-msm/Kconfig +++ b/arch/arm/mach-msm/Kconfig @@ -21,7 +21,7 @@ config ARCH_MSM8X60 @@ -77,8 +75,6 @@ index 9625cf3..3c4eca7 100644 - bool - endif -diff --git a/arch/arm/mach-msm/Makefile b/arch/arm/mach-msm/Makefile -index 8327f60..04b1bee 100644 --- a/arch/arm/mach-msm/Makefile +++ b/arch/arm/mach-msm/Makefile @@ -1,4 +1,3 @@ @@ -86,9 +82,6 @@ index 8327f60..04b1bee 100644 obj-$(CONFIG_MSM_PROC_COMM) += clock.o obj-$(CONFIG_MSM_VIC) += irq-vic.o -diff --git a/arch/arm/mach-msm/timer.c b/arch/arm/mach-msm/timer.c -deleted file mode 100644 -index fd16449..0000000 --- a/arch/arm/mach-msm/timer.c +++ /dev/null @@ -1,333 +0,0 @@ @@ -425,8 +418,6 @@ index fd16449..0000000 - return; - msm_timer_init(19200000 / 4, 32, 7, false); -} -diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig -index cd6950f..6510ec4 100644 --- a/drivers/clocksource/Kconfig +++ b/drivers/clocksource/Kconfig @@ -140,3 +140,6 @@ config VF_PIT_TIMER @@ -436,11 +427,9 @@ index cd6950f..6510ec4 100644 + +config CLKSRC_QCOM + bool -diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile -index c7ca50a..2e0c0cc 100644 --- a/drivers/clocksource/Makefile +++ b/drivers/clocksource/Makefile -@@ -32,6 +32,7 @@ obj-$(CONFIG_CLKSRC_EFM32) += time-efm32.o +@@ -32,6 +32,7 @@ obj-$(CONFIG_CLKSRC_EFM32) += time-efm32 obj-$(CONFIG_CLKSRC_EXYNOS_MCT) += exynos_mct.o obj-$(CONFIG_CLKSRC_SAMSUNG_PWM) += samsung_pwm_timer.o obj-$(CONFIG_VF_PIT_TIMER) += vf_pit_timer.o @@ -448,9 +437,6 @@ index c7ca50a..2e0c0cc 100644 obj-$(CONFIG_ARM_ARCH_TIMER) += arm_arch_timer.o obj-$(CONFIG_ARM_GLOBAL_TIMER) += arm_global_timer.o -diff --git a/drivers/clocksource/qcom-timer.c b/drivers/clocksource/qcom-timer.c -new file mode 100644 -index 0000000..dca829e --- /dev/null +++ b/drivers/clocksource/qcom-timer.c @@ -0,0 +1,329 @@ @@ -783,6 +769,3 @@ index 0000000..dca829e + return; + msm_timer_init(19200000 / 4, 32, 7, false); +} --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0005-ARM-qcom-Split-Qualcomm-support-into-legacy-and-mult.patch b/target/linux/ipq806x/patches/0005-ARM-qcom-Split-Qualcomm-support-into-legacy-and-mult.patch index c23faf0640..4cd4c4757f 100644 --- a/target/linux/ipq806x/patches/0005-ARM-qcom-Split-Qualcomm-support-into-legacy-and-mult.patch +++ b/target/linux/ipq806x/patches/0005-ARM-qcom-Split-Qualcomm-support-into-legacy-and-mult.patch @@ -50,11 +50,9 @@ Signed-off-by: Kumar Gala <galak@codeaurora.org> create mode 100644 arch/arm/mach-qcom/scm.c create mode 100644 arch/arm/mach-qcom/scm.h -diff --git a/MAINTAINERS b/MAINTAINERS -index 900d98e..7d23402 100644 --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -1168,6 +1168,14 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) +@@ -1168,6 +1168,14 @@ L: linux-arm-kernel@lists.infradead.org W: http://www.arm.linux.org.uk/ S: Maintained @@ -69,11 +67,9 @@ index 900d98e..7d23402 100644 ARM/RADISYS ENP2611 MACHINE SUPPORT M: Lennert Buytenhek <kernel@wantstofly.org> L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) -diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig -index 1594945..d02ce70 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig -@@ -657,9 +657,8 @@ config ARCH_PXA +@@ -658,9 +658,8 @@ config ARCH_PXA help Support for Intel/Marvell's PXA2xx/PXA3xx processor line. @@ -85,7 +81,7 @@ index 1594945..d02ce70 100644 select ARCH_REQUIRE_GPIOLIB select COMMON_CLK select GENERIC_CLOCKEVENTS -@@ -1005,6 +1004,8 @@ source "arch/arm/plat-pxa/Kconfig" +@@ -1006,6 +1005,8 @@ source "arch/arm/plat-pxa/Kconfig" source "arch/arm/mach-mmp/Kconfig" @@ -94,8 +90,6 @@ index 1594945..d02ce70 100644 source "arch/arm/mach-realview/Kconfig" source "arch/arm/mach-rockchip/Kconfig" -diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug -index 0531da8..4491c7b 100644 --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug @@ -956,7 +956,7 @@ config DEBUG_STI_UART @@ -107,11 +101,9 @@ index 0531da8..4491c7b 100644 config DEBUG_LL_INCLUDE string -diff --git a/arch/arm/Makefile b/arch/arm/Makefile -index 08a9ef5..51e5bed 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile -@@ -180,6 +180,7 @@ machine-$(CONFIG_ARCH_OMAP2PLUS) += omap2 +@@ -185,6 +185,7 @@ machine-$(CONFIG_ARCH_OMAP2PLUS) += omap machine-$(CONFIG_ARCH_ORION5X) += orion5x machine-$(CONFIG_ARCH_PICOXCELL) += picoxcell machine-$(CONFIG_ARCH_PXA) += pxa @@ -119,11 +111,9 @@ index 08a9ef5..51e5bed 100644 machine-$(CONFIG_ARCH_REALVIEW) += realview machine-$(CONFIG_ARCH_ROCKCHIP) += rockchip machine-$(CONFIG_ARCH_RPC) += rpc -diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile -index 0320303..4a89023 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile -@@ -119,9 +119,6 @@ dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-cloudbox.dtb \ +@@ -119,9 +119,6 @@ dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood- kirkwood-ts219-6282.dtb dtb-$(CONFIG_ARCH_MARCO) += marco-evb.dtb dtb-$(CONFIG_ARCH_MOXART) += moxart-uc7112lx.dtb @@ -133,7 +123,7 @@ index 0320303..4a89023 100644 dtb-$(CONFIG_ARCH_MVEBU) += armada-370-db.dtb \ armada-370-mirabox.dtb \ armada-370-netgear-rn102.dtb \ -@@ -234,6 +231,9 @@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \ +@@ -234,6 +231,9 @@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420 dra7-evm.dtb dtb-$(CONFIG_ARCH_ORION5X) += orion5x-lacie-ethernet-disk-mini-v2.dtb dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb @@ -143,8 +133,6 @@ index 0320303..4a89023 100644 dtb-$(CONFIG_ARCH_U8500) += ste-snowball.dtb \ ste-hrefprev60-stuib.dtb \ ste-hrefprev60-tvk.dtb \ -diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig -index 3c4eca7..a7f959e 100644 --- a/arch/arm/mach-msm/Kconfig +++ b/arch/arm/mach-msm/Kconfig @@ -1,50 +1,9 @@ @@ -208,8 +196,6 @@ index 3c4eca7..a7f959e 100644 config MACH_HALIBUT depends on ARCH_MSM -diff --git a/arch/arm/mach-msm/Makefile b/arch/arm/mach-msm/Makefile -index 04b1bee..27c078a 100644 --- a/arch/arm/mach-msm/Makefile +++ b/arch/arm/mach-msm/Makefile @@ -13,17 +13,11 @@ obj-$(CONFIG_ARCH_QSD8X50) += dma.o io.o @@ -230,9 +216,6 @@ index 04b1bee..27c078a 100644 -obj-$(CONFIG_ARCH_MSM_DT) += board-dt.o obj-$(CONFIG_MSM_GPIOMUX) += gpiomux.o obj-$(CONFIG_ARCH_QSD8X50) += gpiomux-8x50.o -diff --git a/arch/arm/mach-msm/board-dt.c b/arch/arm/mach-msm/board-dt.c -deleted file mode 100644 -index 1f11d93..0000000 --- a/arch/arm/mach-msm/board-dt.c +++ /dev/null @@ -1,41 +0,0 @@ @@ -277,9 +260,6 @@ index 1f11d93..0000000 -DT_MACHINE_START(APQ_DT, "Qualcomm MSM (Flattened Device Tree)") - .dt_compat = apq8074_dt_match, -MACHINE_END -diff --git a/arch/arm/mach-msm/platsmp.c b/arch/arm/mach-msm/platsmp.c -deleted file mode 100644 -index 251a91e..0000000 --- a/arch/arm/mach-msm/platsmp.c +++ /dev/null @@ -1,137 +0,0 @@ @@ -420,9 +400,6 @@ index 251a91e..0000000 - .cpu_die = msm_cpu_die, -#endif -}; -diff --git a/arch/arm/mach-msm/scm-boot.c b/arch/arm/mach-msm/scm-boot.c -deleted file mode 100644 -index 45cee3e..0000000 --- a/arch/arm/mach-msm/scm-boot.c +++ /dev/null @@ -1,39 +0,0 @@ @@ -465,9 +442,6 @@ index 45cee3e..0000000 - &cmd, sizeof(cmd), NULL, 0); -} -EXPORT_SYMBOL(scm_set_boot_addr); -diff --git a/arch/arm/mach-msm/scm-boot.h b/arch/arm/mach-msm/scm-boot.h -deleted file mode 100644 -index 7be32ff..0000000 --- a/arch/arm/mach-msm/scm-boot.h +++ /dev/null @@ -1,22 +0,0 @@ @@ -493,9 +467,6 @@ index 7be32ff..0000000 -int scm_set_boot_addr(phys_addr_t addr, int flags); - -#endif -diff --git a/arch/arm/mach-msm/scm.c b/arch/arm/mach-msm/scm.c -deleted file mode 100644 -index c536fd6..0000000 --- a/arch/arm/mach-msm/scm.c +++ /dev/null @@ -1,299 +0,0 @@ @@ -798,9 +769,6 @@ index c536fd6..0000000 - return version; -} -EXPORT_SYMBOL(scm_get_version); -diff --git a/arch/arm/mach-msm/scm.h b/arch/arm/mach-msm/scm.h -deleted file mode 100644 -index 00b31ea..0000000 --- a/arch/arm/mach-msm/scm.h +++ /dev/null @@ -1,25 +0,0 @@ @@ -829,9 +797,6 @@ index 00b31ea..0000000 -extern u32 scm_get_version(void); - -#endif -diff --git a/arch/arm/mach-qcom/Kconfig b/arch/arm/mach-qcom/Kconfig -new file mode 100644 -index 0000000..a028be2 --- /dev/null +++ b/arch/arm/mach-qcom/Kconfig @@ -0,0 +1,33 @@ @@ -868,9 +833,6 @@ index 0000000..a028be2 + bool + +endif -diff --git a/arch/arm/mach-qcom/Makefile b/arch/arm/mach-qcom/Makefile -new file mode 100644 -index 0000000..8f756ae --- /dev/null +++ b/arch/arm/mach-qcom/Makefile @@ -0,0 +1,5 @@ @@ -879,9 +841,6 @@ index 0000000..8f756ae +obj-$(CONFIG_QCOM_SCM) += scm.o scm-boot.o + +CFLAGS_scm.o :=$(call as-instr,.arch_extension sec,-DREQUIRES_SEC=1) -diff --git a/arch/arm/mach-qcom/board.c b/arch/arm/mach-qcom/board.c -new file mode 100644 -index 0000000..4529f6b --- /dev/null +++ b/arch/arm/mach-qcom/board.c @@ -0,0 +1,40 @@ @@ -925,9 +884,6 @@ index 0000000..4529f6b +DT_MACHINE_START(APQ_DT, "Qualcomm (Flattened Device Tree)") + .dt_compat = apq8074_dt_match, +MACHINE_END -diff --git a/arch/arm/mach-qcom/platsmp.c b/arch/arm/mach-qcom/platsmp.c -new file mode 100644 -index 0000000..67823a7 --- /dev/null +++ b/arch/arm/mach-qcom/platsmp.c @@ -0,0 +1,137 @@ @@ -1068,9 +1024,6 @@ index 0000000..67823a7 + .cpu_die = msm_cpu_die, +#endif +}; -diff --git a/arch/arm/mach-qcom/scm-boot.c b/arch/arm/mach-qcom/scm-boot.c -new file mode 100644 -index 0000000..45cee3e --- /dev/null +++ b/arch/arm/mach-qcom/scm-boot.c @@ -0,0 +1,39 @@ @@ -1113,9 +1066,6 @@ index 0000000..45cee3e + &cmd, sizeof(cmd), NULL, 0); +} +EXPORT_SYMBOL(scm_set_boot_addr); -diff --git a/arch/arm/mach-qcom/scm-boot.h b/arch/arm/mach-qcom/scm-boot.h -new file mode 100644 -index 0000000..7be32ff --- /dev/null +++ b/arch/arm/mach-qcom/scm-boot.h @@ -0,0 +1,22 @@ @@ -1141,9 +1091,6 @@ index 0000000..7be32ff +int scm_set_boot_addr(phys_addr_t addr, int flags); + +#endif -diff --git a/arch/arm/mach-qcom/scm.c b/arch/arm/mach-qcom/scm.c -new file mode 100644 -index 0000000..c536fd6 --- /dev/null +++ b/arch/arm/mach-qcom/scm.c @@ -0,0 +1,299 @@ @@ -1446,9 +1393,6 @@ index 0000000..c536fd6 + return version; +} +EXPORT_SYMBOL(scm_get_version); -diff --git a/arch/arm/mach-qcom/scm.h b/arch/arm/mach-qcom/scm.h -new file mode 100644 -index 0000000..00b31ea --- /dev/null +++ b/arch/arm/mach-qcom/scm.h @@ -0,0 +1,25 @@ @@ -1477,6 +1421,3 @@ index 0000000..00b31ea +extern u32 scm_get_version(void); + +#endif --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0006-clocksource-qcom-split-building-of-legacy-vs-multipl.patch b/target/linux/ipq806x/patches/0006-clocksource-qcom-split-building-of-legacy-vs-multipl.patch index 5cb6bf393f..79603f89c9 100644 --- a/target/linux/ipq806x/patches/0006-clocksource-qcom-split-building-of-legacy-vs-multipl.patch +++ b/target/linux/ipq806x/patches/0006-clocksource-qcom-split-building-of-legacy-vs-multipl.patch @@ -14,11 +14,9 @@ Signed-off-by: Kumar Gala <galak@codeaurora.org> drivers/clocksource/qcom-timer.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) -diff --git a/drivers/clocksource/qcom-timer.c b/drivers/clocksource/qcom-timer.c -index dca829e..e807acf 100644 --- a/drivers/clocksource/qcom-timer.c +++ b/drivers/clocksource/qcom-timer.c -@@ -106,15 +106,6 @@ static notrace cycle_t msm_read_timer_count(struct clocksource *cs) +@@ -106,15 +106,6 @@ static notrace cycle_t msm_read_timer_co return readl_relaxed(source_base + TIMER_COUNT_VAL); } @@ -43,7 +41,7 @@ index dca829e..e807acf 100644 static void __init msm_dt_timer_init(struct device_node *np) { u32 freq; -@@ -281,7 +272,7 @@ static void __init msm_dt_timer_init(struct device_node *np) +@@ -281,7 +272,7 @@ static void __init msm_dt_timer_init(str } CLOCKSOURCE_OF_DECLARE(kpss_timer, "qcom,kpss-timer", msm_dt_timer_init); CLOCKSOURCE_OF_DECLARE(scss_timer, "qcom,scss-timer", msm_dt_timer_init); @@ -52,7 +50,7 @@ index dca829e..e807acf 100644 static int __init msm_timer_map(phys_addr_t addr, u32 event, u32 source, u32 sts) -@@ -301,6 +292,15 @@ static int __init msm_timer_map(phys_addr_t addr, u32 event, u32 source, +@@ -301,6 +292,15 @@ static int __init msm_timer_map(phys_add return 0; } @@ -73,6 +71,3 @@ index dca829e..e807acf 100644 msm_timer_init(19200000 / 4, 32, 7, false); } +#endif --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0007-ARM-qcom-Rename-various-msm-prefixed-functions-to-qc.patch b/target/linux/ipq806x/patches/0007-ARM-qcom-Rename-various-msm-prefixed-functions-to-qc.patch index fc064b27a9..cab5bcd203 100644 --- a/target/linux/ipq806x/patches/0007-ARM-qcom-Rename-various-msm-prefixed-functions-to-qc.patch +++ b/target/linux/ipq806x/patches/0007-ARM-qcom-Rename-various-msm-prefixed-functions-to-qc.patch @@ -14,8 +14,6 @@ Signed-off-by: Kumar Gala <galak@codeaurora.org> arch/arm/mach-qcom/platsmp.c | 22 +++++++++++----------- 2 files changed, 13 insertions(+), 13 deletions(-) -diff --git a/arch/arm/mach-qcom/board.c b/arch/arm/mach-qcom/board.c -index 4529f6b..830f69c 100644 --- a/arch/arm/mach-qcom/board.c +++ b/arch/arm/mach-qcom/board.c @@ -17,7 +17,7 @@ @@ -27,7 +25,7 @@ index 4529f6b..830f69c 100644 static const char * const qcom_dt_match[] __initconst = { "qcom,msm8660-surf", -@@ -31,7 +31,7 @@ static const char * const apq8074_dt_match[] __initconst = { +@@ -31,7 +31,7 @@ static const char * const apq8074_dt_mat }; DT_MACHINE_START(QCOM_DT, "Qualcomm (Flattened Device Tree)") @@ -36,8 +34,6 @@ index 4529f6b..830f69c 100644 .dt_compat = qcom_dt_match, MACHINE_END -diff --git a/arch/arm/mach-qcom/platsmp.c b/arch/arm/mach-qcom/platsmp.c -index 67823a7..9c53ea7 100644 --- a/arch/arm/mach-qcom/platsmp.c +++ b/arch/arm/mach-qcom/platsmp.c @@ -30,7 +30,7 @@ extern void secondary_startup(void); @@ -58,7 +54,7 @@ index 67823a7..9c53ea7 100644 { /* * Synchronise with the boot thread. -@@ -70,7 +70,7 @@ static void prepare_cold_cpu(unsigned int cpu) +@@ -70,7 +70,7 @@ static void prepare_cold_cpu(unsigned in "address\n"); } @@ -67,7 +63,7 @@ index 67823a7..9c53ea7 100644 { static int cold_boot_done; -@@ -108,7 +108,7 @@ static int msm_boot_secondary(unsigned int cpu, struct task_struct *idle) +@@ -108,7 +108,7 @@ static int msm_boot_secondary(unsigned i * does not support the ARM SCU, so just set the possible cpu mask to * NR_CPUS. */ @@ -76,7 +72,7 @@ index 67823a7..9c53ea7 100644 { unsigned int i, ncores = get_core_count(); -@@ -122,16 +122,16 @@ static void __init msm_smp_init_cpus(void) +@@ -122,16 +122,16 @@ static void __init msm_smp_init_cpus(voi set_cpu_possible(i, true); } @@ -100,6 +96,3 @@ index 67823a7..9c53ea7 100644 + .cpu_die = qcom_cpu_die, #endif }; --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0008-ARM-Introduce-CPU_METHOD_OF_DECLARE-for-cpu-hotplug-.patch b/target/linux/ipq806x/patches/0008-ARM-Introduce-CPU_METHOD_OF_DECLARE-for-cpu-hotplug-.patch index 9579ac2f63..b4a8b4b5ef 100644 --- a/target/linux/ipq806x/patches/0008-ARM-Introduce-CPU_METHOD_OF_DECLARE-for-cpu-hotplug-.patch +++ b/target/linux/ipq806x/patches/0008-ARM-Introduce-CPU_METHOD_OF_DECLARE-for-cpu-hotplug-.patch @@ -32,8 +32,6 @@ Signed-off-by: Kumar Gala <galak@codeaurora.org> include/asm-generic/vmlinux.lds.h | 10 ++++++++++ 3 files changed, 59 insertions(+) -diff --git a/arch/arm/include/asm/smp.h b/arch/arm/include/asm/smp.h -index 22a3b9b..772435b 100644 --- a/arch/arm/include/asm/smp.h +++ b/arch/arm/include/asm/smp.h @@ -114,6 +114,15 @@ struct smp_operations { @@ -52,8 +50,6 @@ index 22a3b9b..772435b 100644 /* * set platform specific SMP operations */ -diff --git a/arch/arm/kernel/devtree.c b/arch/arm/kernel/devtree.c -index f751714..c7419a5 100644 --- a/arch/arm/kernel/devtree.c +++ b/arch/arm/kernel/devtree.c @@ -18,6 +18,7 @@ @@ -64,7 +60,7 @@ index f751714..c7419a5 100644 #include <asm/cputype.h> #include <asm/setup.h> -@@ -63,6 +64,34 @@ void __init arm_dt_memblock_reserve(void) +@@ -63,6 +64,34 @@ void __init arm_dt_memblock_reserve(void } } @@ -126,11 +122,9 @@ index f751714..c7419a5 100644 if (!bootcpu_valid) { pr_warn("DT missing boot CPU MPIDR[23:0], fall back to default cpu_logical_map\n"); return; -diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h -index bc2121f..bd02ca7 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h -@@ -167,6 +167,15 @@ +@@ -177,6 +177,15 @@ #define CLK_OF_TABLES() #endif @@ -146,7 +140,7 @@ index bc2121f..bd02ca7 100644 #define KERNEL_DTB() \ STRUCT_ALIGN(); \ VMLINUX_SYMBOL(__dtb_start) = .; \ -@@ -491,6 +500,7 @@ +@@ -502,6 +511,7 @@ MEM_DISCARD(init.rodata) \ CLK_OF_TABLES() \ CLKSRC_OF_TABLES() \ @@ -154,6 +148,3 @@ index bc2121f..bd02ca7 100644 KERNEL_DTB() \ IRQCHIP_OF_MATCH_TABLE() --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0009-ARM-qcom-Re-organize-platsmp-to-make-it-extensible.patch b/target/linux/ipq806x/patches/0009-ARM-qcom-Re-organize-platsmp-to-make-it-extensible.patch index 6601ad4e0d..4bab4c962b 100644 --- a/target/linux/ipq806x/patches/0009-ARM-qcom-Re-organize-platsmp-to-make-it-extensible.patch +++ b/target/linux/ipq806x/patches/0009-ARM-qcom-Re-organize-platsmp-to-make-it-extensible.patch @@ -22,8 +22,6 @@ Signed-off-by: Kumar Gala <galak@codeaurora.org> arch/arm/mach-qcom/platsmp.c | 118 +++++++++++++++++++++++------------------- 3 files changed, 65 insertions(+), 69 deletions(-) -diff --git a/arch/arm/mach-msm/common.h b/arch/arm/mach-msm/common.h -index 0a4899b..572479a 100644 --- a/arch/arm/mach-msm/common.h +++ b/arch/arm/mach-msm/common.h @@ -23,8 +23,6 @@ extern void msm_map_qsd8x50_io(void); @@ -35,8 +33,6 @@ index 0a4899b..572479a 100644 struct msm_mmc_platform_data; extern void msm_add_devices(void); -diff --git a/arch/arm/mach-qcom/board.c b/arch/arm/mach-qcom/board.c -index 830f69c..bae617e 100644 --- a/arch/arm/mach-qcom/board.c +++ b/arch/arm/mach-qcom/board.c @@ -11,30 +11,16 @@ @@ -70,8 +66,6 @@ index 830f69c..bae617e 100644 -DT_MACHINE_START(APQ_DT, "Qualcomm (Flattened Device Tree)") - .dt_compat = apq8074_dt_match, -MACHINE_END -diff --git a/arch/arm/mach-qcom/platsmp.c b/arch/arm/mach-qcom/platsmp.c -index 9c53ea7..ec8604d 100644 --- a/arch/arm/mach-qcom/platsmp.c +++ b/arch/arm/mach-qcom/platsmp.c @@ -13,17 +13,18 @@ @@ -97,7 +91,7 @@ index 9c53ea7..ec8604d 100644 extern void secondary_startup(void); -@@ -36,12 +37,6 @@ static void __ref qcom_cpu_die(unsigned int cpu) +@@ -36,12 +37,6 @@ static void __ref qcom_cpu_die(unsigned } #endif @@ -110,7 +104,7 @@ index 9c53ea7..ec8604d 100644 static void qcom_secondary_init(unsigned int cpu) { /* -@@ -51,33 +46,41 @@ static void qcom_secondary_init(unsigned int cpu) +@@ -51,33 +46,41 @@ static void qcom_secondary_init(unsigned spin_unlock(&boot_lock); } @@ -174,7 +168,7 @@ index 9c53ea7..ec8604d 100644 } /* -@@ -99,39 +102,48 @@ static int qcom_boot_secondary(unsigned int cpu, struct task_struct *idle) +@@ -99,39 +102,48 @@ static int qcom_boot_secondary(unsigned */ spin_unlock(&boot_lock); @@ -189,8 +183,7 @@ index 9c53ea7..ec8604d 100644 - * NR_CPUS. - */ -static void __init qcom_smp_init_cpus(void) -+static int msm8660_boot_secondary(unsigned int cpu, struct task_struct *idle) - { +-{ - unsigned int i, ncores = get_core_count(); - - if (ncores > nr_cpu_ids) { @@ -201,6 +194,8 @@ index 9c53ea7..ec8604d 100644 - - for (i = 0; i < ncores; i++) - set_cpu_possible(i, true); ++static int msm8660_boot_secondary(unsigned int cpu, struct task_struct *idle) ++{ + return qcom_boot_secondary(cpu, scss_release_secondary); } @@ -244,6 +239,3 @@ index 9c53ea7..ec8604d 100644 #endif }; +CPU_METHOD_OF_DECLARE(qcom_smp, "qcom,gcc-msm8660", &smp_msm8660_ops); --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0010-devicetree-bindings-Document-Krait-Scorpion-cpus-and.patch b/target/linux/ipq806x/patches/0010-devicetree-bindings-Document-Krait-Scorpion-cpus-and.patch index 0bcd3e873b..751aa8510f 100644 --- a/target/linux/ipq806x/patches/0010-devicetree-bindings-Document-Krait-Scorpion-cpus-and.patch +++ b/target/linux/ipq806x/patches/0010-devicetree-bindings-Document-Krait-Scorpion-cpus-and.patch @@ -18,11 +18,9 @@ Signed-off-by: Kumar Gala <galak@codeaurora.org> Documentation/devicetree/bindings/arm/cpus.txt | 25 +++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) -diff --git a/Documentation/devicetree/bindings/arm/cpus.txt b/Documentation/devicetree/bindings/arm/cpus.txt -index 9130435..333f4ae 100644 --- a/Documentation/devicetree/bindings/arm/cpus.txt +++ b/Documentation/devicetree/bindings/arm/cpus.txt -@@ -180,7 +180,11 @@ nodes to be present and contain the properties described below. +@@ -180,7 +180,11 @@ nodes to be present and contain the prop be one of: "spin-table" "psci" @@ -35,7 +33,7 @@ index 9130435..333f4ae 100644 - cpu-release-addr Usage: required for systems that have an "enable-method" -@@ -191,6 +195,21 @@ nodes to be present and contain the properties described below. +@@ -191,6 +195,21 @@ nodes to be present and contain the prop property identifying a 64-bit zero-initialised memory location. @@ -65,6 +63,3 @@ index 9130435..333f4ae 100644 +-- +[1] arm/msm/qcom,saw2.txt +[2] arm/msm/qcom,kpss-acc.txt --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0011-devicetree-bindings-Document-qcom-kpss-acc.patch b/target/linux/ipq806x/patches/0011-devicetree-bindings-Document-qcom-kpss-acc.patch index fc57727b37..dfd4c32861 100644 --- a/target/linux/ipq806x/patches/0011-devicetree-bindings-Document-qcom-kpss-acc.patch +++ b/target/linux/ipq806x/patches/0011-devicetree-bindings-Document-qcom-kpss-acc.patch @@ -14,9 +14,6 @@ Signed-off-by: Kumar Gala <galak@codeaurora.org> 1 file changed, 30 insertions(+) create mode 100644 Documentation/devicetree/bindings/arm/msm/qcom,kpss-acc.txt -diff --git a/Documentation/devicetree/bindings/arm/msm/qcom,kpss-acc.txt b/Documentation/devicetree/bindings/arm/msm/qcom,kpss-acc.txt -new file mode 100644 -index 0000000..1333db9 --- /dev/null +++ b/Documentation/devicetree/bindings/arm/msm/qcom,kpss-acc.txt @@ -0,0 +1,30 @@ @@ -50,6 +47,3 @@ index 0000000..1333db9 + reg = <0x02088000 0x1000>, + <0x02008000 0x1000>; + }; --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0012-devicetree-bindings-Document-qcom-saw2-node.patch b/target/linux/ipq806x/patches/0012-devicetree-bindings-Document-qcom-saw2-node.patch index 5bf18c1f98..79aaf2d898 100644 --- a/target/linux/ipq806x/patches/0012-devicetree-bindings-Document-qcom-saw2-node.patch +++ b/target/linux/ipq806x/patches/0012-devicetree-bindings-Document-qcom-saw2-node.patch @@ -14,9 +14,6 @@ Signed-off-by: Kumar Gala <galak@codeaurora.org> 1 file changed, 35 insertions(+) create mode 100644 Documentation/devicetree/bindings/arm/msm/qcom,saw2.txt -diff --git a/Documentation/devicetree/bindings/arm/msm/qcom,saw2.txt b/Documentation/devicetree/bindings/arm/msm/qcom,saw2.txt -new file mode 100644 -index 0000000..1505fb8 --- /dev/null +++ b/Documentation/devicetree/bindings/arm/msm/qcom,saw2.txt @@ -0,0 +1,35 @@ @@ -55,6 +52,3 @@ index 0000000..1505fb8 + compatible = "qcom,saw2"; + reg = <0x02099000 0x1000>, <0x02009000 0x1000>; + }; --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0013-ARM-qcom-Add-SMP-support-for-KPSSv1.patch b/target/linux/ipq806x/patches/0013-ARM-qcom-Add-SMP-support-for-KPSSv1.patch index 66f667c2a8..e1d9ae1ac6 100644 --- a/target/linux/ipq806x/patches/0013-ARM-qcom-Add-SMP-support-for-KPSSv1.patch +++ b/target/linux/ipq806x/patches/0013-ARM-qcom-Add-SMP-support-for-KPSSv1.patch @@ -15,8 +15,6 @@ Signed-off-by: Kumar Gala <galak@codeaurora.org> arch/arm/mach-qcom/scm-boot.h | 8 ++-- 2 files changed, 111 insertions(+), 3 deletions(-) -diff --git a/arch/arm/mach-qcom/platsmp.c b/arch/arm/mach-qcom/platsmp.c -index ec8604d..cb0783f 100644 --- a/arch/arm/mach-qcom/platsmp.c +++ b/arch/arm/mach-qcom/platsmp.c @@ -26,6 +26,16 @@ @@ -36,7 +34,7 @@ index ec8604d..cb0783f 100644 extern void secondary_startup(void); static DEFINE_SPINLOCK(boot_lock); -@@ -71,6 +81,85 @@ static int scss_release_secondary(unsigned int cpu) +@@ -71,6 +81,85 @@ static int scss_release_secondary(unsign return 0; } @@ -122,7 +120,7 @@ index ec8604d..cb0783f 100644 static DEFINE_PER_CPU(int, cold_boot_done); static int qcom_boot_secondary(unsigned int cpu, int (*func)(unsigned int)) -@@ -110,6 +199,11 @@ static int msm8660_boot_secondary(unsigned int cpu, struct task_struct *idle) +@@ -110,6 +199,11 @@ static int msm8660_boot_secondary(unsign return qcom_boot_secondary(cpu, scss_release_secondary); } @@ -134,7 +132,7 @@ index ec8604d..cb0783f 100644 static void __init qcom_smp_prepare_cpus(unsigned int max_cpus) { int cpu, map; -@@ -117,6 +211,8 @@ static void __init qcom_smp_prepare_cpus(unsigned int max_cpus) +@@ -117,6 +211,8 @@ static void __init qcom_smp_prepare_cpus static const int cold_boot_flags[] = { 0, SCM_FLAG_COLDBOOT_CPU1, @@ -143,7 +141,7 @@ index ec8604d..cb0783f 100644 }; for_each_present_cpu(cpu) { -@@ -147,3 +243,13 @@ static struct smp_operations smp_msm8660_ops __initdata = { +@@ -147,3 +243,13 @@ static struct smp_operations smp_msm8660 #endif }; CPU_METHOD_OF_DECLARE(qcom_smp, "qcom,gcc-msm8660", &smp_msm8660_ops); @@ -157,8 +155,6 @@ index ec8604d..cb0783f 100644 +#endif +}; +CPU_METHOD_OF_DECLARE(qcom_smp_kpssv1, "qcom,kpss-acc-v1", &qcom_smp_kpssv1_ops); -diff --git a/arch/arm/mach-qcom/scm-boot.h b/arch/arm/mach-qcom/scm-boot.h -index 7be32ff..6aabb24 100644 --- a/arch/arm/mach-qcom/scm-boot.h +++ b/arch/arm/mach-qcom/scm-boot.h @@ -13,9 +13,11 @@ @@ -176,6 +172,3 @@ index 7be32ff..6aabb24 100644 int scm_set_boot_addr(phys_addr_t addr, int flags); --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0014-ARM-qcom-Add-SMP-support-for-KPSSv2.patch b/target/linux/ipq806x/patches/0014-ARM-qcom-Add-SMP-support-for-KPSSv2.patch index 03fdaf3eef..8f8ae49304 100644 --- a/target/linux/ipq806x/patches/0014-ARM-qcom-Add-SMP-support-for-KPSSv2.patch +++ b/target/linux/ipq806x/patches/0014-ARM-qcom-Add-SMP-support-for-KPSSv2.patch @@ -14,8 +14,6 @@ Signed-off-by: Kumar Gala <galak@codeaurora.org> arch/arm/mach-qcom/platsmp.c | 123 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 123 insertions(+) -diff --git a/arch/arm/mach-qcom/platsmp.c b/arch/arm/mach-qcom/platsmp.c -index cb0783f..d690856 100644 --- a/arch/arm/mach-qcom/platsmp.c +++ b/arch/arm/mach-qcom/platsmp.c @@ -34,7 +34,15 @@ @@ -141,7 +139,7 @@ index cb0783f..d690856 100644 static DEFINE_PER_CPU(int, cold_boot_done); static int qcom_boot_secondary(unsigned int cpu, int (*func)(unsigned int)) -@@ -204,6 +312,11 @@ static int kpssv1_boot_secondary(unsigned int cpu, struct task_struct *idle) +@@ -204,6 +312,11 @@ static int kpssv1_boot_secondary(unsigne return qcom_boot_secondary(cpu, kpssv1_release_secondary); } @@ -153,7 +151,7 @@ index cb0783f..d690856 100644 static void __init qcom_smp_prepare_cpus(unsigned int max_cpus) { int cpu, map; -@@ -253,3 +366,13 @@ static struct smp_operations qcom_smp_kpssv1_ops __initdata = { +@@ -253,3 +366,13 @@ static struct smp_operations qcom_smp_kp #endif }; CPU_METHOD_OF_DECLARE(qcom_smp_kpssv1, "qcom,kpss-acc-v1", &qcom_smp_kpssv1_ops); @@ -167,6 +165,3 @@ index cb0783f..d690856 100644 +#endif +}; +CPU_METHOD_OF_DECLARE(qcom_smp_kpssv2, "qcom,kpss-acc-v2", &qcom_smp_kpssv2_ops); --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0015-tty-serial-msm-Enable-building-msm_serial-for-ARCH_Q.patch b/target/linux/ipq806x/patches/0015-tty-serial-msm-Enable-building-msm_serial-for-ARCH_Q.patch index 9dbc06dc26..33870dc8fa 100644 --- a/target/linux/ipq806x/patches/0015-tty-serial-msm-Enable-building-msm_serial-for-ARCH_Q.patch +++ b/target/linux/ipq806x/patches/0015-tty-serial-msm-Enable-building-msm_serial-for-ARCH_Q.patch @@ -14,8 +14,6 @@ Signed-off-by: Kumar Gala <galak@codeaurora.org> drivers/tty/serial/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig -index a3815ea..ce9b12d 100644 --- a/drivers/tty/serial/Kconfig +++ b/drivers/tty/serial/Kconfig @@ -1024,7 +1024,7 @@ config SERIAL_SGI_IOC3 @@ -27,6 +25,3 @@ index a3815ea..ce9b12d 100644 select SERIAL_CORE config SERIAL_MSM_CONSOLE --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0016-drm-msm-drop-ARCH_MSM-Kconfig-depend.patch b/target/linux/ipq806x/patches/0016-drm-msm-drop-ARCH_MSM-Kconfig-depend.patch index 46e1fb79a2..b80ad910f8 100644 --- a/target/linux/ipq806x/patches/0016-drm-msm-drop-ARCH_MSM-Kconfig-depend.patch +++ b/target/linux/ipq806x/patches/0016-drm-msm-drop-ARCH_MSM-Kconfig-depend.patch @@ -15,8 +15,6 @@ Signed-off-by: Kumar Gala <galak@codeaurora.org> drivers/gpu/drm/msm/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/drivers/gpu/drm/msm/Kconfig b/drivers/gpu/drm/msm/Kconfig -index c69d1e0..b698497 100644 --- a/drivers/gpu/drm/msm/Kconfig +++ b/drivers/gpu/drm/msm/Kconfig @@ -3,7 +3,7 @@ config DRM_MSM @@ -28,6 +26,3 @@ index c69d1e0..b698497 100644 select DRM_KMS_HELPER select SHMEM select TMPFS --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0017-power-reset-msm-switch-Kconfig-to-ARCH_QCOM-depends.patch b/target/linux/ipq806x/patches/0017-power-reset-msm-switch-Kconfig-to-ARCH_QCOM-depends.patch index 868146c40f..cf33efd9c3 100644 --- a/target/linux/ipq806x/patches/0017-power-reset-msm-switch-Kconfig-to-ARCH_QCOM-depends.patch +++ b/target/linux/ipq806x/patches/0017-power-reset-msm-switch-Kconfig-to-ARCH_QCOM-depends.patch @@ -14,8 +14,6 @@ Signed-off-by: Kumar Gala <galak@codeaurora.org> drivers/power/reset/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/drivers/power/reset/Kconfig b/drivers/power/reset/Kconfig -index 6d452a7..fa0e4e0 100644 --- a/drivers/power/reset/Kconfig +++ b/drivers/power/reset/Kconfig @@ -22,7 +22,7 @@ config POWER_RESET_GPIO @@ -27,6 +25,3 @@ index 6d452a7..fa0e4e0 100644 help Power off and restart support for Qualcomm boards. --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0018-hwrng-msm-switch-Kconfig-to-ARCH_QCOM-depends.patch b/target/linux/ipq806x/patches/0018-hwrng-msm-switch-Kconfig-to-ARCH_QCOM-depends.patch index b375feca2c..89cb8acd6d 100644 --- a/target/linux/ipq806x/patches/0018-hwrng-msm-switch-Kconfig-to-ARCH_QCOM-depends.patch +++ b/target/linux/ipq806x/patches/0018-hwrng-msm-switch-Kconfig-to-ARCH_QCOM-depends.patch @@ -14,8 +14,6 @@ Signed-off-by: Kumar Gala <galak@codeaurora.org> drivers/char/hw_random/Kconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -diff --git a/drivers/char/hw_random/Kconfig b/drivers/char/hw_random/Kconfig -index 2f2b084..244759b 100644 --- a/drivers/char/hw_random/Kconfig +++ b/drivers/char/hw_random/Kconfig @@ -342,11 +342,11 @@ config HW_RANDOM_TPM @@ -33,6 +31,3 @@ index 2f2b084..244759b 100644 To compile this driver as a module, choose M here. the module will be called msm-rng. --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0019-gpio-msm-switch-Kconfig-to-ARCH_QCOM-depends.patch b/target/linux/ipq806x/patches/0019-gpio-msm-switch-Kconfig-to-ARCH_QCOM-depends.patch index 210f760b22..1ead84bb4b 100644 --- a/target/linux/ipq806x/patches/0019-gpio-msm-switch-Kconfig-to-ARCH_QCOM-depends.patch +++ b/target/linux/ipq806x/patches/0019-gpio-msm-switch-Kconfig-to-ARCH_QCOM-depends.patch @@ -14,8 +14,6 @@ Signed-off-by: Kumar Gala <galak@codeaurora.org> drivers/gpio/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig -index 903f24d..2c38d95 100644 --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig @@ -192,7 +192,7 @@ config GPIO_MSM_V1 @@ -27,6 +25,3 @@ index 903f24d..2c38d95 100644 help Say yes here to support the GPIO interface on ARM v7 based Qualcomm MSM chips. Most of the pins on the MSM can be --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0020-ARM-qcom-Enable-basic-support-for-Qualcomm-platforms.patch b/target/linux/ipq806x/patches/0020-ARM-qcom-Enable-basic-support-for-Qualcomm-platforms.patch index ba25b46e32..7c1cb29c53 100644 --- a/target/linux/ipq806x/patches/0020-ARM-qcom-Enable-basic-support-for-Qualcomm-platforms.patch +++ b/target/linux/ipq806x/patches/0020-ARM-qcom-Enable-basic-support-for-Qualcomm-platforms.patch @@ -14,8 +14,6 @@ Signed-off-by: Kevin Hilman <khilman@linaro.org> arch/arm/configs/multi_v7_defconfig | 10 ++++++++++ 1 file changed, 10 insertions(+) -diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig -index ee69829..1a61bd8 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -31,6 +31,10 @@ CONFIG_SOC_OMAP5=y @@ -49,6 +47,3 @@ index ee69829..1a61bd8 100644 CONFIG_TEGRA_IOMMU_GART=y CONFIG_TEGRA_IOMMU_SMMU=y CONFIG_MEMORY=y --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0021-ARM-dts-qcom-Add-nodes-necessary-for-SMP-boot.patch b/target/linux/ipq806x/patches/0021-ARM-dts-qcom-Add-nodes-necessary-for-SMP-boot.patch index b23ee3b154..232f2efed9 100644 --- a/target/linux/ipq806x/patches/0021-ARM-dts-qcom-Add-nodes-necessary-for-SMP-boot.patch +++ b/target/linux/ipq806x/patches/0021-ARM-dts-qcom-Add-nodes-necessary-for-SMP-boot.patch @@ -17,8 +17,6 @@ Signed-off-by: Kumar Gala <galak@codeaurora.org> arch/arm/boot/dts/qcom-msm8974.dtsi | 69 +++++++++++++++++++++++++++++++++++ 3 files changed, 145 insertions(+) -diff --git a/arch/arm/boot/dts/qcom-msm8660.dtsi b/arch/arm/boot/dts/qcom-msm8660.dtsi -index 69d6c4e..c52a9e9 100644 --- a/arch/arm/boot/dts/qcom-msm8660.dtsi +++ b/arch/arm/boot/dts/qcom-msm8660.dtsi @@ -9,6 +9,30 @@ @@ -52,8 +50,6 @@ index 69d6c4e..c52a9e9 100644 intc: interrupt-controller@2080000 { compatible = "qcom,msm-8660-qgic"; interrupt-controller; -diff --git a/arch/arm/boot/dts/qcom-msm8960.dtsi b/arch/arm/boot/dts/qcom-msm8960.dtsi -index ff00282..02231a5 100644 --- a/arch/arm/boot/dts/qcom-msm8960.dtsi +++ b/arch/arm/boot/dts/qcom-msm8960.dtsi @@ -9,6 +9,36 @@ @@ -122,8 +118,6 @@ index ff00282..02231a5 100644 serial@16440000 { compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm"; reg = <0x16440000 0x1000>, -diff --git a/arch/arm/boot/dts/qcom-msm8974.dtsi b/arch/arm/boot/dts/qcom-msm8974.dtsi -index 9e5dadb..39eebc5 100644 --- a/arch/arm/boot/dts/qcom-msm8974.dtsi +++ b/arch/arm/boot/dts/qcom-msm8974.dtsi @@ -9,6 +9,49 @@ @@ -209,6 +203,3 @@ index 9e5dadb..39eebc5 100644 restart@fc4ab000 { compatible = "qcom,pshold"; reg = <0xfc4ab000 0x4>; --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0022-ARM-dts-qcom-Add-RNG-device-tree-node.patch b/target/linux/ipq806x/patches/0022-ARM-dts-qcom-Add-RNG-device-tree-node.patch index 23edfe7c55..76cff028ab 100644 --- a/target/linux/ipq806x/patches/0022-ARM-dts-qcom-Add-RNG-device-tree-node.patch +++ b/target/linux/ipq806x/patches/0022-ARM-dts-qcom-Add-RNG-device-tree-node.patch @@ -13,8 +13,6 @@ Signed-off-by: Kumar Gala <galak@codeaurora.org> arch/arm/boot/dts/qcom-msm8974.dtsi | 7 +++++++ 1 file changed, 7 insertions(+) -diff --git a/arch/arm/boot/dts/qcom-msm8974.dtsi b/arch/arm/boot/dts/qcom-msm8974.dtsi -index 39eebc5..011eb09 100644 --- a/arch/arm/boot/dts/qcom-msm8974.dtsi +++ b/arch/arm/boot/dts/qcom-msm8974.dtsi @@ -186,5 +186,12 @@ @@ -30,6 +28,3 @@ index 39eebc5..011eb09 100644 + }; }; }; --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0023-ARM-dts-qcom-msm8960-cdp-Add-RNG-device-tree-node.patch b/target/linux/ipq806x/patches/0023-ARM-dts-qcom-msm8960-cdp-Add-RNG-device-tree-node.patch index a3e69f3dc6..36206d4c4b 100644 --- a/target/linux/ipq806x/patches/0023-ARM-dts-qcom-msm8960-cdp-Add-RNG-device-tree-node.patch +++ b/target/linux/ipq806x/patches/0023-ARM-dts-qcom-msm8960-cdp-Add-RNG-device-tree-node.patch @@ -13,8 +13,6 @@ Signed-off-by: Kumar Gala <galak@codeaurora.org> arch/arm/boot/dts/qcom-msm8960.dtsi | 7 +++++++ 1 file changed, 7 insertions(+) -diff --git a/arch/arm/boot/dts/qcom-msm8960.dtsi b/arch/arm/boot/dts/qcom-msm8960.dtsi -index 02231a5..ecfba72 100644 --- a/arch/arm/boot/dts/qcom-msm8960.dtsi +++ b/arch/arm/boot/dts/qcom-msm8960.dtsi @@ -119,4 +119,11 @@ @@ -29,6 +27,3 @@ index 02231a5..ecfba72 100644 + clock-names = "core"; + }; }; --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0024-ARM-dts-msm-Add-krait-pmu-to-platforms-with-Krait-CP.patch b/target/linux/ipq806x/patches/0024-ARM-dts-msm-Add-krait-pmu-to-platforms-with-Krait-CP.patch index 013d45cc41..b0cefc2153 100644 --- a/target/linux/ipq806x/patches/0024-ARM-dts-msm-Add-krait-pmu-to-platforms-with-Krait-CP.patch +++ b/target/linux/ipq806x/patches/0024-ARM-dts-msm-Add-krait-pmu-to-platforms-with-Krait-CP.patch @@ -15,8 +15,6 @@ Signed-off-by: Olof Johansson <olof@lixom.net> arch/arm/boot/dts/qcom-msm8974.dtsi | 5 +++++ 2 files changed, 11 insertions(+) -diff --git a/arch/arm/boot/dts/qcom-msm8960.dtsi b/arch/arm/boot/dts/qcom-msm8960.dtsi -index ecfba72..997b7b9 100644 --- a/arch/arm/boot/dts/qcom-msm8960.dtsi +++ b/arch/arm/boot/dts/qcom-msm8960.dtsi @@ -39,6 +39,12 @@ @@ -32,8 +30,6 @@ index ecfba72..997b7b9 100644 intc: interrupt-controller@2000000 { compatible = "qcom,msm-qgic2"; interrupt-controller; -diff --git a/arch/arm/boot/dts/qcom-msm8974.dtsi b/arch/arm/boot/dts/qcom-msm8974.dtsi -index 011eb09..f687239 100644 --- a/arch/arm/boot/dts/qcom-msm8974.dtsi +++ b/arch/arm/boot/dts/qcom-msm8974.dtsi @@ -52,6 +52,11 @@ @@ -48,6 +44,3 @@ index 011eb09..f687239 100644 soc: soc { #address-cells = <1>; #size-cells = <1>; --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0025-pinctrl-msm-drop-wake_irqs-bitmap.patch b/target/linux/ipq806x/patches/0025-pinctrl-msm-drop-wake_irqs-bitmap.patch index fba5e4f9e3..d0771ff27e 100644 --- a/target/linux/ipq806x/patches/0025-pinctrl-msm-drop-wake_irqs-bitmap.patch +++ b/target/linux/ipq806x/patches/0025-pinctrl-msm-drop-wake_irqs-bitmap.patch @@ -22,8 +22,6 @@ Signed-off-by: Linus Walleij <linus.walleij@linaro.org> drivers/pinctrl/pinctrl-msm.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) -diff --git a/drivers/pinctrl/pinctrl-msm.c b/drivers/pinctrl/pinctrl-msm.c -index ef2bf31..0e43fdd 100644 --- a/drivers/pinctrl/pinctrl-msm.c +++ b/drivers/pinctrl/pinctrl-msm.c @@ -50,7 +50,6 @@ @@ -42,7 +40,7 @@ index ef2bf31..0e43fdd 100644 const struct msm_pinctrl_soc_data *soc; void __iomem *regs; -@@ -783,22 +781,12 @@ static int msm_gpio_irq_set_wake(struct irq_data *d, unsigned int on) +@@ -783,22 +781,12 @@ static int msm_gpio_irq_set_wake(struct { struct msm_pinctrl *pctrl; unsigned long flags; @@ -66,6 +64,3 @@ index ef2bf31..0e43fdd 100644 spin_unlock_irqrestore(&pctrl->lock, flags); --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0026-pinctrl-msm-Silence-recursive-lockdep-warning.patch b/target/linux/ipq806x/patches/0026-pinctrl-msm-Silence-recursive-lockdep-warning.patch index fd2e10fb0f..fe5008e51a 100644 --- a/target/linux/ipq806x/patches/0026-pinctrl-msm-Silence-recursive-lockdep-warning.patch +++ b/target/linux/ipq806x/patches/0026-pinctrl-msm-Silence-recursive-lockdep-warning.patch @@ -43,11 +43,9 @@ Signed-off-by: Linus Walleij <linus.walleij@linaro.org> drivers/pinctrl/pinctrl-msm.c | 7 +++++++ 1 file changed, 7 insertions(+) -diff --git a/drivers/pinctrl/pinctrl-msm.c b/drivers/pinctrl/pinctrl-msm.c -index 0e43fdd..e61b30a 100644 --- a/drivers/pinctrl/pinctrl-msm.c +++ b/drivers/pinctrl/pinctrl-msm.c -@@ -857,6 +857,12 @@ static void msm_gpio_irq_handler(unsigned int irq, struct irq_desc *desc) +@@ -857,6 +857,12 @@ static void msm_gpio_irq_handler(unsigne chained_irq_exit(chip, desc); } @@ -60,7 +58,7 @@ index 0e43fdd..e61b30a 100644 static int msm_gpio_init(struct msm_pinctrl *pctrl) { struct gpio_chip *chip; -@@ -895,6 +901,7 @@ static int msm_gpio_init(struct msm_pinctrl *pctrl) +@@ -895,6 +901,7 @@ static int msm_gpio_init(struct msm_pinc for (i = 0; i < chip->ngpio; i++) { irq = irq_create_mapping(pctrl->domain, i); @@ -68,6 +66,3 @@ index 0e43fdd..e61b30a 100644 irq_set_chip_and_handler(irq, &msm_gpio_irq_chip, handle_edge_irq); irq_set_chip_data(irq, pctrl); } --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0027-pinctrl-msm-Check-for-ngpios-MAX_NR_GPIO.patch b/target/linux/ipq806x/patches/0027-pinctrl-msm-Check-for-ngpios-MAX_NR_GPIO.patch index c2b7487540..7cf4b14164 100644 --- a/target/linux/ipq806x/patches/0027-pinctrl-msm-Check-for-ngpios-MAX_NR_GPIO.patch +++ b/target/linux/ipq806x/patches/0027-pinctrl-msm-Check-for-ngpios-MAX_NR_GPIO.patch @@ -14,11 +14,9 @@ Signed-off-by: Linus Walleij <linus.walleij@linaro.org> drivers/pinctrl/pinctrl-msm.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) -diff --git a/drivers/pinctrl/pinctrl-msm.c b/drivers/pinctrl/pinctrl-msm.c -index e61b30a..90ac995 100644 --- a/drivers/pinctrl/pinctrl-msm.c +++ b/drivers/pinctrl/pinctrl-msm.c -@@ -870,10 +870,14 @@ static int msm_gpio_init(struct msm_pinctrl *pctrl) +@@ -870,10 +870,14 @@ static int msm_gpio_init(struct msm_pinc int ret; int i; int r; @@ -34,6 +32,3 @@ index e61b30a..90ac995 100644 chip->label = dev_name(pctrl->dev); chip->dev = pctrl->dev; chip->owner = THIS_MODULE; --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0028-pinctrl-msm-Drop-unused-includes.patch b/target/linux/ipq806x/patches/0028-pinctrl-msm-Drop-unused-includes.patch index 8f864f2680..d8cd970ad3 100644 --- a/target/linux/ipq806x/patches/0028-pinctrl-msm-Drop-unused-includes.patch +++ b/target/linux/ipq806x/patches/0028-pinctrl-msm-Drop-unused-includes.patch @@ -15,8 +15,6 @@ Signed-off-by: Linus Walleij <linus.walleij@linaro.org> drivers/pinctrl/pinctrl-msm8x74.c | 1 - 3 files changed, 1 insertion(+), 6 deletions(-) -diff --git a/drivers/pinctrl/pinctrl-msm.c b/drivers/pinctrl/pinctrl-msm.c -index 90ac995..4474e00 100644 --- a/drivers/pinctrl/pinctrl-msm.c +++ b/drivers/pinctrl/pinctrl-msm.c @@ -28,7 +28,6 @@ @@ -27,8 +25,6 @@ index 90ac995..4474e00 100644 #include <linux/spinlock.h> #include "core.h" -diff --git a/drivers/pinctrl/pinctrl-msm.h b/drivers/pinctrl/pinctrl-msm.h -index 206e782..8fbe9fb 100644 --- a/drivers/pinctrl/pinctrl-msm.h +++ b/drivers/pinctrl/pinctrl-msm.h @@ -13,10 +13,7 @@ @@ -43,8 +39,6 @@ index 206e782..8fbe9fb 100644 /** * struct msm_function - a pinmux function -diff --git a/drivers/pinctrl/pinctrl-msm8x74.c b/drivers/pinctrl/pinctrl-msm8x74.c -index f944bf2..bb5ded69f 100644 --- a/drivers/pinctrl/pinctrl-msm8x74.c +++ b/drivers/pinctrl/pinctrl-msm8x74.c @@ -15,7 +15,6 @@ @@ -55,6 +49,3 @@ index f944bf2..bb5ded69f 100644 #include "pinctrl-msm.h" --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0029-pinctrl-msm-Drop-OF_IRQ-dependency.patch b/target/linux/ipq806x/patches/0029-pinctrl-msm-Drop-OF_IRQ-dependency.patch index 6a33a9d97c..1357f3bb6c 100644 --- a/target/linux/ipq806x/patches/0029-pinctrl-msm-Drop-OF_IRQ-dependency.patch +++ b/target/linux/ipq806x/patches/0029-pinctrl-msm-Drop-OF_IRQ-dependency.patch @@ -13,8 +13,6 @@ Signed-off-by: Linus Walleij <linus.walleij@linaro.org> drivers/pinctrl/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig -index 1e4e693..06cee01 100644 --- a/drivers/pinctrl/Kconfig +++ b/drivers/pinctrl/Kconfig @@ -224,7 +224,7 @@ config PINCTRL_MSM @@ -26,6 +24,3 @@ index 1e4e693..06cee01 100644 select PINCTRL_MSM help This is the pinctrl, pinmux, pinconf and gpiolib driver for the --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0030-pinctrl-msm-Replace-lookup-tables-with-math.patch b/target/linux/ipq806x/patches/0030-pinctrl-msm-Replace-lookup-tables-with-math.patch index 975e11a052..6bc94affdb 100644 --- a/target/linux/ipq806x/patches/0030-pinctrl-msm-Replace-lookup-tables-with-math.patch +++ b/target/linux/ipq806x/patches/0030-pinctrl-msm-Replace-lookup-tables-with-math.patch @@ -13,11 +13,9 @@ Signed-off-by: Linus Walleij <linus.walleij@linaro.org> drivers/pinctrl/pinctrl-msm.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) -diff --git a/drivers/pinctrl/pinctrl-msm.c b/drivers/pinctrl/pinctrl-msm.c -index 4474e00..87f6c3c 100644 --- a/drivers/pinctrl/pinctrl-msm.c +++ b/drivers/pinctrl/pinctrl-msm.c -@@ -258,8 +258,10 @@ static int msm_config_set(struct pinctrl_dev *pctldev, unsigned int pin, +@@ -258,8 +258,10 @@ static int msm_config_set(struct pinctrl #define MSM_PULL_DOWN 1 #define MSM_PULL_UP 3 @@ -30,7 +28,7 @@ index 4474e00..87f6c3c 100644 static int msm_config_group_get(struct pinctrl_dev *pctldev, unsigned int group, -@@ -296,7 +298,7 @@ static int msm_config_group_get(struct pinctrl_dev *pctldev, +@@ -296,7 +298,7 @@ static int msm_config_group_get(struct p arg = arg == MSM_PULL_UP; break; case PIN_CONFIG_DRIVE_STRENGTH: @@ -39,7 +37,7 @@ index 4474e00..87f6c3c 100644 break; default: dev_err(pctrl->dev, "Unsupported config parameter: %x\n", -@@ -349,10 +351,10 @@ static int msm_config_group_set(struct pinctrl_dev *pctldev, +@@ -349,10 +351,10 @@ static int msm_config_group_set(struct p break; case PIN_CONFIG_DRIVE_STRENGTH: /* Check for invalid values */ @@ -52,7 +50,7 @@ index 4474e00..87f6c3c 100644 break; default: dev_err(pctrl->dev, "Unsupported config parameter: %x\n", -@@ -531,7 +533,7 @@ static void msm_gpio_dbg_show_one(struct seq_file *s, +@@ -531,7 +533,7 @@ static void msm_gpio_dbg_show_one(struct pull = (ctl_reg >> g->pull_bit) & 3; seq_printf(s, " %-8s: %-3s %d", g->name, is_out ? "out" : "in", func); @@ -61,6 +59,3 @@ index 4474e00..87f6c3c 100644 seq_printf(s, " %s", pulls[pull]); } --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0031-pinctrl-msm-Remove-impossible-WARN_ON-s.patch b/target/linux/ipq806x/patches/0031-pinctrl-msm-Remove-impossible-WARN_ON-s.patch index 61c8ac1b2a..3356efcfea 100644 --- a/target/linux/ipq806x/patches/0031-pinctrl-msm-Remove-impossible-WARN_ON-s.patch +++ b/target/linux/ipq806x/patches/0031-pinctrl-msm-Remove-impossible-WARN_ON-s.patch @@ -14,11 +14,9 @@ Signed-off-by: Linus Walleij <linus.walleij@linaro.org> drivers/pinctrl/pinctrl-msm.c | 16 ---------------- 1 file changed, 16 deletions(-) -diff --git a/drivers/pinctrl/pinctrl-msm.c b/drivers/pinctrl/pinctrl-msm.c -index 87f6c3c..ab46e3a 100644 --- a/drivers/pinctrl/pinctrl-msm.c +++ b/drivers/pinctrl/pinctrl-msm.c -@@ -401,8 +401,6 @@ static int msm_gpio_direction_input(struct gpio_chip *chip, unsigned offset) +@@ -401,8 +401,6 @@ static int msm_gpio_direction_input(stru u32 val; g = &pctrl->soc->groups[offset]; @@ -27,7 +25,7 @@ index 87f6c3c..ab46e3a 100644 spin_lock_irqsave(&pctrl->lock, flags); -@@ -423,8 +421,6 @@ static int msm_gpio_direction_output(struct gpio_chip *chip, unsigned offset, in +@@ -423,8 +421,6 @@ static int msm_gpio_direction_output(str u32 val; g = &pctrl->soc->groups[offset]; @@ -36,7 +34,7 @@ index 87f6c3c..ab46e3a 100644 spin_lock_irqsave(&pctrl->lock, flags); -@@ -451,8 +447,6 @@ static int msm_gpio_get(struct gpio_chip *chip, unsigned offset) +@@ -451,8 +447,6 @@ static int msm_gpio_get(struct gpio_chip u32 val; g = &pctrl->soc->groups[offset]; @@ -45,7 +43,7 @@ index 87f6c3c..ab46e3a 100644 val = readl(pctrl->regs + g->io_reg); return !!(val & BIT(g->in_bit)); -@@ -466,8 +460,6 @@ static void msm_gpio_set(struct gpio_chip *chip, unsigned offset, int value) +@@ -466,8 +460,6 @@ static void msm_gpio_set(struct gpio_chi u32 val; g = &pctrl->soc->groups[offset]; @@ -54,7 +52,7 @@ index 87f6c3c..ab46e3a 100644 spin_lock_irqsave(&pctrl->lock, flags); -@@ -616,8 +608,6 @@ static void msm_gpio_irq_mask(struct irq_data *d) +@@ -616,8 +608,6 @@ static void msm_gpio_irq_mask(struct irq pctrl = irq_data_get_irq_chip_data(d); g = &pctrl->soc->groups[d->hwirq]; @@ -63,7 +61,7 @@ index 87f6c3c..ab46e3a 100644 spin_lock_irqsave(&pctrl->lock, flags); -@@ -639,8 +629,6 @@ static void msm_gpio_irq_unmask(struct irq_data *d) +@@ -639,8 +629,6 @@ static void msm_gpio_irq_unmask(struct i pctrl = irq_data_get_irq_chip_data(d); g = &pctrl->soc->groups[d->hwirq]; @@ -72,7 +70,7 @@ index 87f6c3c..ab46e3a 100644 spin_lock_irqsave(&pctrl->lock, flags); -@@ -666,8 +654,6 @@ static void msm_gpio_irq_ack(struct irq_data *d) +@@ -666,8 +654,6 @@ static void msm_gpio_irq_ack(struct irq_ pctrl = irq_data_get_irq_chip_data(d); g = &pctrl->soc->groups[d->hwirq]; @@ -81,7 +79,7 @@ index 87f6c3c..ab46e3a 100644 spin_lock_irqsave(&pctrl->lock, flags); -@@ -692,8 +678,6 @@ static int msm_gpio_irq_set_type(struct irq_data *d, unsigned int type) +@@ -692,8 +678,6 @@ static int msm_gpio_irq_set_type(struct pctrl = irq_data_get_irq_chip_data(d); g = &pctrl->soc->groups[d->hwirq]; @@ -90,6 +88,3 @@ index 87f6c3c..ab46e3a 100644 spin_lock_irqsave(&pctrl->lock, flags); --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0032-pinctrl-msm-Simplify-msm_config_reg-and-callers.patch b/target/linux/ipq806x/patches/0032-pinctrl-msm-Simplify-msm_config_reg-and-callers.patch index d656978236..f7798ae42e 100644 --- a/target/linux/ipq806x/patches/0032-pinctrl-msm-Simplify-msm_config_reg-and-callers.patch +++ b/target/linux/ipq806x/patches/0032-pinctrl-msm-Simplify-msm_config_reg-and-callers.patch @@ -14,11 +14,9 @@ Signed-off-by: Linus Walleij <linus.walleij@linaro.org> drivers/pinctrl/pinctrl-msm.c | 29 +++++------------------------ 1 file changed, 5 insertions(+), 24 deletions(-) -diff --git a/drivers/pinctrl/pinctrl-msm.c b/drivers/pinctrl/pinctrl-msm.c -index ab46e3a..91de8bc 100644 --- a/drivers/pinctrl/pinctrl-msm.c +++ b/drivers/pinctrl/pinctrl-msm.c -@@ -200,28 +200,17 @@ static const struct pinmux_ops msm_pinmux_ops = { +@@ -200,28 +200,17 @@ static const struct pinmux_ops msm_pinmu static int msm_config_reg(struct msm_pinctrl *pctrl, const struct msm_pingroup *g, unsigned param, @@ -47,7 +45,7 @@ index ab46e3a..91de8bc 100644 *bit = g->drv_bit; *mask = 7; break; -@@ -230,12 +219,6 @@ static int msm_config_reg(struct msm_pinctrl *pctrl, +@@ -230,12 +219,6 @@ static int msm_config_reg(struct msm_pin return -ENOTSUPP; } @@ -60,7 +58,7 @@ index ab46e3a..91de8bc 100644 return 0; } -@@ -273,17 +256,16 @@ static int msm_config_group_get(struct pinctrl_dev *pctldev, +@@ -273,17 +256,16 @@ static int msm_config_group_get(struct p unsigned mask; unsigned arg; unsigned bit; @@ -80,7 +78,7 @@ index ab46e3a..91de8bc 100644 arg = (val >> bit) & mask; /* Convert register value to pinconf value */ -@@ -323,7 +305,6 @@ static int msm_config_group_set(struct pinctrl_dev *pctldev, +@@ -323,7 +305,6 @@ static int msm_config_group_set(struct p unsigned mask; unsigned arg; unsigned bit; @@ -88,7 +86,7 @@ index ab46e3a..91de8bc 100644 int ret; u32 val; int i; -@@ -334,7 +315,7 @@ static int msm_config_group_set(struct pinctrl_dev *pctldev, +@@ -334,7 +315,7 @@ static int msm_config_group_set(struct p param = pinconf_to_config_param(configs[i]); arg = pinconf_to_config_argument(configs[i]); @@ -97,7 +95,7 @@ index ab46e3a..91de8bc 100644 if (ret < 0) return ret; -@@ -369,10 +350,10 @@ static int msm_config_group_set(struct pinctrl_dev *pctldev, +@@ -369,10 +350,10 @@ static int msm_config_group_set(struct p } spin_lock_irqsave(&pctrl->lock, flags); @@ -110,6 +108,3 @@ index ab46e3a..91de8bc 100644 spin_unlock_irqrestore(&pctrl->lock, flags); } --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0033-pinctrl-msm-Support-output-high-low-configuration.patch b/target/linux/ipq806x/patches/0033-pinctrl-msm-Support-output-high-low-configuration.patch index 18c72cc4be..f2f7c7d3b0 100644 --- a/target/linux/ipq806x/patches/0033-pinctrl-msm-Support-output-high-low-configuration.patch +++ b/target/linux/ipq806x/patches/0033-pinctrl-msm-Support-output-high-low-configuration.patch @@ -12,11 +12,9 @@ Signed-off-by: Linus Walleij <linus.walleij@linaro.org> drivers/pinctrl/pinctrl-msm.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) -diff --git a/drivers/pinctrl/pinctrl-msm.c b/drivers/pinctrl/pinctrl-msm.c -index 91de8bc..19d2feb 100644 --- a/drivers/pinctrl/pinctrl-msm.c +++ b/drivers/pinctrl/pinctrl-msm.c -@@ -214,6 +214,11 @@ static int msm_config_reg(struct msm_pinctrl *pctrl, +@@ -214,6 +214,11 @@ static int msm_config_reg(struct msm_pin *bit = g->drv_bit; *mask = 7; break; @@ -28,7 +26,7 @@ index 91de8bc..19d2feb 100644 default: dev_err(pctrl->dev, "Invalid config param %04x\n", param); return -ENOTSUPP; -@@ -282,6 +287,14 @@ static int msm_config_group_get(struct pinctrl_dev *pctldev, +@@ -282,6 +287,14 @@ static int msm_config_group_get(struct p case PIN_CONFIG_DRIVE_STRENGTH: arg = msm_regval_to_drive(arg); break; @@ -43,7 +41,7 @@ index 91de8bc..19d2feb 100644 default: dev_err(pctrl->dev, "Unsupported config parameter: %x\n", param); -@@ -337,6 +350,20 @@ static int msm_config_group_set(struct pinctrl_dev *pctldev, +@@ -337,6 +350,20 @@ static int msm_config_group_set(struct p else arg = (arg / 2) - 1; break; @@ -64,6 +62,3 @@ index 91de8bc..19d2feb 100644 default: dev_err(pctrl->dev, "Unsupported config parameter: %x\n", param); --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0034-pinctrl-msm-Add-SPI8-pin-definitions.patch b/target/linux/ipq806x/patches/0034-pinctrl-msm-Add-SPI8-pin-definitions.patch index b8df704ec0..a3f6d6a199 100644 --- a/target/linux/ipq806x/patches/0034-pinctrl-msm-Add-SPI8-pin-definitions.patch +++ b/target/linux/ipq806x/patches/0034-pinctrl-msm-Add-SPI8-pin-definitions.patch @@ -13,8 +13,6 @@ Signed-off-by: Linus Walleij <linus.walleij@linaro.org> drivers/pinctrl/pinctrl-msm8x74.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) -diff --git a/drivers/pinctrl/pinctrl-msm8x74.c b/drivers/pinctrl/pinctrl-msm8x74.c -index bb5ded69f..dde5529 100644 --- a/drivers/pinctrl/pinctrl-msm8x74.c +++ b/drivers/pinctrl/pinctrl-msm8x74.c @@ -405,6 +405,7 @@ enum msm8x74_functions { @@ -25,7 +23,7 @@ index bb5ded69f..dde5529 100644 MSM_MUX_blsp_uart2, MSM_MUX_blsp_uart8, MSM_MUX_slimbus, -@@ -415,6 +416,9 @@ static const char * const blsp_i2c2_groups[] = { "gpio6", "gpio7" }; +@@ -415,6 +416,9 @@ static const char * const blsp_i2c2_grou static const char * const blsp_i2c6_groups[] = { "gpio29", "gpio30" }; static const char * const blsp_i2c11_groups[] = { "gpio83", "gpio84" }; static const char * const blsp_spi1_groups[] = { "gpio0", "gpio1", "gpio2", "gpio3" }; @@ -35,7 +33,7 @@ index bb5ded69f..dde5529 100644 static const char * const blsp_uart2_groups[] = { "gpio4", "gpio5" }; static const char * const blsp_uart8_groups[] = { "gpio45", "gpio46" }; static const char * const slimbus_groups[] = { "gpio70", "gpio71" }; -@@ -424,6 +428,7 @@ static const struct msm_function msm8x74_functions[] = { +@@ -424,6 +428,7 @@ static const struct msm_function msm8x74 FUNCTION(blsp_i2c6), FUNCTION(blsp_i2c11), FUNCTION(blsp_spi1), @@ -43,7 +41,7 @@ index bb5ded69f..dde5529 100644 FUNCTION(blsp_uart2), FUNCTION(blsp_uart8), FUNCTION(slimbus), -@@ -475,10 +480,10 @@ static const struct msm_pingroup msm8x74_groups[] = { +@@ -475,10 +480,10 @@ static const struct msm_pingroup msm8x74 PINGROUP(42, NA, NA, NA, NA, NA, NA, NA), PINGROUP(43, NA, NA, NA, NA, NA, NA, NA), PINGROUP(44, NA, NA, NA, NA, NA, NA, NA), @@ -58,6 +56,3 @@ index bb5ded69f..dde5529 100644 PINGROUP(49, NA, NA, NA, NA, NA, NA, NA), PINGROUP(50, NA, NA, NA, NA, NA, NA, NA), PINGROUP(51, NA, NA, NA, NA, NA, NA, NA), --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0035-pinctrl-msm-fix-up-out-of-order-merge-conflict.patch b/target/linux/ipq806x/patches/0035-pinctrl-msm-fix-up-out-of-order-merge-conflict.patch index c141a0b6c0..f0bd614cfd 100644 --- a/target/linux/ipq806x/patches/0035-pinctrl-msm-fix-up-out-of-order-merge-conflict.patch +++ b/target/linux/ipq806x/patches/0035-pinctrl-msm-fix-up-out-of-order-merge-conflict.patch @@ -21,11 +21,9 @@ Signed-off-by: Linus Walleij <linus.walleij@linaro.org> drivers/pinctrl/pinctrl-msm.c | 1 - 1 file changed, 1 deletion(-) -diff --git a/drivers/pinctrl/pinctrl-msm.c b/drivers/pinctrl/pinctrl-msm.c -index 19d2feb..343f421 100644 --- a/drivers/pinctrl/pinctrl-msm.c +++ b/drivers/pinctrl/pinctrl-msm.c -@@ -215,7 +215,6 @@ static int msm_config_reg(struct msm_pinctrl *pctrl, +@@ -215,7 +215,6 @@ static int msm_config_reg(struct msm_pin *mask = 7; break; case PIN_CONFIG_OUTPUT: @@ -33,6 +31,3 @@ index 19d2feb..343f421 100644 *bit = g->oe_bit; *mask = 1; break; --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0036-pinctrl-msm-Correct-interrupt-code-for-TLMM-v2.patch b/target/linux/ipq806x/patches/0036-pinctrl-msm-Correct-interrupt-code-for-TLMM-v2.patch index b44fb6a0b3..384e183eb8 100644 --- a/target/linux/ipq806x/patches/0036-pinctrl-msm-Correct-interrupt-code-for-TLMM-v2.patch +++ b/target/linux/ipq806x/patches/0036-pinctrl-msm-Correct-interrupt-code-for-TLMM-v2.patch @@ -14,11 +14,9 @@ Signed-off-by: Linus Walleij <linus.walleij@linaro.org> drivers/pinctrl/pinctrl-msm.h | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) -diff --git a/drivers/pinctrl/pinctrl-msm.c b/drivers/pinctrl/pinctrl-msm.c -index 343f421..706809e 100644 --- a/drivers/pinctrl/pinctrl-msm.c +++ b/drivers/pinctrl/pinctrl-msm.c -@@ -665,7 +665,10 @@ static void msm_gpio_irq_ack(struct irq_data *d) +@@ -665,7 +665,10 @@ static void msm_gpio_irq_ack(struct irq_ spin_lock_irqsave(&pctrl->lock, flags); val = readl(pctrl->regs + g->intr_status_reg); @@ -30,7 +28,7 @@ index 343f421..706809e 100644 writel(val, pctrl->regs + g->intr_status_reg); if (test_bit(d->hwirq, pctrl->dual_edge_irqs)) -@@ -744,6 +747,7 @@ static int msm_gpio_irq_set_type(struct irq_data *d, unsigned int type) +@@ -744,6 +747,7 @@ static int msm_gpio_irq_set_type(struct break; case IRQ_TYPE_EDGE_BOTH: val |= BIT(g->intr_detection_bit); @@ -38,8 +36,6 @@ index 343f421..706809e 100644 break; case IRQ_TYPE_LEVEL_LOW: break; -diff --git a/drivers/pinctrl/pinctrl-msm.h b/drivers/pinctrl/pinctrl-msm.h -index 8fbe9fb..6e26f1b 100644 --- a/drivers/pinctrl/pinctrl-msm.h +++ b/drivers/pinctrl/pinctrl-msm.h @@ -84,6 +84,7 @@ struct msm_pingroup { @@ -50,6 +46,3 @@ index 8fbe9fb..6e26f1b 100644 unsigned intr_target_bit:5; unsigned intr_raw_status_bit:5; --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0037-pinctrl-msm-Make-number-of-functions-variable.patch b/target/linux/ipq806x/patches/0037-pinctrl-msm-Make-number-of-functions-variable.patch index 346dcd0ac6..e36498b83d 100644 --- a/target/linux/ipq806x/patches/0037-pinctrl-msm-Make-number-of-functions-variable.patch +++ b/target/linux/ipq806x/patches/0037-pinctrl-msm-Make-number-of-functions-variable.patch @@ -15,11 +15,9 @@ Signed-off-by: Linus Walleij <linus.walleij@linaro.org> drivers/pinctrl/pinctrl-msm8x74.c | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) -diff --git a/drivers/pinctrl/pinctrl-msm.c b/drivers/pinctrl/pinctrl-msm.c -index 706809e..7d67d34 100644 --- a/drivers/pinctrl/pinctrl-msm.c +++ b/drivers/pinctrl/pinctrl-msm.c -@@ -145,12 +145,12 @@ static int msm_pinmux_enable(struct pinctrl_dev *pctldev, +@@ -145,12 +145,12 @@ static int msm_pinmux_enable(struct pinc if (WARN_ON(g->mux_bit < 0)) return -EINVAL; @@ -34,8 +32,6 @@ index 706809e..7d67d34 100644 return -EINVAL; spin_lock_irqsave(&pctrl->lock, flags); -diff --git a/drivers/pinctrl/pinctrl-msm.h b/drivers/pinctrl/pinctrl-msm.h -index 6e26f1b..7b2a227 100644 --- a/drivers/pinctrl/pinctrl-msm.h +++ b/drivers/pinctrl/pinctrl-msm.h @@ -65,7 +65,8 @@ struct msm_pingroup { @@ -48,11 +44,9 @@ index 6e26f1b..7b2a227 100644 s16 ctl_reg; s16 io_reg; -diff --git a/drivers/pinctrl/pinctrl-msm8x74.c b/drivers/pinctrl/pinctrl-msm8x74.c -index dde5529..57766d5 100644 --- a/drivers/pinctrl/pinctrl-msm8x74.c +++ b/drivers/pinctrl/pinctrl-msm8x74.c -@@ -341,7 +341,7 @@ static const unsigned int sdc2_data_pins[] = { 151 }; +@@ -341,7 +341,7 @@ static const unsigned int sdc2_data_pins .name = "gpio" #id, \ .pins = gpio##id##_pins, \ .npins = ARRAY_SIZE(gpio##id##_pins), \ @@ -61,7 +55,7 @@ index dde5529..57766d5 100644 MSM_MUX_NA, /* gpio mode */ \ MSM_MUX_##f1, \ MSM_MUX_##f2, \ -@@ -351,6 +351,7 @@ static const unsigned int sdc2_data_pins[] = { 151 }; +@@ -351,6 +351,7 @@ static const unsigned int sdc2_data_pins MSM_MUX_##f6, \ MSM_MUX_##f7 \ }, \ @@ -69,6 +63,3 @@ index dde5529..57766d5 100644 .ctl_reg = 0x1000 + 0x10 * id, \ .io_reg = 0x1004 + 0x10 * id, \ .intr_cfg_reg = 0x1008 + 0x10 * id, \ --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0038-pinctrl-msm-Add-definitions-for-the-APQ8064-platform.patch b/target/linux/ipq806x/patches/0038-pinctrl-msm-Add-definitions-for-the-APQ8064-platform.patch index 20e5a1dc83..a177d35285 100644 --- a/target/linux/ipq806x/patches/0038-pinctrl-msm-Add-definitions-for-the-APQ8064-platform.patch +++ b/target/linux/ipq806x/patches/0038-pinctrl-msm-Add-definitions-for-the-APQ8064-platform.patch @@ -16,8 +16,6 @@ Signed-off-by: Linus Walleij <linus.walleij@linaro.org> 3 files changed, 575 insertions(+) create mode 100644 drivers/pinctrl/pinctrl-apq8064.c -diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig -index 06cee01..91993a6 100644 --- a/drivers/pinctrl/Kconfig +++ b/drivers/pinctrl/Kconfig @@ -222,6 +222,14 @@ config PINCTRL_MSM @@ -35,11 +33,9 @@ index 06cee01..91993a6 100644 config PINCTRL_MSM8X74 tristate "Qualcomm 8x74 pin controller driver" depends on GPIOLIB && OF -diff --git a/drivers/pinctrl/Makefile b/drivers/pinctrl/Makefile -index 4b83588..9e1fb67 100644 --- a/drivers/pinctrl/Makefile +++ b/drivers/pinctrl/Makefile -@@ -38,6 +38,7 @@ obj-$(CONFIG_PINCTRL_IMX23) += pinctrl-imx23.o +@@ -38,6 +38,7 @@ obj-$(CONFIG_PINCTRL_IMX23) += pinctrl-i obj-$(CONFIG_PINCTRL_IMX25) += pinctrl-imx25.o obj-$(CONFIG_PINCTRL_IMX28) += pinctrl-imx28.o obj-$(CONFIG_PINCTRL_MSM) += pinctrl-msm.o @@ -47,9 +43,6 @@ index 4b83588..9e1fb67 100644 obj-$(CONFIG_PINCTRL_MSM8X74) += pinctrl-msm8x74.o obj-$(CONFIG_PINCTRL_NOMADIK) += pinctrl-nomadik.o obj-$(CONFIG_PINCTRL_STN8815) += pinctrl-nomadik-stn8815.o -diff --git a/drivers/pinctrl/pinctrl-apq8064.c b/drivers/pinctrl/pinctrl-apq8064.c -new file mode 100644 -index 0000000..7c2a8ba --- /dev/null +++ b/drivers/pinctrl/pinctrl-apq8064.c @@ -0,0 +1,566 @@ @@ -619,6 +612,3 @@ index 0000000..7c2a8ba +MODULE_DESCRIPTION("Qualcomm APQ8064 pinctrl driver"); +MODULE_LICENSE("GPL v2"); +MODULE_DEVICE_TABLE(of, apq8064_pinctrl_of_match); --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0039-pinctrl-msm8x74-make-Kconfig-dependency-more-strict.patch b/target/linux/ipq806x/patches/0039-pinctrl-msm8x74-make-Kconfig-dependency-more-strict.patch index 51ed6d645f..7c56af6537 100644 --- a/target/linux/ipq806x/patches/0039-pinctrl-msm8x74-make-Kconfig-dependency-more-strict.patch +++ b/target/linux/ipq806x/patches/0039-pinctrl-msm8x74-make-Kconfig-dependency-more-strict.patch @@ -18,8 +18,6 @@ Signed-off-by: Linus Walleij <linus.walleij@linaro.org> drivers/pinctrl/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig -index 91993a6..d34639d 100644 --- a/drivers/pinctrl/Kconfig +++ b/drivers/pinctrl/Kconfig @@ -232,7 +232,7 @@ config PINCTRL_APQ8064 @@ -31,6 +29,3 @@ index 91993a6..d34639d 100644 select PINCTRL_MSM help This is the pinctrl, pinmux, pinconf and gpiolib driver for the --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0040-pinctrl-qcom-Add-definitions-for-IPQ8064.patch b/target/linux/ipq806x/patches/0040-pinctrl-qcom-Add-definitions-for-IPQ8064.patch index 6b48085289..a54604a775 100644 --- a/target/linux/ipq806x/patches/0040-pinctrl-qcom-Add-definitions-for-IPQ8064.patch +++ b/target/linux/ipq806x/patches/0040-pinctrl-qcom-Add-definitions-for-IPQ8064.patch @@ -16,8 +16,6 @@ Signed-off-by: Linus Walleij <linus.walleij@linaro.org> 3 files changed, 662 insertions(+) create mode 100644 drivers/pinctrl/pinctrl-ipq8064.c -diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig -index d34639d..232e6bc 100644 --- a/drivers/pinctrl/Kconfig +++ b/drivers/pinctrl/Kconfig @@ -230,6 +230,14 @@ config PINCTRL_APQ8064 @@ -35,11 +33,9 @@ index d34639d..232e6bc 100644 config PINCTRL_MSM8X74 tristate "Qualcomm 8x74 pin controller driver" depends on GPIOLIB && OF && (ARCH_QCOM || COMPILE_TEST) -diff --git a/drivers/pinctrl/Makefile b/drivers/pinctrl/Makefile -index 9e1fb67..6b8474a 100644 --- a/drivers/pinctrl/Makefile +++ b/drivers/pinctrl/Makefile -@@ -39,6 +39,7 @@ obj-$(CONFIG_PINCTRL_IMX25) += pinctrl-imx25.o +@@ -39,6 +39,7 @@ obj-$(CONFIG_PINCTRL_IMX25) += pinctrl-i obj-$(CONFIG_PINCTRL_IMX28) += pinctrl-imx28.o obj-$(CONFIG_PINCTRL_MSM) += pinctrl-msm.o obj-$(CONFIG_PINCTRL_APQ8064) += pinctrl-apq8064.o @@ -47,9 +43,6 @@ index 9e1fb67..6b8474a 100644 obj-$(CONFIG_PINCTRL_MSM8X74) += pinctrl-msm8x74.o obj-$(CONFIG_PINCTRL_NOMADIK) += pinctrl-nomadik.o obj-$(CONFIG_PINCTRL_STN8815) += pinctrl-nomadik-stn8815.o -diff --git a/drivers/pinctrl/pinctrl-ipq8064.c b/drivers/pinctrl/pinctrl-ipq8064.c -new file mode 100644 -index 0000000..1700b49 --- /dev/null +++ b/drivers/pinctrl/pinctrl-ipq8064.c @@ -0,0 +1,653 @@ @@ -706,6 +699,3 @@ index 0000000..1700b49 +MODULE_DESCRIPTION("Qualcomm IPQ8064 pinctrl driver"); +MODULE_LICENSE("GPL v2"); +MODULE_DEVICE_TABLE(of, ipq8064_pinctrl_of_match); --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0041-dt-Document-Qualcomm-IPQ8064-pinctrl-binding.patch b/target/linux/ipq806x/patches/0041-dt-Document-Qualcomm-IPQ8064-pinctrl-binding.patch index 2a7c870556..c1adc991d8 100644 --- a/target/linux/ipq806x/patches/0041-dt-Document-Qualcomm-IPQ8064-pinctrl-binding.patch +++ b/target/linux/ipq806x/patches/0041-dt-Document-Qualcomm-IPQ8064-pinctrl-binding.patch @@ -14,9 +14,6 @@ Signed-off-by: Linus Walleij <linus.walleij@linaro.org> 1 file changed, 95 insertions(+) create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,ipq8064-pinctrl.txt -diff --git a/Documentation/devicetree/bindings/pinctrl/qcom,ipq8064-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/qcom,ipq8064-pinctrl.txt -new file mode 100644 -index 0000000..e0d35a4 --- /dev/null +++ b/Documentation/devicetree/bindings/pinctrl/qcom,ipq8064-pinctrl.txt @@ -0,0 +1,95 @@ @@ -115,6 +112,3 @@ index 0000000..e0d35a4 + }; + }; + }; --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0042-ARM-qcom-Select-PINCTRL-by-default-for-ARCH_QCOM.patch b/target/linux/ipq806x/patches/0042-ARM-qcom-Select-PINCTRL-by-default-for-ARCH_QCOM.patch index c1c116f0b6..cbccbc2d80 100644 --- a/target/linux/ipq806x/patches/0042-ARM-qcom-Select-PINCTRL-by-default-for-ARCH_QCOM.patch +++ b/target/linux/ipq806x/patches/0042-ARM-qcom-Select-PINCTRL-by-default-for-ARCH_QCOM.patch @@ -12,8 +12,6 @@ Acked-by: Linus Walleij <linus.walleij@linaro.org> arch/arm/mach-qcom/Kconfig | 1 + 1 file changed, 1 insertion(+) -diff --git a/arch/arm/mach-qcom/Kconfig b/arch/arm/mach-qcom/Kconfig -index a028be2..6440c11 100644 --- a/arch/arm/mach-qcom/Kconfig +++ b/arch/arm/mach-qcom/Kconfig @@ -5,6 +5,7 @@ config ARCH_QCOM @@ -24,6 +22,3 @@ index a028be2..6440c11 100644 select QCOM_SCM if SMP help Support for Qualcomm's devicetree based systems. --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0043-pinctrl-qcom-Correct-name-for-pin-0.patch b/target/linux/ipq806x/patches/0043-pinctrl-qcom-Correct-name-for-pin-0.patch index 71e5572b67..03896ec85c 100644 --- a/target/linux/ipq806x/patches/0043-pinctrl-qcom-Correct-name-for-pin-0.patch +++ b/target/linux/ipq806x/patches/0043-pinctrl-qcom-Correct-name-for-pin-0.patch @@ -10,8 +10,6 @@ Signed-off-by: Andy Gross <agross@codeaurora.org> drivers/pinctrl/pinctrl-ipq8064.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/drivers/pinctrl/pinctrl-ipq8064.c b/drivers/pinctrl/pinctrl-ipq8064.c -index 1700b49..54aba9f 100644 --- a/drivers/pinctrl/pinctrl-ipq8064.c +++ b/drivers/pinctrl/pinctrl-ipq8064.c @@ -20,7 +20,7 @@ @@ -23,6 +21,3 @@ index 1700b49..54aba9f 100644 PINCTRL_PIN(1, "GPIO_1"), PINCTRL_PIN(2, "GPIO_2"), PINCTRL_PIN(3, "GPIO_3"), --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0044-dmaengine-qcom_bam_dma-Add-device-tree-binding.patch b/target/linux/ipq806x/patches/0044-dmaengine-qcom_bam_dma-Add-device-tree-binding.patch index 148959a9bc..e77d05f279 100644 --- a/target/linux/ipq806x/patches/0044-dmaengine-qcom_bam_dma-Add-device-tree-binding.patch +++ b/target/linux/ipq806x/patches/0044-dmaengine-qcom_bam_dma-Add-device-tree-binding.patch @@ -13,9 +13,6 @@ Signed-off-by: Vinod Koul <vinod.koul@intel.com> 1 file changed, 41 insertions(+) create mode 100644 Documentation/devicetree/bindings/dma/qcom_bam_dma.txt -diff --git a/Documentation/devicetree/bindings/dma/qcom_bam_dma.txt b/Documentation/devicetree/bindings/dma/qcom_bam_dma.txt -new file mode 100644 -index 0000000..d75a9d7 --- /dev/null +++ b/Documentation/devicetree/bindings/dma/qcom_bam_dma.txt @@ -0,0 +1,41 @@ @@ -60,6 +57,3 @@ index 0000000..d75a9d7 + dmas = <&uart-bam 0>, <&uart-bam 1>; + dma-names = "rx", "tx"; + }; --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0045-dmaengine-add-Qualcomm-BAM-dma-driver.patch b/target/linux/ipq806x/patches/0045-dmaengine-add-Qualcomm-BAM-dma-driver.patch index 6dcba78ce5..98c71db5ab 100644 --- a/target/linux/ipq806x/patches/0045-dmaengine-add-Qualcomm-BAM-dma-driver.patch +++ b/target/linux/ipq806x/patches/0045-dmaengine-add-Qualcomm-BAM-dma-driver.patch @@ -24,8 +24,6 @@ Signed-off-by: Vinod Koul <vinod.koul@intel.com> 3 files changed, 1122 insertions(+) create mode 100644 drivers/dma/qcom_bam_dma.c -diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig -index 605b016..f87cef9 100644 --- a/drivers/dma/Kconfig +++ b/drivers/dma/Kconfig @@ -401,4 +401,13 @@ config DMATEST @@ -42,8 +40,6 @@ index 605b016..f87cef9 100644 + provides DMA capabilities for a variety of on-chip devices. + endif -diff --git a/drivers/dma/Makefile b/drivers/dma/Makefile -index a029d0f4..5150c82 100644 --- a/drivers/dma/Makefile +++ b/drivers/dma/Makefile @@ -44,3 +44,5 @@ obj-$(CONFIG_DMA_JZ4740) += dma-jz4740.o @@ -52,9 +48,6 @@ index a029d0f4..5150c82 100644 obj-$(CONFIG_MOXART_DMA) += moxart-dma.o +obj-$(CONFIG_FSL_EDMA) += fsl-edma.o +obj-$(CONFIG_QCOM_BAM_DMA) += qcom_bam_dma.o -diff --git a/drivers/dma/qcom_bam_dma.c b/drivers/dma/qcom_bam_dma.c -new file mode 100644 -index 0000000..82c9231 --- /dev/null +++ b/drivers/dma/qcom_bam_dma.c @@ -0,0 +1,1111 @@ @@ -1169,6 +1162,3 @@ index 0000000..82c9231 +MODULE_AUTHOR("Andy Gross <agross@codeaurora.org>"); +MODULE_DESCRIPTION("QCOM BAM DMA engine driver"); +MODULE_LICENSE("GPL v2"); --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0046-mmc-sdhci-msm-Qualcomm-SDHCI-binding-documentation.patch b/target/linux/ipq806x/patches/0046-mmc-sdhci-msm-Qualcomm-SDHCI-binding-documentation.patch index b173fcfc1d..65c5347fd5 100644 --- a/target/linux/ipq806x/patches/0046-mmc-sdhci-msm-Qualcomm-SDHCI-binding-documentation.patch +++ b/target/linux/ipq806x/patches/0046-mmc-sdhci-msm-Qualcomm-SDHCI-binding-documentation.patch @@ -15,9 +15,6 @@ Signed-off-by: Chris Ball <chris@printf.net> 1 file changed, 55 insertions(+) create mode 100644 Documentation/devicetree/bindings/mmc/sdhci-msm.txt -diff --git a/Documentation/devicetree/bindings/mmc/sdhci-msm.txt b/Documentation/devicetree/bindings/mmc/sdhci-msm.txt -new file mode 100644 -index 0000000..81b33b5 --- /dev/null +++ b/Documentation/devicetree/bindings/mmc/sdhci-msm.txt @@ -0,0 +1,55 @@ @@ -76,6 +73,3 @@ index 0000000..81b33b5 + clocks = <&gcc GCC_SDCC2_APPS_CLK>, <&gcc GCC_SDCC2_AHB_CLK>; + clock-names = "core", "iface"; + }; --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0047-mmc-sdhci-msm-Initial-support-for-Qualcomm-chipsets.patch b/target/linux/ipq806x/patches/0047-mmc-sdhci-msm-Initial-support-for-Qualcomm-chipsets.patch index 7ec97a4687..9417e1d593 100644 --- a/target/linux/ipq806x/patches/0047-mmc-sdhci-msm-Initial-support-for-Qualcomm-chipsets.patch +++ b/target/linux/ipq806x/patches/0047-mmc-sdhci-msm-Initial-support-for-Qualcomm-chipsets.patch @@ -20,8 +20,6 @@ Signed-off-by: Chris Ball <chris@printf.net> 3 files changed, 222 insertions(+) create mode 100644 drivers/mmc/host/sdhci-msm.c -diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig -index 1384f67..c0ea72a 100644 --- a/drivers/mmc/host/Kconfig +++ b/drivers/mmc/host/Kconfig @@ -334,6 +334,19 @@ config MMC_ATMELMCI @@ -44,11 +42,9 @@ index 1384f67..c0ea72a 100644 config MMC_MSM tristate "Qualcomm SDCC Controller Support" depends on MMC && (ARCH_MSM7X00A || ARCH_MSM7X30 || ARCH_QSD8X50) -diff --git a/drivers/mmc/host/Makefile b/drivers/mmc/host/Makefile -index 3483b6b..bbc8445 100644 --- a/drivers/mmc/host/Makefile +++ b/drivers/mmc/host/Makefile -@@ -64,6 +64,7 @@ obj-$(CONFIG_MMC_SDHCI_OF_ESDHC) += sdhci-of-esdhc.o +@@ -65,6 +65,7 @@ obj-$(CONFIG_MMC_SDHCI_OF_ESDHC) += sdhc obj-$(CONFIG_MMC_SDHCI_OF_HLWD) += sdhci-of-hlwd.o obj-$(CONFIG_MMC_SDHCI_BCM_KONA) += sdhci-bcm-kona.o obj-$(CONFIG_MMC_SDHCI_BCM2835) += sdhci-bcm2835.o @@ -56,9 +52,6 @@ index 3483b6b..bbc8445 100644 ifeq ($(CONFIG_CB710_DEBUG),y) CFLAGS-cb710-mmc += -DDEBUG -diff --git a/drivers/mmc/host/sdhci-msm.c b/drivers/mmc/host/sdhci-msm.c -new file mode 100644 -index 0000000..3b0606f --- /dev/null +++ b/drivers/mmc/host/sdhci-msm.c @@ -0,0 +1,208 @@ @@ -270,6 +263,3 @@ index 0000000..3b0606f + +MODULE_DESCRIPTION("Qualcomm Secure Digital Host Controller Interface driver"); +MODULE_LICENSE("GPL v2"); --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0048-mmc-sdhci-msm-Add-platform_execute_tuning-implementa.patch b/target/linux/ipq806x/patches/0048-mmc-sdhci-msm-Add-platform_execute_tuning-implementa.patch index 07e122fa64..e2c34bfc12 100644 --- a/target/linux/ipq806x/patches/0048-mmc-sdhci-msm-Add-platform_execute_tuning-implementa.patch +++ b/target/linux/ipq806x/patches/0048-mmc-sdhci-msm-Add-platform_execute_tuning-implementa.patch @@ -16,8 +16,6 @@ Signed-off-by: Chris Ball <chris@printf.net> drivers/mmc/host/sdhci-msm.c | 420 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 415 insertions(+), 5 deletions(-) -diff --git a/drivers/mmc/host/sdhci-msm.c b/drivers/mmc/host/sdhci-msm.c -index 3b0606f..acb0e9e 100644 --- a/drivers/mmc/host/sdhci-msm.c +++ b/drivers/mmc/host/sdhci-msm.c @@ -18,6 +18,8 @@ @@ -467,6 +465,3 @@ index 3b0606f..acb0e9e 100644 static const struct of_device_id sdhci_msm_dt_match[] = { { .compatible = "qcom,sdhci-msm-v4" }, {}, --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0049-drivers-of-add-initialization-code-for-static-reserv.patch b/target/linux/ipq806x/patches/0049-drivers-of-add-initialization-code-for-static-reserv.patch index f520e6cc7a..1e304dddb0 100644 --- a/target/linux/ipq806x/patches/0049-drivers-of-add-initialization-code-for-static-reserv.patch +++ b/target/linux/ipq806x/patches/0049-drivers-of-add-initialization-code-for-static-reserv.patch @@ -25,8 +25,6 @@ Signed-off-by: Grant Likely <grant.likely@linaro.org> include/linux/of_fdt.h | 4 ++ 2 files changed, 135 insertions(+) -diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c -index 758b4f8..819e112 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -15,6 +15,7 @@ @@ -37,7 +35,7 @@ index 758b4f8..819e112 100644 #include <linux/string.h> #include <linux/errno.h> #include <linux/slab.h> -@@ -440,6 +441,118 @@ struct boot_param_header *initial_boot_params; +@@ -440,6 +441,118 @@ struct boot_param_header *initial_boot_p #ifdef CONFIG_OF_EARLY_FLATTREE /** @@ -156,7 +154,7 @@ index 758b4f8..819e112 100644 * of_scan_flat_dt - scan flattened tree blob and call callback on each. * @it: callback function * @data: context data pointer -@@ -856,6 +969,16 @@ void __init __weak early_init_dt_add_memory_arch(u64 base, u64 size) +@@ -859,6 +972,16 @@ void __init __weak early_init_dt_add_mem memblock_add(base, size); } @@ -173,7 +171,7 @@ index 758b4f8..819e112 100644 /* * called from unflatten_device_tree() to bootstrap devicetree itself * Architectures can override this definition if memblock isn't used -@@ -864,6 +987,14 @@ void * __init __weak early_init_dt_alloc_memory_arch(u64 size, u64 align) +@@ -867,6 +990,14 @@ void * __init __weak early_init_dt_alloc { return __va(memblock_alloc(size, align)); } @@ -188,11 +186,9 @@ index 758b4f8..819e112 100644 #endif bool __init early_init_dt_scan(void *params) -diff --git a/include/linux/of_fdt.h b/include/linux/of_fdt.h -index 2b77058..ddd7219 100644 --- a/include/linux/of_fdt.h +++ b/include/linux/of_fdt.h -@@ -98,7 +98,10 @@ extern int early_init_dt_scan_chosen(unsigned long node, const char *uname, +@@ -98,7 +98,10 @@ extern int early_init_dt_scan_chosen(uns int depth, void *data); extern int early_init_dt_scan_memory(unsigned long node, const char *uname, int depth, void *data); @@ -203,7 +199,7 @@ index 2b77058..ddd7219 100644 extern void * early_init_dt_alloc_memory_arch(u64 size, u64 align); extern u64 dt_mem_next_cell(int s, __be32 **cellp); -@@ -118,6 +121,7 @@ extern void unflatten_and_copy_device_tree(void); +@@ -118,6 +121,7 @@ extern void unflatten_and_copy_device_tr extern void early_init_devtree(void *); extern void early_get_first_memblock_info(void *, phys_addr_t *); #else /* CONFIG_OF_FLATTREE */ @@ -211,6 +207,3 @@ index 2b77058..ddd7219 100644 static inline const char *of_flat_dt_get_machine_name(void) { return NULL; } static inline void unflatten_device_tree(void) {} static inline void unflatten_and_copy_device_tree(void) {} --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0050-drivers-of-add-initialization-code-for-dynamic-reser.patch b/target/linux/ipq806x/patches/0050-drivers-of-add-initialization-code-for-dynamic-reser.patch index b23867ba55..4b633b599f 100644 --- a/target/linux/ipq806x/patches/0050-drivers-of-add-initialization-code-for-dynamic-reser.patch +++ b/target/linux/ipq806x/patches/0050-drivers-of-add-initialization-code-for-dynamic-reser.patch @@ -22,8 +22,6 @@ Signed-off-by: Grant Likely <grant.likely@linaro.org> create mode 100644 drivers/of/of_reserved_mem.c create mode 100644 include/linux/of_reserved_mem.h -diff --git a/drivers/of/Kconfig b/drivers/of/Kconfig -index c6973f1..30a7d87 100644 --- a/drivers/of/Kconfig +++ b/drivers/of/Kconfig @@ -75,4 +75,10 @@ config OF_MTD @@ -37,8 +35,6 @@ index c6973f1..30a7d87 100644 + Helpers to allow for reservation of memory regions + endmenu # OF -diff --git a/drivers/of/Makefile b/drivers/of/Makefile -index efd0510..ed9660a 100644 --- a/drivers/of/Makefile +++ b/drivers/of/Makefile @@ -9,3 +9,4 @@ obj-$(CONFIG_OF_MDIO) += of_mdio.o @@ -46,8 +42,6 @@ index efd0510..ed9660a 100644 obj-$(CONFIG_OF_PCI_IRQ) += of_pci_irq.o obj-$(CONFIG_OF_MTD) += of_mtd.o +obj-$(CONFIG_OF_RESERVED_MEM) += of_reserved_mem.o -diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c -index 819e112..510c0d8 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -15,6 +15,7 @@ @@ -58,7 +52,7 @@ index 819e112..510c0d8 100644 #include <linux/sizes.h> #include <linux/string.h> #include <linux/errno.h> -@@ -450,7 +451,7 @@ static int __init __reserved_mem_reserve_reg(unsigned long node, +@@ -450,7 +451,7 @@ static int __init __reserved_mem_reserve phys_addr_t base, size; unsigned long len; __be32 *prop; @@ -67,7 +61,7 @@ index 819e112..510c0d8 100644 prop = of_get_flat_dt_prop(node, "reg", &len); if (!prop) -@@ -477,6 +478,10 @@ static int __init __reserved_mem_reserve_reg(unsigned long node, +@@ -477,6 +478,10 @@ static int __init __reserved_mem_reserve uname, &base, (unsigned long)size / SZ_1M); len -= t_len; @@ -78,7 +72,7 @@ index 819e112..510c0d8 100644 } return 0; } -@@ -512,6 +517,7 @@ static int __init __fdt_scan_reserved_mem(unsigned long node, const char *uname, +@@ -512,6 +517,7 @@ static int __init __fdt_scan_reserved_me { static int found; const char *status; @@ -86,7 +80,7 @@ index 819e112..510c0d8 100644 if (!found && depth == 1 && strcmp(uname, "reserved-memory") == 0) { if (__reserved_mem_check_root(node) != 0) { -@@ -534,7 +540,9 @@ static int __init __fdt_scan_reserved_mem(unsigned long node, const char *uname, +@@ -534,7 +540,9 @@ static int __init __fdt_scan_reserved_me if (status && strcmp(status, "okay") != 0 && strcmp(status, "ok") != 0) return 0; @@ -97,7 +91,7 @@ index 819e112..510c0d8 100644 /* scan next node */ return 0; -@@ -550,6 +558,7 @@ static int __init __fdt_scan_reserved_mem(unsigned long node, const char *uname, +@@ -550,6 +558,7 @@ static int __init __fdt_scan_reserved_me void __init early_init_fdt_scan_reserved_mem(void) { of_scan_flat_dt(__fdt_scan_reserved_mem, NULL); @@ -105,9 +99,6 @@ index 819e112..510c0d8 100644 } /** -diff --git a/drivers/of/of_reserved_mem.c b/drivers/of/of_reserved_mem.c -new file mode 100644 -index 0000000..69b8117 --- /dev/null +++ b/drivers/of/of_reserved_mem.c @@ -0,0 +1,188 @@ @@ -299,9 +290,6 @@ index 0000000..69b8117 + &rmem->base, &rmem->size); + } +} -diff --git a/include/linux/of_reserved_mem.h b/include/linux/of_reserved_mem.h -new file mode 100644 -index 0000000..89226ed --- /dev/null +++ b/include/linux/of_reserved_mem.h @@ -0,0 +1,21 @@ @@ -326,6 +314,3 @@ index 0000000..89226ed +#endif + +#endif /* __OF_RESERVED_MEM_H */ --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0051-drivers-of-add-support-for-custom-reserved-memory-dr.patch b/target/linux/ipq806x/patches/0051-drivers-of-add-support-for-custom-reserved-memory-dr.patch index ce01a8f084..48ad8ac835 100644 --- a/target/linux/ipq806x/patches/0051-drivers-of-add-support-for-custom-reserved-memory-dr.patch +++ b/target/linux/ipq806x/patches/0051-drivers-of-add-support-for-custom-reserved-memory-dr.patch @@ -18,11 +18,9 @@ Signed-off-by: Grant Likely <grant.likely@linaro.org> include/linux/of_reserved_mem.h | 32 ++++++++++++++++++++++++++++++++ 3 files changed, 72 insertions(+) -diff --git a/drivers/of/of_reserved_mem.c b/drivers/of/of_reserved_mem.c -index 69b8117..daaaf93 100644 --- a/drivers/of/of_reserved_mem.c +++ b/drivers/of/of_reserved_mem.c -@@ -170,6 +170,33 @@ static int __init __reserved_mem_alloc_size(unsigned long node, +@@ -170,6 +170,33 @@ static int __init __reserved_mem_alloc_s return 0; } @@ -64,11 +62,9 @@ index 69b8117..daaaf93 100644 + __reserved_mem_init_node(rmem); } } -diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h -index bd02ca7..146e4ff 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h -@@ -167,6 +167,16 @@ +@@ -177,6 +177,16 @@ #define CLK_OF_TABLES() #endif @@ -85,7 +81,7 @@ index bd02ca7..146e4ff 100644 #ifdef CONFIG_SMP #define CPU_METHOD_OF_TABLES() . = ALIGN(8); \ VMLINUX_SYMBOL(__cpu_method_of_table_begin) = .; \ -@@ -499,6 +509,7 @@ +@@ -510,6 +520,7 @@ TRACE_SYSCALLS() \ MEM_DISCARD(init.rodata) \ CLK_OF_TABLES() \ @@ -93,8 +89,6 @@ index bd02ca7..146e4ff 100644 CLKSRC_OF_TABLES() \ CPU_METHOD_OF_TABLES() \ KERNEL_DTB() \ -diff --git a/include/linux/of_reserved_mem.h b/include/linux/of_reserved_mem.h -index 89226ed..9b1fbb7 100644 --- a/include/linux/of_reserved_mem.h +++ b/include/linux/of_reserved_mem.h @@ -1,21 +1,53 @@ @@ -151,6 +145,3 @@ index 89226ed..9b1fbb7 100644 #endif #endif /* __OF_RESERVED_MEM_H */ --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0052-arm-add-support-for-reserved-memory-defined-by-devic.patch b/target/linux/ipq806x/patches/0052-arm-add-support-for-reserved-memory-defined-by-devic.patch index 8ff56329e0..7e90e2d88a 100644 --- a/target/linux/ipq806x/patches/0052-arm-add-support-for-reserved-memory-defined-by-devic.patch +++ b/target/linux/ipq806x/patches/0052-arm-add-support-for-reserved-memory-defined-by-devic.patch @@ -13,11 +13,9 @@ Signed-off-by: Grant Likely <grant.likely@linaro.org> arch/arm/mm/init.c | 2 ++ 2 files changed, 3 insertions(+) -diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig -index d02ce70..4332e8d 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig -@@ -1922,6 +1922,7 @@ config USE_OF +@@ -1923,6 +1923,7 @@ config USE_OF select IRQ_DOMAIN select OF select OF_EARLY_FLATTREE @@ -25,11 +23,9 @@ index d02ce70..4332e8d 100644 help Include support for flattened device tree machine descriptions. -diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c -index 804d615..2a77ba8 100644 --- a/arch/arm/mm/init.c +++ b/arch/arm/mm/init.c -@@ -323,6 +323,8 @@ void __init arm_memblock_init(struct meminfo *mi, +@@ -323,6 +323,8 @@ void __init arm_memblock_init(struct mem if (mdesc->reserve) mdesc->reserve(); @@ -38,6 +34,3 @@ index 804d615..2a77ba8 100644 /* * reserve memory for DMA contigouos allocations, * must come from DMA area inside low memory --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0053-of-document-bindings-for-reserved-memory-nodes.patch b/target/linux/ipq806x/patches/0053-of-document-bindings-for-reserved-memory-nodes.patch index b499e17551..5363b706c2 100644 --- a/target/linux/ipq806x/patches/0053-of-document-bindings-for-reserved-memory-nodes.patch +++ b/target/linux/ipq806x/patches/0053-of-document-bindings-for-reserved-memory-nodes.patch @@ -20,9 +20,6 @@ Signed-off-by: Grant Likely <grant.likely@linaro.org> 1 file changed, 133 insertions(+) create mode 100644 Documentation/devicetree/bindings/reserved-memory/reserved-memory.txt -diff --git a/Documentation/devicetree/bindings/reserved-memory/reserved-memory.txt b/Documentation/devicetree/bindings/reserved-memory/reserved-memory.txt -new file mode 100644 -index 0000000..3da0ebd --- /dev/null +++ b/Documentation/devicetree/bindings/reserved-memory/reserved-memory.txt @@ -0,0 +1,133 @@ @@ -159,6 +156,3 @@ index 0000000..3da0ebd + /* ... */ + }; +}; --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0054-of-only-scan-for-reserved-mem-when-fdt-present.patch b/target/linux/ipq806x/patches/0054-of-only-scan-for-reserved-mem-when-fdt-present.patch index a5423d8446..6efcf38205 100644 --- a/target/linux/ipq806x/patches/0054-of-only-scan-for-reserved-mem-when-fdt-present.patch +++ b/target/linux/ipq806x/patches/0054-of-only-scan-for-reserved-mem-when-fdt-present.patch @@ -16,11 +16,9 @@ Signed-off-by: Grant Likely <grant.likely@linaro.org> drivers/of/fdt.c | 3 +++ 1 file changed, 3 insertions(+) -diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c -index 510c0d8..501bc83 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c -@@ -557,6 +557,9 @@ static int __init __fdt_scan_reserved_mem(unsigned long node, const char *uname, +@@ -557,6 +557,9 @@ static int __init __fdt_scan_reserved_me */ void __init early_init_fdt_scan_reserved_mem(void) { @@ -30,6 +28,3 @@ index 510c0d8..501bc83 100644 of_scan_flat_dt(__fdt_scan_reserved_mem, NULL); fdt_init_reserved_mem(); } --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0055-spmi-Linux-driver-framework-for-SPMI.patch b/target/linux/ipq806x/patches/0055-spmi-Linux-driver-framework-for-SPMI.patch index 8b5943894d..80d3b6c05c 100644 --- a/target/linux/ipq806x/patches/0055-spmi-Linux-driver-framework-for-SPMI.patch +++ b/target/linux/ipq806x/patches/0055-spmi-Linux-driver-framework-for-SPMI.patch @@ -33,8 +33,6 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> create mode 100644 include/dt-bindings/spmi/spmi.h create mode 100644 include/linux/spmi.h -diff --git a/drivers/Kconfig b/drivers/Kconfig -index b3138fb..e0a4ae6 100644 --- a/drivers/Kconfig +++ b/drivers/Kconfig @@ -52,6 +52,8 @@ source "drivers/i2c/Kconfig" @@ -46,8 +44,6 @@ index b3138fb..e0a4ae6 100644 source "drivers/hsi/Kconfig" source "drivers/pps/Kconfig" -diff --git a/drivers/Makefile b/drivers/Makefile -index 8e3b8b0..3d6de8b 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -66,6 +66,7 @@ obj-$(CONFIG_ATA) += ata/ @@ -58,9 +54,6 @@ index 8e3b8b0..3d6de8b 100644 obj-y += hsi/ obj-y += net/ obj-$(CONFIG_ATM) += atm/ -diff --git a/drivers/spmi/Kconfig b/drivers/spmi/Kconfig -new file mode 100644 -index 0000000..1dbfee0 --- /dev/null +++ b/drivers/spmi/Kconfig @@ -0,0 +1,9 @@ @@ -73,9 +66,6 @@ index 0000000..1dbfee0 + SPMI (System Power Management Interface) is a two-wire + serial interface between baseband and application processors + and Power Management Integrated Circuits (PMIC). -diff --git a/drivers/spmi/Makefile b/drivers/spmi/Makefile -new file mode 100644 -index 0000000..1de1acd --- /dev/null +++ b/drivers/spmi/Makefile @@ -0,0 +1,4 @@ @@ -83,9 +73,6 @@ index 0000000..1de1acd +# Makefile for kernel SPMI framework. +# +obj-$(CONFIG_SPMI) += spmi.o -diff --git a/drivers/spmi/spmi.c b/drivers/spmi/spmi.c -new file mode 100644 -index 0000000..6122c8f --- /dev/null +++ b/drivers/spmi/spmi.c @@ -0,0 +1,609 @@ @@ -698,9 +685,6 @@ index 0000000..6122c8f +MODULE_LICENSE("GPL v2"); +MODULE_DESCRIPTION("SPMI module"); +MODULE_ALIAS("platform:spmi"); -diff --git a/include/dt-bindings/spmi/spmi.h b/include/dt-bindings/spmi/spmi.h -new file mode 100644 -index 0000000..d11e1e5 --- /dev/null +++ b/include/dt-bindings/spmi/spmi.h @@ -0,0 +1,18 @@ @@ -722,8 +706,6 @@ index 0000000..d11e1e5 +#define SPMI_GSID 1 + +#endif -diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h -index 45e9214..677e474 100644 --- a/include/linux/mod_devicetable.h +++ b/include/linux/mod_devicetable.h @@ -432,6 +432,14 @@ struct spi_device_id { @@ -741,9 +723,6 @@ index 45e9214..677e474 100644 /* dmi */ enum dmi_field { DMI_NONE, -diff --git a/include/linux/spmi.h b/include/linux/spmi.h -new file mode 100644 -index 0000000..91f5eab --- /dev/null +++ b/include/linux/spmi.h @@ -0,0 +1,191 @@ @@ -938,6 +917,3 @@ index 0000000..91f5eab +int spmi_command_shutdown(struct spmi_device *sdev); + +#endif --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0056-spmi-Add-MSM-PMIC-Arbiter-SPMI-controller.patch b/target/linux/ipq806x/patches/0056-spmi-Add-MSM-PMIC-Arbiter-SPMI-controller.patch index 24f841e589..e2fde2d788 100644 --- a/target/linux/ipq806x/patches/0056-spmi-Add-MSM-PMIC-Arbiter-SPMI-controller.patch +++ b/target/linux/ipq806x/patches/0056-spmi-Add-MSM-PMIC-Arbiter-SPMI-controller.patch @@ -26,8 +26,6 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> 3 files changed, 424 insertions(+) create mode 100644 drivers/spmi/spmi-pmic-arb.c -diff --git a/drivers/spmi/Kconfig b/drivers/spmi/Kconfig -index 1dbfee0..80b7901 100644 --- a/drivers/spmi/Kconfig +++ b/drivers/spmi/Kconfig @@ -7,3 +7,20 @@ menuconfig SPMI @@ -51,8 +49,6 @@ index 1dbfee0..80b7901 100644 + other devices that have the SPMI interface. + +endif -diff --git a/drivers/spmi/Makefile b/drivers/spmi/Makefile -index 1de1acd..fc75104 100644 --- a/drivers/spmi/Makefile +++ b/drivers/spmi/Makefile @@ -2,3 +2,5 @@ @@ -61,9 +57,6 @@ index 1de1acd..fc75104 100644 obj-$(CONFIG_SPMI) += spmi.o + +obj-$(CONFIG_SPMI_MSM_PMIC_ARB) += spmi-pmic-arb.o -diff --git a/drivers/spmi/spmi-pmic-arb.c b/drivers/spmi/spmi-pmic-arb.c -new file mode 100644 -index 0000000..2dd27e8 --- /dev/null +++ b/drivers/spmi/spmi-pmic-arb.c @@ -0,0 +1,405 @@ @@ -472,6 +465,3 @@ index 0000000..2dd27e8 + +MODULE_LICENSE("GPL v2"); +MODULE_ALIAS("platform:spmi_pmic_arb"); --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0057-spmi-pmic_arb-add-support-for-interrupt-handling.patch b/target/linux/ipq806x/patches/0057-spmi-pmic_arb-add-support-for-interrupt-handling.patch index cbd49b0f76..b1420b4050 100644 --- a/target/linux/ipq806x/patches/0057-spmi-pmic_arb-add-support-for-interrupt-handling.patch +++ b/target/linux/ipq806x/patches/0057-spmi-pmic_arb-add-support-for-interrupt-handling.patch @@ -19,8 +19,6 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> drivers/spmi/spmi-pmic-arb.c | 377 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 376 insertions(+), 2 deletions(-) -diff --git a/drivers/spmi/Kconfig b/drivers/spmi/Kconfig -index 80b7901..075bd79 100644 --- a/drivers/spmi/Kconfig +++ b/drivers/spmi/Kconfig @@ -13,6 +13,7 @@ if SPMI @@ -31,8 +29,6 @@ index 80b7901..075bd79 100644 depends on ARCH_MSM || COMPILE_TEST default ARCH_MSM help -diff --git a/drivers/spmi/spmi-pmic-arb.c b/drivers/spmi/spmi-pmic-arb.c -index 2dd27e8..246e03a 100644 --- a/drivers/spmi/spmi-pmic-arb.c +++ b/drivers/spmi/spmi-pmic-arb.c @@ -13,6 +13,9 @@ @@ -75,7 +71,7 @@ index 2dd27e8..246e03a 100644 }; static inline u32 pmic_arb_base_read(struct spmi_pmic_arb_dev *dev, u32 offset) -@@ -306,12 +325,316 @@ static int pmic_arb_write_cmd(struct spmi_controller *ctrl, u8 opc, u8 sid, +@@ -306,12 +325,316 @@ static int pmic_arb_write_cmd(struct spm return rc; } @@ -393,7 +389,7 @@ index 2dd27e8..246e03a 100644 int err, i; ctrl = spmi_controller_alloc(&pdev->dev, sizeof(*pa)); -@@ -319,6 +642,7 @@ static int spmi_pmic_arb_probe(struct platform_device *pdev) +@@ -319,6 +642,7 @@ static int spmi_pmic_arb_probe(struct pl return -ENOMEM; pa = spmi_controller_get_drvdata(ctrl); @@ -401,7 +397,7 @@ index 2dd27e8..246e03a 100644 res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "core"); pa->base = devm_ioremap_resource(&ctrl->dev, res); -@@ -341,6 +665,12 @@ static int spmi_pmic_arb_probe(struct platform_device *pdev) +@@ -341,6 +665,12 @@ static int spmi_pmic_arb_probe(struct pl goto err_put_ctrl; } @@ -414,7 +410,7 @@ index 2dd27e8..246e03a 100644 err = of_property_read_u32(pdev->dev.of_node, "qcom,channel", &channel); if (err) { dev_err(&pdev->dev, "channel unspecified.\n"); -@@ -355,6 +685,29 @@ static int spmi_pmic_arb_probe(struct platform_device *pdev) +@@ -355,6 +685,29 @@ static int spmi_pmic_arb_probe(struct pl pa->channel = channel; @@ -444,7 +440,7 @@ index 2dd27e8..246e03a 100644 platform_set_drvdata(pdev, ctrl); raw_spin_lock_init(&pa->lock); -@@ -362,15 +715,31 @@ static int spmi_pmic_arb_probe(struct platform_device *pdev) +@@ -362,15 +715,31 @@ static int spmi_pmic_arb_probe(struct pl ctrl->read_cmd = pmic_arb_read_cmd; ctrl->write_cmd = pmic_arb_write_cmd; @@ -489,6 +485,3 @@ index 2dd27e8..246e03a 100644 spmi_controller_put(ctrl); return 0; } --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0058-spmi-pmic_arb-make-selectable-on-ARCH_QCOM.patch b/target/linux/ipq806x/patches/0058-spmi-pmic_arb-make-selectable-on-ARCH_QCOM.patch index 271e8adad4..0df3780fa0 100644 --- a/target/linux/ipq806x/patches/0058-spmi-pmic_arb-make-selectable-on-ARCH_QCOM.patch +++ b/target/linux/ipq806x/patches/0058-spmi-pmic_arb-make-selectable-on-ARCH_QCOM.patch @@ -14,8 +14,6 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> drivers/spmi/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/drivers/spmi/Kconfig b/drivers/spmi/Kconfig -index 075bd79..bf1295e 100644 --- a/drivers/spmi/Kconfig +++ b/drivers/spmi/Kconfig @@ -14,8 +14,8 @@ config SPMI_MSM_PMIC_ARB @@ -29,6 +27,3 @@ index 075bd79..bf1295e 100644 help If you say yes to this option, support will be included for the built-in SPMI PMIC Arbiter interface on Qualcomm MSM family --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0059-spmi-pm-drop-bus-level-PM-suspend-resume-routines.patch b/target/linux/ipq806x/patches/0059-spmi-pm-drop-bus-level-PM-suspend-resume-routines.patch index f252fa055b..b8bb48cb4e 100644 --- a/target/linux/ipq806x/patches/0059-spmi-pm-drop-bus-level-PM-suspend-resume-routines.patch +++ b/target/linux/ipq806x/patches/0059-spmi-pm-drop-bus-level-PM-suspend-resume-routines.patch @@ -16,11 +16,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> drivers/spmi/spmi.c | 35 ----------------------------------- 1 file changed, 35 deletions(-) -diff --git a/drivers/spmi/spmi.c b/drivers/spmi/spmi.c -index 6122c8f..3b57807 100644 --- a/drivers/spmi/spmi.c +++ b/drivers/spmi/spmi.c -@@ -46,40 +46,6 @@ static const struct device_type spmi_ctrl_type = { +@@ -46,40 +46,6 @@ static const struct device_type spmi_ctr .release = spmi_ctrl_release, }; @@ -61,7 +59,7 @@ index 6122c8f..3b57807 100644 static int spmi_device_match(struct device *dev, struct device_driver *drv) { if (of_driver_match_device(dev, drv)) -@@ -391,7 +357,6 @@ static int spmi_drv_remove(struct device *dev) +@@ -391,7 +357,6 @@ static int spmi_drv_remove(struct device static struct bus_type spmi_bus_type = { .name = "spmi", .match = spmi_device_match, @@ -69,6 +67,3 @@ index 6122c8f..3b57807 100644 .probe = spmi_drv_probe, .remove = spmi_drv_remove, }; --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0060-i2c-qup-New-bus-driver-for-the-Qualcomm-QUP-I2C-cont.patch b/target/linux/ipq806x/patches/0060-i2c-qup-New-bus-driver-for-the-Qualcomm-QUP-I2C-cont.patch index 64993a3e8c..c96fc154e1 100644 --- a/target/linux/ipq806x/patches/0060-i2c-qup-New-bus-driver-for-the-Qualcomm-QUP-I2C-cont.patch +++ b/target/linux/ipq806x/patches/0060-i2c-qup-New-bus-driver-for-the-Qualcomm-QUP-I2C-cont.patch @@ -23,11 +23,9 @@ Signed-off-by: Wolfram Sang <wsa@the-dreams.de> 3 files changed, 779 insertions(+) create mode 100644 drivers/i2c/busses/i2c-qup.c -diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig -index de17c55..1886315 100644 --- a/drivers/i2c/busses/Kconfig +++ b/drivers/i2c/busses/Kconfig -@@ -648,6 +648,16 @@ config I2C_PXA_SLAVE +@@ -649,6 +649,16 @@ config I2C_PXA_SLAVE is necessary for systems where the PXA may be a target on the I2C bus. @@ -44,8 +42,6 @@ index de17c55..1886315 100644 config I2C_RIIC tristate "Renesas RIIC adapter" depends on ARCH_SHMOBILE || COMPILE_TEST -diff --git a/drivers/i2c/busses/Makefile b/drivers/i2c/busses/Makefile -index a08931f..bf2257b 100644 --- a/drivers/i2c/busses/Makefile +++ b/drivers/i2c/busses/Makefile @@ -63,6 +63,7 @@ obj-$(CONFIG_I2C_PNX) += i2c-pnx.o @@ -56,9 +52,6 @@ index a08931f..bf2257b 100644 obj-$(CONFIG_I2C_RIIC) += i2c-riic.o obj-$(CONFIG_I2C_S3C2410) += i2c-s3c2410.o obj-$(CONFIG_I2C_S6000) += i2c-s6000.o -diff --git a/drivers/i2c/busses/i2c-qup.c b/drivers/i2c/busses/i2c-qup.c -new file mode 100644 -index 0000000..c9d5f78 --- /dev/null +++ b/drivers/i2c/busses/i2c-qup.c @@ -0,0 +1,768 @@ @@ -830,6 +823,3 @@ index 0000000..c9d5f78 + +MODULE_LICENSE("GPL v2"); +MODULE_ALIAS("platform:i2c_qup"); --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0061-i2c-qup-Add-device-tree-bindings-information.patch b/target/linux/ipq806x/patches/0061-i2c-qup-Add-device-tree-bindings-information.patch index 6ddae4fe6c..2f9ee58f35 100644 --- a/target/linux/ipq806x/patches/0061-i2c-qup-Add-device-tree-bindings-information.patch +++ b/target/linux/ipq806x/patches/0061-i2c-qup-Add-device-tree-bindings-information.patch @@ -20,9 +20,6 @@ Signed-off-by: Wolfram Sang <wsa@the-dreams.de> 1 file changed, 40 insertions(+) create mode 100644 Documentation/devicetree/bindings/i2c/qcom,i2c-qup.txt -diff --git a/Documentation/devicetree/bindings/i2c/qcom,i2c-qup.txt b/Documentation/devicetree/bindings/i2c/qcom,i2c-qup.txt -new file mode 100644 -index 0000000..dc71754 --- /dev/null +++ b/Documentation/devicetree/bindings/i2c/qcom,i2c-qup.txt @@ -0,0 +1,40 @@ @@ -66,6 +63,3 @@ index 0000000..dc71754 + #address-cells = <1>; + #size-cells = <0>; + }; --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0062-i2c-qup-off-by-ones-in-qup_i2c_probe.patch b/target/linux/ipq806x/patches/0062-i2c-qup-off-by-ones-in-qup_i2c_probe.patch index a140997b82..3feef669cf 100644 --- a/target/linux/ipq806x/patches/0062-i2c-qup-off-by-ones-in-qup_i2c_probe.patch +++ b/target/linux/ipq806x/patches/0062-i2c-qup-off-by-ones-in-qup_i2c_probe.patch @@ -12,11 +12,9 @@ Signed-off-by: Wolfram Sang <wsa@the-dreams.de> drivers/i2c/busses/i2c-qup.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/drivers/i2c/busses/i2c-qup.c b/drivers/i2c/busses/i2c-qup.c -index c9d5f78..ee40980 100644 --- a/drivers/i2c/busses/i2c-qup.c +++ b/drivers/i2c/busses/i2c-qup.c -@@ -633,12 +633,12 @@ static int qup_i2c_probe(struct platform_device *pdev) +@@ -633,12 +633,12 @@ static int qup_i2c_probe(struct platform * associated with each byte written/received */ size = QUP_OUTPUT_BLOCK_SIZE(io_mode); @@ -31,6 +29,3 @@ index c9d5f78..ee40980 100644 return -EIO; qup->in_blk_sz = blk_sizes[size] / 2; --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0063-i2c-qup-use-proper-type-fro-clk_freq.patch b/target/linux/ipq806x/patches/0063-i2c-qup-use-proper-type-fro-clk_freq.patch index 60411abbaa..13ffab4c0c 100644 --- a/target/linux/ipq806x/patches/0063-i2c-qup-use-proper-type-fro-clk_freq.patch +++ b/target/linux/ipq806x/patches/0063-i2c-qup-use-proper-type-fro-clk_freq.patch @@ -12,11 +12,9 @@ Fixes: 10c5a8425968 ('i2c: qup: New bus driver for the Qualcomm QUP I2C controll drivers/i2c/busses/i2c-qup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/drivers/i2c/busses/i2c-qup.c b/drivers/i2c/busses/i2c-qup.c -index ee40980..1b4cf14 100644 --- a/drivers/i2c/busses/i2c-qup.c +++ b/drivers/i2c/busses/i2c-qup.c -@@ -562,7 +562,7 @@ static int qup_i2c_probe(struct platform_device *pdev) +@@ -562,7 +562,7 @@ static int qup_i2c_probe(struct platform u32 io_mode, hw_ver, size; int ret, fs_div, hs_div; int src_clk_freq; @@ -25,6 +23,3 @@ index ee40980..1b4cf14 100644 qup = devm_kzalloc(&pdev->dev, sizeof(*qup), GFP_KERNEL); if (!qup) --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0064-i2c-qup-Fix-pm_runtime_get_sync-usage.patch b/target/linux/ipq806x/patches/0064-i2c-qup-Fix-pm_runtime_get_sync-usage.patch index eaec95084e..497b57e623 100644 --- a/target/linux/ipq806x/patches/0064-i2c-qup-Fix-pm_runtime_get_sync-usage.patch +++ b/target/linux/ipq806x/patches/0064-i2c-qup-Fix-pm_runtime_get_sync-usage.patch @@ -13,11 +13,9 @@ Signed-off-by: Wolfram Sang <wsa@the-dreams.de> drivers/i2c/busses/i2c-qup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/drivers/i2c/busses/i2c-qup.c b/drivers/i2c/busses/i2c-qup.c -index 1b4cf14..2a5efb5 100644 --- a/drivers/i2c/busses/i2c-qup.c +++ b/drivers/i2c/busses/i2c-qup.c -@@ -479,7 +479,7 @@ static int qup_i2c_xfer(struct i2c_adapter *adap, +@@ -479,7 +479,7 @@ static int qup_i2c_xfer(struct i2c_adapt int ret, idx; ret = pm_runtime_get_sync(qup->dev); @@ -26,6 +24,3 @@ index 1b4cf14..2a5efb5 100644 goto out; writel(1, qup->base + QUP_SW_RESET); --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0065-spi-Add-Qualcomm-QUP-SPI-controller-support.patch b/target/linux/ipq806x/patches/0065-spi-Add-Qualcomm-QUP-SPI-controller-support.patch index a392e0473d..3c52f24674 100644 --- a/target/linux/ipq806x/patches/0065-spi-Add-Qualcomm-QUP-SPI-controller-support.patch +++ b/target/linux/ipq806x/patches/0065-spi-Add-Qualcomm-QUP-SPI-controller-support.patch @@ -23,11 +23,9 @@ Signed-off-by: Mark Brown <broonie@linaro.org> 3 files changed, 851 insertions(+) create mode 100644 drivers/spi/spi-qup.c -diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig -index 581ee2a..9e9e3ed 100644 --- a/drivers/spi/Kconfig +++ b/drivers/spi/Kconfig -@@ -381,6 +381,19 @@ config SPI_RSPI +@@ -390,6 +390,19 @@ config SPI_RSPI help SPI driver for Renesas RSPI and QSPI blocks. @@ -47,11 +45,9 @@ index 581ee2a..9e9e3ed 100644 config SPI_S3C24XX tristate "Samsung S3C24XX series SPI" depends on ARCH_S3C24XX -diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile -index 95af48d..e598147 100644 --- a/drivers/spi/Makefile +++ b/drivers/spi/Makefile -@@ -59,6 +59,7 @@ spi-pxa2xx-platform-$(CONFIG_SPI_PXA2XX_PXADMA) += spi-pxa2xx-pxadma.o +@@ -60,6 +60,7 @@ spi-pxa2xx-platform-$(CONFIG_SPI_PXA2XX_ spi-pxa2xx-platform-$(CONFIG_SPI_PXA2XX_DMA) += spi-pxa2xx-dma.o obj-$(CONFIG_SPI_PXA2XX) += spi-pxa2xx-platform.o obj-$(CONFIG_SPI_PXA2XX_PCI) += spi-pxa2xx-pci.o @@ -59,9 +55,6 @@ index 95af48d..e598147 100644 obj-$(CONFIG_SPI_RSPI) += spi-rspi.o obj-$(CONFIG_SPI_S3C24XX) += spi-s3c24xx-hw.o spi-s3c24xx-hw-y := spi-s3c24xx.o -diff --git a/drivers/spi/spi-qup.c b/drivers/spi/spi-qup.c -new file mode 100644 -index 0000000..b0bcc09 --- /dev/null +++ b/drivers/spi/spi-qup.c @@ -0,0 +1,837 @@ @@ -902,6 +895,3 @@ index 0000000..b0bcc09 +MODULE_LICENSE("GPL v2"); +MODULE_VERSION("0.4"); +MODULE_ALIAS("platform:spi_qup"); --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0066-spi-qup-Add-device-tree-bindings-information.patch b/target/linux/ipq806x/patches/0066-spi-qup-Add-device-tree-bindings-information.patch index 0d8b14c62c..079d59ff0a 100644 --- a/target/linux/ipq806x/patches/0066-spi-qup-Add-device-tree-bindings-information.patch +++ b/target/linux/ipq806x/patches/0066-spi-qup-Add-device-tree-bindings-information.patch @@ -15,9 +15,6 @@ Signed-off-by: Mark Brown <broonie@linaro.org> 1 file changed, 85 insertions(+) create mode 100644 Documentation/devicetree/bindings/spi/qcom,spi-qup.txt -diff --git a/Documentation/devicetree/bindings/spi/qcom,spi-qup.txt b/Documentation/devicetree/bindings/spi/qcom,spi-qup.txt -new file mode 100644 -index 0000000..b82a268 --- /dev/null +++ b/Documentation/devicetree/bindings/spi/qcom,spi-qup.txt @@ -0,0 +1,85 @@ @@ -106,6 +103,3 @@ index 0000000..b82a268 + spi-cs-high; + }; + }; --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0067-spi-qup-Remove-spi_master_put-in-spi_qup_remove.patch b/target/linux/ipq806x/patches/0067-spi-qup-Remove-spi_master_put-in-spi_qup_remove.patch index decf585fd7..128eb23ddb 100644 --- a/target/linux/ipq806x/patches/0067-spi-qup-Remove-spi_master_put-in-spi_qup_remove.patch +++ b/target/linux/ipq806x/patches/0067-spi-qup-Remove-spi_master_put-in-spi_qup_remove.patch @@ -13,11 +13,9 @@ Signed-off-by: Mark Brown <broonie@linaro.org> drivers/spi/spi-qup.c | 1 - 1 file changed, 1 deletion(-) -diff --git a/drivers/spi/spi-qup.c b/drivers/spi/spi-qup.c -index b0bcc09..5edc56f 100644 --- a/drivers/spi/spi-qup.c +++ b/drivers/spi/spi-qup.c -@@ -802,7 +802,6 @@ static int spi_qup_remove(struct platform_device *pdev) +@@ -802,7 +802,6 @@ static int spi_qup_remove(struct platfor pm_runtime_put_noidle(&pdev->dev); pm_runtime_disable(&pdev->dev); @@ -25,6 +23,3 @@ index b0bcc09..5edc56f 100644 return 0; } --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0068-spi-qup-Convert-ot-let-spi-core-handle-checking-tran.patch b/target/linux/ipq806x/patches/0068-spi-qup-Convert-ot-let-spi-core-handle-checking-tran.patch index 6914d44a3a..4b025b59fd 100644 --- a/target/linux/ipq806x/patches/0068-spi-qup-Convert-ot-let-spi-core-handle-checking-tran.patch +++ b/target/linux/ipq806x/patches/0068-spi-qup-Convert-ot-let-spi-core-handle-checking-tran.patch @@ -17,8 +17,6 @@ Signed-off-by: Mark Brown <broonie@linaro.org> drivers/spi/spi-qup.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) -diff --git a/drivers/spi/spi-qup.c b/drivers/spi/spi-qup.c -index 5edc56f..dec339d 100644 --- a/drivers/spi/spi-qup.c +++ b/drivers/spi/spi-qup.c @@ -134,7 +134,6 @@ struct spi_qup { @@ -29,7 +27,7 @@ index 5edc56f..dec339d 100644 spinlock_t lock; int in_fifo_sz; -@@ -517,18 +516,6 @@ static int spi_qup_setup(struct spi_device *spi) +@@ -517,18 +516,6 @@ static int spi_qup_setup(struct spi_devi struct spi_qup *controller = spi_master_get_devdata(spi->master); struct spi_qup_device *chip = spi_get_ctldata(spi); @@ -48,7 +46,7 @@ index 5edc56f..dec339d 100644 if (!chip) { /* First setup */ chip = kzalloc(sizeof(*chip), GFP_KERNEL); -@@ -629,6 +616,7 @@ static int spi_qup_probe(struct platform_device *pdev) +@@ -629,6 +616,7 @@ static int spi_qup_probe(struct platform master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH | SPI_LOOP; master->num_chipselect = SPI_NUM_CHIPSELECTS; master->bits_per_word_mask = SPI_BPW_RANGE_MASK(4, 32); @@ -56,7 +54,7 @@ index 5edc56f..dec339d 100644 master->setup = spi_qup_setup; master->cleanup = spi_qup_cleanup; master->set_cs = spi_qup_set_cs; -@@ -645,7 +633,6 @@ static int spi_qup_probe(struct platform_device *pdev) +@@ -645,7 +633,6 @@ static int spi_qup_probe(struct platform controller->iclk = iclk; controller->cclk = cclk; controller->irq = irq; @@ -64,6 +62,3 @@ index 5edc56f..dec339d 100644 spin_lock_init(&controller->lock); init_completion(&controller->done); --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0069-spi-qup-Fix-build-error-due-to-a-typo.patch b/target/linux/ipq806x/patches/0069-spi-qup-Fix-build-error-due-to-a-typo.patch index 558f8604f2..4209485d12 100644 --- a/target/linux/ipq806x/patches/0069-spi-qup-Fix-build-error-due-to-a-typo.patch +++ b/target/linux/ipq806x/patches/0069-spi-qup-Fix-build-error-due-to-a-typo.patch @@ -21,11 +21,9 @@ Signed-off-by: Mark Brown <broonie@linaro.org> drivers/spi/spi-qup.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/drivers/spi/spi-qup.c b/drivers/spi/spi-qup.c -index dec339d..886edb4 100644 --- a/drivers/spi/spi-qup.c +++ b/drivers/spi/spi-qup.c -@@ -709,7 +709,7 @@ static int spi_qup_pm_suspend_runtime(struct device *device) +@@ -709,7 +709,7 @@ static int spi_qup_pm_suspend_runtime(st /* Enable clocks auto gaiting */ config = readl(controller->base + QUP_CONFIG); @@ -34,7 +32,7 @@ index dec339d..886edb4 100644 writel_relaxed(config, controller->base + QUP_CONFIG); return 0; } -@@ -722,7 +722,7 @@ static int spi_qup_pm_resume_runtime(struct device *device) +@@ -722,7 +722,7 @@ static int spi_qup_pm_resume_runtime(str /* Disable clocks auto gaiting */ config = readl_relaxed(controller->base + QUP_CONFIG); @@ -43,6 +41,3 @@ index dec339d..886edb4 100644 writel_relaxed(config, controller->base + QUP_CONFIG); return 0; } --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0070-spi-qup-Enable-driver-compilation-with-COMPILE_TEST.patch b/target/linux/ipq806x/patches/0070-spi-qup-Enable-driver-compilation-with-COMPILE_TEST.patch index aee0bf488c..00589925c5 100644 --- a/target/linux/ipq806x/patches/0070-spi-qup-Enable-driver-compilation-with-COMPILE_TEST.patch +++ b/target/linux/ipq806x/patches/0070-spi-qup-Enable-driver-compilation-with-COMPILE_TEST.patch @@ -12,11 +12,9 @@ Signed-off-by: Mark Brown <broonie@linaro.org> drivers/spi/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig -index 9e9e3ed..e6a04f8 100644 --- a/drivers/spi/Kconfig +++ b/drivers/spi/Kconfig -@@ -383,7 +383,7 @@ config SPI_RSPI +@@ -392,7 +392,7 @@ config SPI_RSPI config SPI_QUP tristate "Qualcomm SPI controller with QUP interface" @@ -25,6 +23,3 @@ index 9e9e3ed..e6a04f8 100644 help Qualcomm Universal Peripheral (QUP) core is an AHB slave that provides a common data path (an output FIFO and an input FIFO) --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0071-spi-qup-Depend-on-ARM-COMPILE_TEST-to-avoid-build-er.patch b/target/linux/ipq806x/patches/0071-spi-qup-Depend-on-ARM-COMPILE_TEST-to-avoid-build-er.patch index ce773da713..2711a2aa50 100644 --- a/target/linux/ipq806x/patches/0071-spi-qup-Depend-on-ARM-COMPILE_TEST-to-avoid-build-er.patch +++ b/target/linux/ipq806x/patches/0071-spi-qup-Depend-on-ARM-COMPILE_TEST-to-avoid-build-er.patch @@ -22,11 +22,9 @@ Signed-off-by: Mark Brown <broonie@linaro.org> drivers/spi/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig -index e6a04f8..2d9111c 100644 --- a/drivers/spi/Kconfig +++ b/drivers/spi/Kconfig -@@ -383,7 +383,7 @@ config SPI_RSPI +@@ -392,7 +392,7 @@ config SPI_RSPI config SPI_QUP tristate "Qualcomm SPI controller with QUP interface" @@ -35,6 +33,3 @@ index e6a04f8..2d9111c 100644 help Qualcomm Universal Peripheral (QUP) core is an AHB slave that provides a common data path (an output FIFO and an input FIFO) --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0072-spi-qup-Remove-module-version.patch b/target/linux/ipq806x/patches/0072-spi-qup-Remove-module-version.patch index fcdc517770..6708238ce5 100644 --- a/target/linux/ipq806x/patches/0072-spi-qup-Remove-module-version.patch +++ b/target/linux/ipq806x/patches/0072-spi-qup-Remove-module-version.patch @@ -13,16 +13,11 @@ Signed-off-by: Mark Brown <broonie@linaro.org> drivers/spi/spi-qup.c | 1 - 1 file changed, 1 deletion(-) -diff --git a/drivers/spi/spi-qup.c b/drivers/spi/spi-qup.c -index 886edb4..203f0d4 100644 --- a/drivers/spi/spi-qup.c +++ b/drivers/spi/spi-qup.c -@@ -819,5 +819,4 @@ static struct platform_driver spi_qup_driver = { +@@ -819,5 +819,4 @@ static struct platform_driver spi_qup_dr module_platform_driver(spi_qup_driver); MODULE_LICENSE("GPL v2"); -MODULE_VERSION("0.4"); MODULE_ALIAS("platform:spi_qup"); --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0073-spi-qup-Get-rid-of-using-struct-spi_qup_device.patch b/target/linux/ipq806x/patches/0073-spi-qup-Get-rid-of-using-struct-spi_qup_device.patch index 69b4609a5f..b527af9bd2 100644 --- a/target/linux/ipq806x/patches/0073-spi-qup-Get-rid-of-using-struct-spi_qup_device.patch +++ b/target/linux/ipq806x/patches/0073-spi-qup-Get-rid-of-using-struct-spi_qup_device.patch @@ -15,8 +15,6 @@ Signed-off-by: Mark Brown <broonie@linaro.org> drivers/spi/spi-qup.c | 61 ++++++++----------------------------------------- 1 file changed, 9 insertions(+), 52 deletions(-) -diff --git a/drivers/spi/spi-qup.c b/drivers/spi/spi-qup.c -index 203f0d4..b032e88 100644 --- a/drivers/spi/spi-qup.c +++ b/drivers/spi/spi-qup.c @@ -123,11 +123,6 @@ @@ -31,7 +29,7 @@ index 203f0d4..b032e88 100644 struct spi_qup { void __iomem *base; struct device *dev; -@@ -338,14 +333,13 @@ static irqreturn_t spi_qup_qup_irq(int irq, void *dev_id) +@@ -338,14 +333,13 @@ static irqreturn_t spi_qup_qup_irq(int i /* set clock freq ... bits per word */ @@ -49,7 +47,7 @@ index 203f0d4..b032e88 100644 dev_err(controller->dev, "too big size for loopback %d > %d\n", xfer->len, controller->in_fifo_sz); return -EIO; -@@ -399,12 +393,12 @@ static int spi_qup_io_config(struct spi_qup *controller, +@@ -399,12 +393,12 @@ static int spi_qup_io_config(struct spi_ config = readl_relaxed(controller->base + SPI_CONFIG); @@ -64,7 +62,7 @@ index 203f0d4..b032e88 100644 config &= ~SPI_CONFIG_INPUT_FIRST; else config |= SPI_CONFIG_INPUT_FIRST; -@@ -413,7 +407,7 @@ static int spi_qup_io_config(struct spi_qup *controller, +@@ -413,7 +407,7 @@ static int spi_qup_io_config(struct spi_ * HS_MODE improves signal stability for spi-clk high rates, * but is invalid in loop back mode. */ @@ -73,7 +71,7 @@ index 203f0d4..b032e88 100644 config |= SPI_CONFIG_HS_MODE; else config &= ~SPI_CONFIG_HS_MODE; -@@ -433,7 +427,6 @@ static int spi_qup_io_config(struct spi_qup *controller, +@@ -433,7 +427,6 @@ static int spi_qup_io_config(struct spi_ static void spi_qup_set_cs(struct spi_device *spi, bool enable) { struct spi_qup *controller = spi_master_get_devdata(spi->master); @@ -81,7 +79,7 @@ index 203f0d4..b032e88 100644 u32 iocontol, mask; -@@ -444,9 +437,9 @@ static void spi_qup_set_cs(struct spi_device *spi, bool enable) +@@ -444,9 +437,9 @@ static void spi_qup_set_cs(struct spi_de iocontol |= SPI_IO_C_FORCE_CS; iocontol &= ~SPI_IO_C_CS_SELECT_MASK; @@ -93,7 +91,7 @@ index 203f0d4..b032e88 100644 if (enable) iocontol |= mask; -@@ -461,11 +454,10 @@ static int spi_qup_transfer_one(struct spi_master *master, +@@ -461,11 +454,10 @@ static int spi_qup_transfer_one(struct s struct spi_transfer *xfer) { struct spi_qup *controller = spi_master_get_devdata(master); @@ -145,7 +143,7 @@ index 203f0d4..b032e88 100644 static int spi_qup_probe(struct platform_device *pdev) { struct spi_master *master; -@@ -561,7 +521,6 @@ static int spi_qup_probe(struct platform_device *pdev) +@@ -561,7 +521,6 @@ static int spi_qup_probe(struct platform return PTR_ERR(base); irq = platform_get_irq(pdev, 0); @@ -153,7 +151,7 @@ index 203f0d4..b032e88 100644 if (irq < 0) return irq; -@@ -617,8 +576,6 @@ static int spi_qup_probe(struct platform_device *pdev) +@@ -617,8 +576,6 @@ static int spi_qup_probe(struct platform master->num_chipselect = SPI_NUM_CHIPSELECTS; master->bits_per_word_mask = SPI_BPW_RANGE_MASK(4, 32); master->max_speed_hz = max_freq; @@ -162,6 +160,3 @@ index 203f0d4..b032e88 100644 master->set_cs = spi_qup_set_cs; master->transfer_one = spi_qup_transfer_one; master->dev.of_node = pdev->dev.of_node; --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0074-spi-qup-Depend-on-ARCH_QCOM.patch b/target/linux/ipq806x/patches/0074-spi-qup-Depend-on-ARCH_QCOM.patch index 9f279e07a3..7b924f125a 100644 --- a/target/linux/ipq806x/patches/0074-spi-qup-Depend-on-ARCH_QCOM.patch +++ b/target/linux/ipq806x/patches/0074-spi-qup-Depend-on-ARCH_QCOM.patch @@ -18,11 +18,9 @@ Signed-off-by: Mark Brown <broonie@linaro.org> drivers/spi/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig -index 2d9111c..a2d3570 100644 --- a/drivers/spi/Kconfig +++ b/drivers/spi/Kconfig -@@ -383,7 +383,7 @@ config SPI_RSPI +@@ -392,7 +392,7 @@ config SPI_RSPI config SPI_QUP tristate "Qualcomm SPI controller with QUP interface" @@ -31,6 +29,3 @@ index 2d9111c..a2d3570 100644 help Qualcomm Universal Peripheral (QUP) core is an AHB slave that provides a common data path (an output FIFO and an input FIFO) --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0075-spi-qup-Correct-selection-of-FIFO-Block-mode.patch b/target/linux/ipq806x/patches/0075-spi-qup-Correct-selection-of-FIFO-Block-mode.patch index f1071dbea1..0fd095a9b6 100644 --- a/target/linux/ipq806x/patches/0075-spi-qup-Correct-selection-of-FIFO-Block-mode.patch +++ b/target/linux/ipq806x/patches/0075-spi-qup-Correct-selection-of-FIFO-Block-mode.patch @@ -12,11 +12,9 @@ Signed-off-by: Mark Brown <broonie@linaro.org> drivers/spi/spi-qup.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/drivers/spi/spi-qup.c b/drivers/spi/spi-qup.c -index b032e88..65bf18e 100644 --- a/drivers/spi/spi-qup.c +++ b/drivers/spi/spi-qup.c -@@ -287,7 +287,7 @@ static irqreturn_t spi_qup_qup_irq(int irq, void *dev_id) +@@ -287,7 +287,7 @@ static irqreturn_t spi_qup_qup_irq(int i writel_relaxed(opflags, controller->base + QUP_OPERATIONAL); if (!xfer) { @@ -25,7 +23,7 @@ index b032e88..65bf18e 100644 qup_err, spi_err, opflags); return IRQ_HANDLED; } -@@ -366,7 +366,7 @@ static int spi_qup_io_config(struct spi_device *spi, struct spi_transfer *xfer) +@@ -366,7 +366,7 @@ static int spi_qup_io_config(struct spi_ n_words = xfer->len / w_size; controller->w_size = w_size; @@ -34,6 +32,3 @@ index b032e88..65bf18e 100644 mode = QUP_IO_M_MODE_FIFO; writel_relaxed(n_words, controller->base + QUP_MX_READ_CNT); writel_relaxed(n_words, controller->base + QUP_MX_WRITE_CNT); --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0078-clk-qcom-Consolidate-common-probe-code.patch b/target/linux/ipq806x/patches/0078-clk-qcom-Consolidate-common-probe-code.patch index c801ed5b35..dc0408c166 100644 --- a/target/linux/ipq806x/patches/0078-clk-qcom-Consolidate-common-probe-code.patch +++ b/target/linux/ipq806x/patches/0078-clk-qcom-Consolidate-common-probe-code.patch @@ -23,8 +23,6 @@ Signed-off-by: Kumar Gala <galak@codeaurora.org> create mode 100644 drivers/clk/qcom/common.c create mode 100644 drivers/clk/qcom/common.h -diff --git a/drivers/clk/qcom/Makefile b/drivers/clk/qcom/Makefile -index f60db2e..689e05b 100644 --- a/drivers/clk/qcom/Makefile +++ b/drivers/clk/qcom/Makefile @@ -1,5 +1,6 @@ @@ -34,9 +32,6 @@ index f60db2e..689e05b 100644 clk-qcom-y += clk-regmap.o clk-qcom-y += clk-pll.o clk-qcom-y += clk-rcg.o -diff --git a/drivers/clk/qcom/common.c b/drivers/clk/qcom/common.c -new file mode 100644 -index 0000000..86b45fb --- /dev/null +++ b/drivers/clk/qcom/common.c @@ -0,0 +1,99 @@ @@ -139,9 +134,6 @@ index 0000000..86b45fb + reset_controller_unregister(platform_get_drvdata(pdev)); +} +EXPORT_SYMBOL_GPL(qcom_cc_remove); -diff --git a/drivers/clk/qcom/common.h b/drivers/clk/qcom/common.h -new file mode 100644 -index 0000000..2c3cfc8 --- /dev/null +++ b/drivers/clk/qcom/common.h @@ -0,0 +1,34 @@ @@ -179,8 +171,6 @@ index 0000000..2c3cfc8 +extern void qcom_cc_remove(struct platform_device *pdev); + +#endif -diff --git a/drivers/clk/qcom/gcc-msm8660.c b/drivers/clk/qcom/gcc-msm8660.c -index bc0b7f1..44bc6fa 100644 --- a/drivers/clk/qcom/gcc-msm8660.c +++ b/drivers/clk/qcom/gcc-msm8660.c @@ -25,6 +25,7 @@ @@ -191,7 +181,7 @@ index bc0b7f1..44bc6fa 100644 #include "clk-regmap.h" #include "clk-pll.h" #include "clk-rcg.h" -@@ -2701,94 +2702,28 @@ static const struct regmap_config gcc_msm8660_regmap_config = { +@@ -2701,94 +2702,28 @@ static const struct regmap_config gcc_ms .fast_io = true, }; @@ -296,8 +286,6 @@ index bc0b7f1..44bc6fa 100644 return 0; } -diff --git a/drivers/clk/qcom/gcc-msm8960.c b/drivers/clk/qcom/gcc-msm8960.c -index fd446ab..633b019 100644 --- a/drivers/clk/qcom/gcc-msm8960.c +++ b/drivers/clk/qcom/gcc-msm8960.c @@ -25,6 +25,7 @@ @@ -308,7 +296,7 @@ index fd446ab..633b019 100644 #include "clk-regmap.h" #include "clk-pll.h" #include "clk-rcg.h" -@@ -2875,51 +2876,24 @@ static const struct regmap_config gcc_msm8960_regmap_config = { +@@ -2875,51 +2876,24 @@ static const struct regmap_config gcc_ms .fast_io = true, }; @@ -369,7 +357,7 @@ index fd446ab..633b019 100644 /* Temporary until RPM clocks supported */ clk = clk_register_fixed_rate(dev, "cxo", NULL, CLK_IS_ROOT, 19200000); -@@ -2930,39 +2904,12 @@ static int gcc_msm8960_probe(struct platform_device *pdev) +@@ -2930,39 +2904,12 @@ static int gcc_msm8960_probe(struct plat if (IS_ERR(clk)) return PTR_ERR(clk); @@ -411,8 +399,6 @@ index fd446ab..633b019 100644 return 0; } -diff --git a/drivers/clk/qcom/gcc-msm8974.c b/drivers/clk/qcom/gcc-msm8974.c -index 51d457e..0d1edc1 100644 --- a/drivers/clk/qcom/gcc-msm8974.c +++ b/drivers/clk/qcom/gcc-msm8974.c @@ -25,6 +25,7 @@ @@ -423,7 +409,7 @@ index 51d457e..0d1edc1 100644 #include "clk-regmap.h" #include "clk-pll.h" #include "clk-rcg.h" -@@ -2574,51 +2575,24 @@ static const struct regmap_config gcc_msm8974_regmap_config = { +@@ -2574,51 +2575,24 @@ static const struct regmap_config gcc_ms .fast_io = true, }; @@ -484,7 +470,7 @@ index 51d457e..0d1edc1 100644 /* Temporary until RPM clocks supported */ clk = clk_register_fixed_rate(dev, "xo", NULL, CLK_IS_ROOT, 19200000); -@@ -2631,39 +2605,12 @@ static int gcc_msm8974_probe(struct platform_device *pdev) +@@ -2631,39 +2605,12 @@ static int gcc_msm8974_probe(struct plat if (IS_ERR(clk)) return PTR_ERR(clk); @@ -526,8 +512,6 @@ index 51d457e..0d1edc1 100644 return 0; } -diff --git a/drivers/clk/qcom/mmcc-msm8960.c b/drivers/clk/qcom/mmcc-msm8960.c -index f9b59c7..12f3c0b 100644 --- a/drivers/clk/qcom/mmcc-msm8960.c +++ b/drivers/clk/qcom/mmcc-msm8960.c @@ -26,6 +26,7 @@ @@ -538,7 +522,7 @@ index f9b59c7..12f3c0b 100644 #include "clk-regmap.h" #include "clk-pll.h" #include "clk-rcg.h" -@@ -2222,85 +2223,28 @@ static const struct regmap_config mmcc_msm8960_regmap_config = { +@@ -2222,85 +2223,28 @@ static const struct regmap_config mmcc_m .fast_io = true, }; @@ -634,8 +618,6 @@ index f9b59c7..12f3c0b 100644 return 0; } -diff --git a/drivers/clk/qcom/mmcc-msm8974.c b/drivers/clk/qcom/mmcc-msm8974.c -index c957745..60b7c24 100644 --- a/drivers/clk/qcom/mmcc-msm8974.c +++ b/drivers/clk/qcom/mmcc-msm8974.c @@ -25,6 +25,7 @@ @@ -646,7 +628,7 @@ index c957745..60b7c24 100644 #include "clk-regmap.h" #include "clk-pll.h" #include "clk-rcg.h" -@@ -2524,88 +2525,39 @@ static const struct regmap_config mmcc_msm8974_regmap_config = { +@@ -2527,88 +2528,39 @@ static const struct regmap_config mmcc_m .fast_io = true, }; @@ -750,6 +732,3 @@ index c957745..60b7c24 100644 return 0; } --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0079-clk-qcom-Add-basic-support-for-APQ8064-global-clock-.patch b/target/linux/ipq806x/patches/0079-clk-qcom-Add-basic-support-for-APQ8064-global-clock-.patch index d83d5d9696..307e797471 100644 --- a/target/linux/ipq806x/patches/0079-clk-qcom-Add-basic-support-for-APQ8064-global-clock-.patch +++ b/target/linux/ipq806x/patches/0079-clk-qcom-Add-basic-support-for-APQ8064-global-clock-.patch @@ -21,11 +21,9 @@ Signed-off-by: Mike Turquette <mturquette@linaro.org> drivers/clk/qcom/gcc-msm8960.c | 30 ++++++++++++++++++-- 3 files changed, 30 insertions(+), 5 deletions(-) -diff --git a/Documentation/devicetree/bindings/clock/qcom,gcc.txt b/Documentation/devicetree/bindings/clock/qcom,gcc.txt -index 767401f..7b7104e 100644 --- a/Documentation/devicetree/bindings/clock/qcom,gcc.txt +++ b/Documentation/devicetree/bindings/clock/qcom,gcc.txt -@@ -4,6 +4,7 @@ Qualcomm Global Clock & Reset Controller Binding +@@ -4,6 +4,7 @@ Qualcomm Global Clock & Reset Controller Required properties : - compatible : shall contain only one of the following: @@ -33,8 +31,6 @@ index 767401f..7b7104e 100644 "qcom,gcc-msm8660" "qcom,gcc-msm8960" "qcom,gcc-msm8974" -diff --git a/drivers/clk/qcom/Kconfig b/drivers/clk/qcom/Kconfig -index 995bcfa..7f696b7 100644 --- a/drivers/clk/qcom/Kconfig +++ b/drivers/clk/qcom/Kconfig @@ -13,10 +13,10 @@ config MSM_GCC_8660 @@ -50,8 +46,6 @@ index 995bcfa..7f696b7 100644 Say Y if you want to use peripheral devices such as UART, SPI, i2c, USB, SD/eMMC, SATA, PCIe, etc. -diff --git a/drivers/clk/qcom/gcc-msm8960.c b/drivers/clk/qcom/gcc-msm8960.c -index 633b019..8e2b6dd 100644 --- a/drivers/clk/qcom/gcc-msm8960.c +++ b/drivers/clk/qcom/gcc-msm8960.c @@ -1,5 +1,5 @@ @@ -61,7 +55,7 @@ index 633b019..8e2b6dd 100644 * * This software is licensed under the terms of the GNU General Public * License version 2, as published by the Free Software Foundation, and -@@ -2868,6 +2868,16 @@ static const struct qcom_reset_map gcc_msm8960_resets[] = { +@@ -2868,6 +2868,16 @@ static const struct qcom_reset_map gcc_m [RIVA_RESET] = { 0x35e0 }, }; @@ -78,7 +72,7 @@ index 633b019..8e2b6dd 100644 static const struct regmap_config gcc_msm8960_regmap_config = { .reg_bits = 32, .reg_stride = 4, -@@ -2884,8 +2894,17 @@ static const struct qcom_cc_desc gcc_msm8960_desc = { +@@ -2884,8 +2894,17 @@ static const struct qcom_cc_desc gcc_msm .num_resets = ARRAY_SIZE(gcc_msm8960_resets), }; @@ -97,7 +91,7 @@ index 633b019..8e2b6dd 100644 { } }; MODULE_DEVICE_TABLE(of, gcc_msm8960_match_table); -@@ -2894,6 +2913,11 @@ static int gcc_msm8960_probe(struct platform_device *pdev) +@@ -2894,6 +2913,11 @@ static int gcc_msm8960_probe(struct plat { struct clk *clk; struct device *dev = &pdev->dev; @@ -109,7 +103,7 @@ index 633b019..8e2b6dd 100644 /* Temporary until RPM clocks supported */ clk = clk_register_fixed_rate(dev, "cxo", NULL, CLK_IS_ROOT, 19200000); -@@ -2904,7 +2928,7 @@ static int gcc_msm8960_probe(struct platform_device *pdev) +@@ -2904,7 +2928,7 @@ static int gcc_msm8960_probe(struct plat if (IS_ERR(clk)) return PTR_ERR(clk); @@ -118,6 +112,3 @@ index 633b019..8e2b6dd 100644 } static int gcc_msm8960_remove(struct platform_device *pdev) --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0080-clk-qcom-Various-fixes-for-MSM8960-s-global-clock-co.patch b/target/linux/ipq806x/patches/0080-clk-qcom-Various-fixes-for-MSM8960-s-global-clock-co.patch index 3cc5bf828a..9731771fdc 100644 --- a/target/linux/ipq806x/patches/0080-clk-qcom-Various-fixes-for-MSM8960-s-global-clock-co.patch +++ b/target/linux/ipq806x/patches/0080-clk-qcom-Various-fixes-for-MSM8960-s-global-clock-co.patch @@ -22,11 +22,9 @@ Signed-off-by: Mike Turquette <mturquette@linaro.org> include/dt-bindings/reset/qcom,gcc-msm8960.h | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) -diff --git a/drivers/clk/qcom/gcc-msm8960.c b/drivers/clk/qcom/gcc-msm8960.c -index 8e2b6dd..f4ffd91 100644 --- a/drivers/clk/qcom/gcc-msm8960.c +++ b/drivers/clk/qcom/gcc-msm8960.c -@@ -2810,7 +2810,7 @@ static const struct qcom_reset_map gcc_msm8960_resets[] = { +@@ -2810,7 +2810,7 @@ static const struct qcom_reset_map gcc_m [PPSS_PROC_RESET] = { 0x2594, 1 }, [PPSS_RESET] = { 0x2594}, [DMA_BAM_RESET] = { 0x25c0, 7 }, @@ -35,7 +33,7 @@ index 8e2b6dd..f4ffd91 100644 [SLIMBUS_H_RESET] = { 0x2620, 7 }, [SFAB_CFPB_M_RESET] = { 0x2680, 7 }, [SFAB_CFPB_S_RESET] = { 0x26c0, 7 }, -@@ -2823,7 +2823,7 @@ static const struct qcom_reset_map gcc_msm8960_resets[] = { +@@ -2823,7 +2823,7 @@ static const struct qcom_reset_map gcc_m [SFAB_SFPB_M_RESET] = { 0x2780, 7 }, [SFAB_SFPB_S_RESET] = { 0x27a0, 7 }, [RPM_PROC_RESET] = { 0x27c0, 7 }, @@ -44,8 +42,6 @@ index 8e2b6dd..f4ffd91 100644 [SDC1_RESET] = { 0x2830 }, [SDC2_RESET] = { 0x2850 }, [SDC3_RESET] = { 0x2870 }, -diff --git a/include/dt-bindings/clock/qcom,gcc-msm8960.h b/include/dt-bindings/clock/qcom,gcc-msm8960.h -index 03bbf49..f9f5471 100644 --- a/include/dt-bindings/clock/qcom,gcc-msm8960.h +++ b/include/dt-bindings/clock/qcom,gcc-msm8960.h @@ -51,7 +51,7 @@ @@ -83,8 +79,6 @@ index 03bbf49..f9f5471 100644 #define SATA_RXOOB_CLK 239 #define SATA_PMALIVE_CLK 240 #define SATA_PHY_REF_CLK 241 -diff --git a/include/dt-bindings/reset/qcom,gcc-msm8960.h b/include/dt-bindings/reset/qcom,gcc-msm8960.h -index a840e68..07edd0e 100644 --- a/include/dt-bindings/reset/qcom,gcc-msm8960.h +++ b/include/dt-bindings/reset/qcom,gcc-msm8960.h @@ -58,7 +58,7 @@ @@ -96,6 +90,3 @@ index a840e68..07edd0e 100644 #define SLIMBUS_H_RESET 45 #define SFAB_CFPB_M_RESET 46 #define SFAB_CFPB_S_RESET 47 --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0081-ARM-config-Add-qcom_defconfig.patch b/target/linux/ipq806x/patches/0081-ARM-config-Add-qcom_defconfig.patch index f022463d28..dd87c1fb66 100644 --- a/target/linux/ipq806x/patches/0081-ARM-config-Add-qcom_defconfig.patch +++ b/target/linux/ipq806x/patches/0081-ARM-config-Add-qcom_defconfig.patch @@ -15,9 +15,6 @@ Signed-off-by: Kumar Gala <galak@codeaurora.org> 1 file changed, 164 insertions(+) create mode 100644 arch/arm/configs/qcom_defconfig -diff --git a/arch/arm/configs/qcom_defconfig b/arch/arm/configs/qcom_defconfig -new file mode 100644 -index 0000000..bfed753 --- /dev/null +++ b/arch/arm/configs/qcom_defconfig @@ -0,0 +1,164 @@ @@ -185,6 +182,3 @@ index 0000000..bfed753 +# CONFIG_DETECT_HUNG_TASK is not set +# CONFIG_SCHED_DEBUG is not set +CONFIG_TIMER_STATS=y --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0082-ARM-qcom-Enable-GSBI-driver-in-defconfig.patch b/target/linux/ipq806x/patches/0082-ARM-qcom-Enable-GSBI-driver-in-defconfig.patch index 7bcd2463da..180f102334 100644 --- a/target/linux/ipq806x/patches/0082-ARM-qcom-Enable-GSBI-driver-in-defconfig.patch +++ b/target/linux/ipq806x/patches/0082-ARM-qcom-Enable-GSBI-driver-in-defconfig.patch @@ -8,8 +8,6 @@ Signed-off-by: Kumar Gala <galak@codeaurora.org> arch/arm/configs/qcom_defconfig | 1 + 1 file changed, 1 insertion(+) -diff --git a/arch/arm/configs/qcom_defconfig b/arch/arm/configs/qcom_defconfig -index bfed753..42ebd72 100644 --- a/arch/arm/configs/qcom_defconfig +++ b/arch/arm/configs/qcom_defconfig @@ -131,6 +131,7 @@ CONFIG_RTC_CLASS=y @@ -20,6 +18,3 @@ index bfed753..42ebd72 100644 CONFIG_COMMON_CLK_QCOM=y CONFIG_MSM_GCC_8660=y CONFIG_MSM_MMCC_8960=y --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0083-soc-Introduce-drivers-soc-place-holder-for-SOC-speci.patch b/target/linux/ipq806x/patches/0083-soc-Introduce-drivers-soc-place-holder-for-SOC-speci.patch index 837ec9d0c5..5f173fb520 100644 --- a/target/linux/ipq806x/patches/0083-soc-Introduce-drivers-soc-place-holder-for-SOC-speci.patch +++ b/target/linux/ipq806x/patches/0083-soc-Introduce-drivers-soc-place-holder-for-SOC-speci.patch @@ -27,8 +27,6 @@ Signed-off-by: Kumar Gala <galak@codeaurora.org> 3 files changed, 8 insertions(+) create mode 100644 drivers/soc/Kconfig -diff --git a/drivers/Kconfig b/drivers/Kconfig -index e0a4ae6..a299cbd 100644 --- a/drivers/Kconfig +++ b/drivers/Kconfig @@ -132,6 +132,8 @@ source "drivers/staging/Kconfig" @@ -40,8 +38,6 @@ index e0a4ae6..a299cbd 100644 source "drivers/clk/Kconfig" source "drivers/hwspinlock/Kconfig" -diff --git a/drivers/Makefile b/drivers/Makefile -index 3d6de8b..4c2bdc1 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -33,6 +33,9 @@ obj-y += amba/ @@ -54,15 +50,9 @@ index 3d6de8b..4c2bdc1 100644 obj-$(CONFIG_VIRTIO) += virtio/ obj-$(CONFIG_XEN) += xen/ -diff --git a/drivers/soc/Kconfig b/drivers/soc/Kconfig -new file mode 100644 -index 0000000..339baa8 --- /dev/null +++ b/drivers/soc/Kconfig @@ -0,0 +1,3 @@ +menu "SOC (System On Chip) specific Drivers" + +endmenu --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0084-soc-qcom-Add-GSBI-driver.patch b/target/linux/ipq806x/patches/0084-soc-qcom-Add-GSBI-driver.patch index f52255826c..545c4be52d 100644 --- a/target/linux/ipq806x/patches/0084-soc-qcom-Add-GSBI-driver.patch +++ b/target/linux/ipq806x/patches/0084-soc-qcom-Add-GSBI-driver.patch @@ -22,8 +22,6 @@ Signed-off-by: Kumar Gala <galak@codeaurora.org> create mode 100644 drivers/soc/qcom/Makefile create mode 100644 drivers/soc/qcom/qcom_gsbi.c -diff --git a/drivers/soc/Kconfig b/drivers/soc/Kconfig -index 339baa8..c854385 100644 --- a/drivers/soc/Kconfig +++ b/drivers/soc/Kconfig @@ -1,3 +1,5 @@ @@ -32,9 +30,6 @@ index 339baa8..c854385 100644 +source "drivers/soc/qcom/Kconfig" + endmenu -diff --git a/drivers/soc/Makefile b/drivers/soc/Makefile -new file mode 100644 -index 0000000..0f7c447 --- /dev/null +++ b/drivers/soc/Makefile @@ -0,0 +1,5 @@ @@ -43,9 +38,6 @@ index 0000000..0f7c447 +# + +obj-$(CONFIG_ARCH_QCOM) += qcom/ -diff --git a/drivers/soc/qcom/Kconfig b/drivers/soc/qcom/Kconfig -new file mode 100644 -index 0000000..7bd2c94 --- /dev/null +++ b/drivers/soc/qcom/Kconfig @@ -0,0 +1,11 @@ @@ -60,16 +52,10 @@ index 0000000..7bd2c94 + functions for connecting the underlying serial UART, SPI, and I2C + devices to the output pins. + -diff --git a/drivers/soc/qcom/Makefile b/drivers/soc/qcom/Makefile -new file mode 100644 -index 0000000..4389012 --- /dev/null +++ b/drivers/soc/qcom/Makefile @@ -0,0 +1 @@ +obj-$(CONFIG_QCOM_GSBI) += qcom_gsbi.o -diff --git a/drivers/soc/qcom/qcom_gsbi.c b/drivers/soc/qcom/qcom_gsbi.c -new file mode 100644 -index 0000000..061dd06 --- /dev/null +++ b/drivers/soc/qcom/qcom_gsbi.c @@ -0,0 +1,84 @@ @@ -157,6 +143,3 @@ index 0000000..061dd06 +MODULE_AUTHOR("Andy Gross <agross@codeaurora.org>"); +MODULE_DESCRIPTION("QCOM GSBI driver"); +MODULE_LICENSE("GPL v2"); --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0085-soc-qcom-fix-of_device_id-table.patch b/target/linux/ipq806x/patches/0085-soc-qcom-fix-of_device_id-table.patch index c619ecef9d..3c58107dd3 100644 --- a/target/linux/ipq806x/patches/0085-soc-qcom-fix-of_device_id-table.patch +++ b/target/linux/ipq806x/patches/0085-soc-qcom-fix-of_device_id-table.patch @@ -11,11 +11,9 @@ Signed-off-by: Arnd Bergmann <arnd@arndb.de> drivers/soc/qcom/qcom_gsbi.c | 1 + 1 file changed, 1 insertion(+) -diff --git a/drivers/soc/qcom/qcom_gsbi.c b/drivers/soc/qcom/qcom_gsbi.c -index 061dd06..447458e 100644 --- a/drivers/soc/qcom/qcom_gsbi.c +++ b/drivers/soc/qcom/qcom_gsbi.c -@@ -64,6 +64,7 @@ static int gsbi_probe(struct platform_device *pdev) +@@ -64,6 +64,7 @@ static int gsbi_probe(struct platform_de static const struct of_device_id gsbi_dt_match[] = { { .compatible = "qcom,gsbi-v1.0.0", }, @@ -23,6 +21,3 @@ index 061dd06..447458e 100644 }; MODULE_DEVICE_TABLE(of, gsbi_dt_match); --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0086-msm_serial-Add-support-for-poll_-get-put-_char.patch b/target/linux/ipq806x/patches/0086-msm_serial-Add-support-for-poll_-get-put-_char.patch index afc293bfbd..68204c5347 100644 --- a/target/linux/ipq806x/patches/0086-msm_serial-Add-support-for-poll_-get-put-_char.patch +++ b/target/linux/ipq806x/patches/0086-msm_serial-Add-support-for-poll_-get-put-_char.patch @@ -14,8 +14,6 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> drivers/tty/serial/msm_serial.h | 9 +++ 2 files changed, 146 insertions(+), 3 deletions(-) -diff --git a/drivers/tty/serial/msm_serial.c b/drivers/tty/serial/msm_serial.c -index b5d779c..053b98e 100644 --- a/drivers/tty/serial/msm_serial.c +++ b/drivers/tty/serial/msm_serial.c @@ -39,6 +39,13 @@ @@ -32,7 +30,7 @@ index b5d779c..053b98e 100644 struct msm_port { struct uart_port uart; char name[16]; -@@ -309,6 +316,8 @@ static unsigned int msm_get_mctrl(struct uart_port *port) +@@ -309,6 +316,8 @@ static unsigned int msm_get_mctrl(struct static void msm_reset(struct uart_port *port) { @@ -41,7 +39,7 @@ index b5d779c..053b98e 100644 /* reset everything */ msm_write(port, UART_CR_CMD_RESET_RX, UART_CR); msm_write(port, UART_CR_CMD_RESET_TX, UART_CR); -@@ -316,6 +325,10 @@ static void msm_reset(struct uart_port *port) +@@ -316,6 +325,10 @@ static void msm_reset(struct uart_port * msm_write(port, UART_CR_CMD_RESET_BREAK_INT, UART_CR); msm_write(port, UART_CR_CMD_RESET_CTS, UART_CR); msm_write(port, UART_CR_CMD_SET_RFR, UART_CR); @@ -52,7 +50,7 @@ index b5d779c..053b98e 100644 } static void msm_set_mctrl(struct uart_port *port, unsigned int mctrl) -@@ -711,6 +724,117 @@ static void msm_power(struct uart_port *port, unsigned int state, +@@ -711,6 +724,117 @@ static void msm_power(struct uart_port * } } @@ -182,7 +180,7 @@ index b5d779c..053b98e 100644 }; static struct msm_port msm_uart_ports[] = { -@@ -900,7 +1029,10 @@ static struct uart_driver msm_uart_driver = { +@@ -900,7 +1029,10 @@ static struct uart_driver msm_uart_drive static atomic_t msm_uart_next_id = ATOMIC_INIT(0); static const struct of_device_id msm_uartdm_table[] = { @@ -194,7 +192,7 @@ index b5d779c..053b98e 100644 { } }; -@@ -909,6 +1041,7 @@ static int __init msm_serial_probe(struct platform_device *pdev) +@@ -909,6 +1041,7 @@ static int __init msm_serial_probe(struc struct msm_port *msm_port; struct resource *resource; struct uart_port *port; @@ -202,7 +200,7 @@ index b5d779c..053b98e 100644 int irq; if (pdev->id == -1) -@@ -923,8 +1056,9 @@ static int __init msm_serial_probe(struct platform_device *pdev) +@@ -923,8 +1056,9 @@ static int __init msm_serial_probe(struc port->dev = &pdev->dev; msm_port = UART_TO_MSM(port); @@ -214,8 +212,6 @@ index b5d779c..053b98e 100644 else msm_port->is_uartdm = 0; -diff --git a/drivers/tty/serial/msm_serial.h b/drivers/tty/serial/msm_serial.h -index 469fda5..1e9b68b 100644 --- a/drivers/tty/serial/msm_serial.h +++ b/drivers/tty/serial/msm_serial.h @@ -59,6 +59,7 @@ @@ -241,6 +237,3 @@ index 469fda5..1e9b68b 100644 #define UARTDM_DMRX 0x34 #define UARTDM_NCF_TX 0x40 #define UARTDM_RX_TOTAL_SNAP 0x38 --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0087-tty-serial-msm-Remove-direct-access-to-GSBI.patch b/target/linux/ipq806x/patches/0087-tty-serial-msm-Remove-direct-access-to-GSBI.patch index 8cbb52a903..9eb71382e4 100644 --- a/target/linux/ipq806x/patches/0087-tty-serial-msm-Remove-direct-access-to-GSBI.patch +++ b/target/linux/ipq806x/patches/0087-tty-serial-msm-Remove-direct-access-to-GSBI.patch @@ -13,8 +13,6 @@ Signed-off-by: Kumar Gala <galak@codeaurora.org> drivers/tty/serial/msm_serial.h | 5 ---- 2 files changed, 2 insertions(+), 51 deletions(-) -diff --git a/drivers/tty/serial/msm_serial.c b/drivers/tty/serial/msm_serial.c -index 053b98e..778e376 100644 --- a/drivers/tty/serial/msm_serial.c +++ b/drivers/tty/serial/msm_serial.c @@ -52,7 +52,6 @@ struct msm_port { @@ -25,7 +23,7 @@ index 053b98e..778e376 100644 int is_uartdm; unsigned int old_snap_state; }; -@@ -599,9 +598,7 @@ static const char *msm_type(struct uart_port *port) +@@ -599,9 +598,7 @@ static const char *msm_type(struct uart_ static void msm_release_port(struct uart_port *port) { struct platform_device *pdev = to_platform_device(port->dev); @@ -35,7 +33,7 @@ index 053b98e..778e376 100644 resource_size_t size; uart_resource = platform_get_resource(pdev, IORESOURCE_MEM, 0); -@@ -612,28 +609,12 @@ static void msm_release_port(struct uart_port *port) +@@ -612,28 +609,12 @@ static void msm_release_port(struct uart release_mem_region(port->mapbase, size); iounmap(port->membase); port->membase = NULL; @@ -64,7 +62,7 @@ index 053b98e..778e376 100644 resource_size_t size; int ret; -@@ -652,30 +633,8 @@ static int msm_request_port(struct uart_port *port) +@@ -652,30 +633,8 @@ static int msm_request_port(struct uart_ goto fail_release_port; } @@ -103,7 +101,7 @@ index 053b98e..778e376 100644 int ret; if (flags & UART_CONFIG_TYPE) { port->type = PORT_MSM; -@@ -691,9 +649,6 @@ static void msm_config_port(struct uart_port *port, int flags) +@@ -691,9 +649,6 @@ static void msm_config_port(struct uart_ if (ret) return; } @@ -113,7 +111,7 @@ index 053b98e..778e376 100644 } static int msm_verify_port(struct uart_port *port, struct serial_struct *ser) -@@ -1110,6 +1065,7 @@ static struct of_device_id msm_match_table[] = { +@@ -1110,6 +1065,7 @@ static struct of_device_id msm_match_tab static struct platform_driver msm_platform_driver = { .remove = msm_serial_remove, @@ -130,8 +128,6 @@ index 053b98e..778e376 100644 if (unlikely(ret)) uart_unregister_driver(&msm_uart_driver); -diff --git a/drivers/tty/serial/msm_serial.h b/drivers/tty/serial/msm_serial.h -index 1e9b68b..d98d45e 100644 --- a/drivers/tty/serial/msm_serial.h +++ b/drivers/tty/serial/msm_serial.h @@ -109,11 +109,6 @@ @@ -146,6 +142,3 @@ index 1e9b68b..d98d45e 100644 #define UARTDM_RXFS 0x50 #define UARTDM_RXFS_BUF_SHIFT 0x7 #define UARTDM_RXFS_BUF_MASK 0x7 --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0088-soc-qcom-Add-device-tree-binding-for-GSBI.patch b/target/linux/ipq806x/patches/0088-soc-qcom-Add-device-tree-binding-for-GSBI.patch index 39762c1be7..523d5cbabf 100644 --- a/target/linux/ipq806x/patches/0088-soc-qcom-Add-device-tree-binding-for-GSBI.patch +++ b/target/linux/ipq806x/patches/0088-soc-qcom-Add-device-tree-binding-for-GSBI.patch @@ -14,9 +14,6 @@ Signed-off-by: Kumar Gala <galak@codeaurora.org> create mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,gsbi.txt create mode 100644 include/dt-bindings/soc/qcom,gsbi.h -diff --git a/Documentation/devicetree/bindings/soc/qcom/qcom,gsbi.txt b/Documentation/devicetree/bindings/soc/qcom/qcom,gsbi.txt -new file mode 100644 -index 0000000..4ce24d4 --- /dev/null +++ b/Documentation/devicetree/bindings/soc/qcom/qcom,gsbi.txt @@ -0,0 +1,78 @@ @@ -98,9 +95,6 @@ index 0000000..4ce24d4 + }; + }; + -diff --git a/include/dt-bindings/soc/qcom,gsbi.h b/include/dt-bindings/soc/qcom,gsbi.h -new file mode 100644 -index 0000000..7ac4292 --- /dev/null +++ b/include/dt-bindings/soc/qcom,gsbi.h @@ -0,0 +1,26 @@ @@ -130,6 +124,3 @@ index 0000000..7ac4292 +#define GSBI_CRCI_UART 1 + +#endif --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0089-ARM-dts-MSM8974-Add-pinctrl-node.patch b/target/linux/ipq806x/patches/0089-ARM-dts-MSM8974-Add-pinctrl-node.patch index 1663fbe906..ca064288a9 100644 --- a/target/linux/ipq806x/patches/0089-ARM-dts-MSM8974-Add-pinctrl-node.patch +++ b/target/linux/ipq806x/patches/0089-ARM-dts-MSM8974-Add-pinctrl-node.patch @@ -13,8 +13,6 @@ Signed-off-by: Kumar Gala <galak@codeaurora.org> arch/arm/boot/dts/qcom-msm8974.dtsi | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) -diff --git a/arch/arm/boot/dts/qcom-msm8974.dtsi b/arch/arm/boot/dts/qcom-msm8974.dtsi -index f687239..23aa387 100644 --- a/arch/arm/boot/dts/qcom-msm8974.dtsi +++ b/arch/arm/boot/dts/qcom-msm8974.dtsi @@ -198,5 +198,34 @@ @@ -52,6 +50,3 @@ index f687239..23aa387 100644 + }; }; }; --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0090-ARM-dts-msm-Add-SDHC-controller-nodes-for-MSM8974-an.patch b/target/linux/ipq806x/patches/0090-ARM-dts-msm-Add-SDHC-controller-nodes-for-MSM8974-an.patch index c16258ce32..7788f8a5df 100644 --- a/target/linux/ipq806x/patches/0090-ARM-dts-msm-Add-SDHC-controller-nodes-for-MSM8974-an.patch +++ b/target/linux/ipq806x/patches/0090-ARM-dts-msm-Add-SDHC-controller-nodes-for-MSM8974-an.patch @@ -15,8 +15,6 @@ Signed-off-by: Kumar Gala <galak@codeaurora.org> arch/arm/boot/dts/qcom-msm8974.dtsi | 22 ++++++++++++++++++++++ 2 files changed, 35 insertions(+) -diff --git a/arch/arm/boot/dts/qcom-apq8074-dragonboard.dts b/arch/arm/boot/dts/qcom-apq8074-dragonboard.dts -index 13ac3e2..92320c4 100644 --- a/arch/arm/boot/dts/qcom-apq8074-dragonboard.dts +++ b/arch/arm/boot/dts/qcom-apq8074-dragonboard.dts @@ -3,4 +3,17 @@ @@ -37,8 +35,6 @@ index 13ac3e2..92320c4 100644 + }; + }; }; -diff --git a/arch/arm/boot/dts/qcom-msm8974.dtsi b/arch/arm/boot/dts/qcom-msm8974.dtsi -index 23aa387..c530a33 100644 --- a/arch/arm/boot/dts/qcom-msm8974.dtsi +++ b/arch/arm/boot/dts/qcom-msm8974.dtsi @@ -192,6 +192,28 @@ @@ -70,6 +66,3 @@ index 23aa387..c530a33 100644 rng@f9bff000 { compatible = "qcom,prng"; reg = <0xf9bff000 0x200>; --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0091-ARM-dts-qcom-Update-msm8974-apq8074-device-trees.patch b/target/linux/ipq806x/patches/0091-ARM-dts-qcom-Update-msm8974-apq8074-device-trees.patch index dcaaa3df74..0f6764d22b 100644 --- a/target/linux/ipq806x/patches/0091-ARM-dts-qcom-Update-msm8974-apq8074-device-trees.patch +++ b/target/linux/ipq806x/patches/0091-ARM-dts-qcom-Update-msm8974-apq8074-device-trees.patch @@ -18,8 +18,6 @@ Signed-off-by: Kumar Gala <galak@codeaurora.org> arch/arm/boot/dts/qcom-msm8974.dtsi | 49 +++++++++--------------- 2 files changed, 45 insertions(+), 32 deletions(-) -diff --git a/arch/arm/boot/dts/qcom-apq8074-dragonboard.dts b/arch/arm/boot/dts/qcom-apq8074-dragonboard.dts -index 92320c4..b4dfb01 100644 --- a/arch/arm/boot/dts/qcom-apq8074-dragonboard.dts +++ b/arch/arm/boot/dts/qcom-apq8074-dragonboard.dts @@ -4,7 +4,11 @@ @@ -63,8 +61,6 @@ index 92320c4..b4dfb01 100644 + }; }; }; -diff --git a/arch/arm/boot/dts/qcom-msm8974.dtsi b/arch/arm/boot/dts/qcom-msm8974.dtsi -index c530a33..69dca2a 100644 --- a/arch/arm/boot/dts/qcom-msm8974.dtsi +++ b/arch/arm/boot/dts/qcom-msm8974.dtsi @@ -13,10 +13,10 @@ @@ -181,6 +177,3 @@ index c530a33..69dca2a 100644 }; }; }; --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0092-ARM-dts-qcom-Update-msm8960-device-trees.patch b/target/linux/ipq806x/patches/0092-ARM-dts-qcom-Update-msm8960-device-trees.patch index 5c0c7a5d2b..5b24b4a9bb 100644 --- a/target/linux/ipq806x/patches/0092-ARM-dts-qcom-Update-msm8960-device-trees.patch +++ b/target/linux/ipq806x/patches/0092-ARM-dts-qcom-Update-msm8960-device-trees.patch @@ -17,8 +17,6 @@ Signed-off-by: Kumar Gala <galak@codeaurora.org> arch/arm/boot/dts/qcom-msm8960.dtsi | 176 ++++++++++++++++++-------------- 2 files changed, 108 insertions(+), 78 deletions(-) -diff --git a/arch/arm/boot/dts/qcom-msm8960-cdp.dts b/arch/arm/boot/dts/qcom-msm8960-cdp.dts -index a58fb88..8f75cc4 100644 --- a/arch/arm/boot/dts/qcom-msm8960-cdp.dts +++ b/arch/arm/boot/dts/qcom-msm8960-cdp.dts @@ -3,4 +3,14 @@ @@ -36,8 +34,6 @@ index a58fb88..8f75cc4 100644 + }; + }; }; -diff --git a/arch/arm/boot/dts/qcom-msm8960.dtsi b/arch/arm/boot/dts/qcom-msm8960.dtsi -index 997b7b9..5303e53 100644 --- a/arch/arm/boot/dts/qcom-msm8960.dtsi +++ b/arch/arm/boot/dts/qcom-msm8960.dtsi @@ -3,6 +3,7 @@ @@ -263,6 +259,3 @@ index 997b7b9..5303e53 100644 + }; }; }; --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0093-ARM-dts-qcom-Update-msm8660-device-trees.patch b/target/linux/ipq806x/patches/0093-ARM-dts-qcom-Update-msm8660-device-trees.patch index 72f9939a08..8359faffaa 100644 --- a/target/linux/ipq806x/patches/0093-ARM-dts-qcom-Update-msm8660-device-trees.patch +++ b/target/linux/ipq806x/patches/0093-ARM-dts-qcom-Update-msm8660-device-trees.patch @@ -15,8 +15,6 @@ Signed-off-by: Kumar Gala <galak@codeaurora.org> arch/arm/boot/dts/qcom-msm8660.dtsi | 115 ++++++++++++++++++------------- 2 files changed, 78 insertions(+), 47 deletions(-) -diff --git a/arch/arm/boot/dts/qcom-msm8660-surf.dts b/arch/arm/boot/dts/qcom-msm8660-surf.dts -index 169bad9..45180ad 100644 --- a/arch/arm/boot/dts/qcom-msm8660-surf.dts +++ b/arch/arm/boot/dts/qcom-msm8660-surf.dts @@ -3,4 +3,14 @@ @@ -34,8 +32,6 @@ index 169bad9..45180ad 100644 + }; + }; }; -diff --git a/arch/arm/boot/dts/qcom-msm8660.dtsi b/arch/arm/boot/dts/qcom-msm8660.dtsi -index c52a9e9..53837aaa2f 100644 --- a/arch/arm/boot/dts/qcom-msm8660.dtsi +++ b/arch/arm/boot/dts/qcom-msm8660.dtsi @@ -3,6 +3,7 @@ @@ -83,6 +79,14 @@ index c52a9e9..53837aaa2f 100644 + #size-cells = <1>; + ranges; + compatible = "simple-bus"; ++ ++ intc: interrupt-controller@2080000 { ++ compatible = "qcom,msm-8660-qgic"; ++ interrupt-controller; ++ #interrupt-cells = <3>; ++ reg = < 0x02080000 0x1000 >, ++ < 0x02081000 0x1000 >; ++ }; - timer@2000000 { - compatible = "qcom,scss-timer", "qcom,msm-timer"; @@ -94,24 +98,6 @@ index c52a9e9..53837aaa2f 100644 - <32768>; - cpu-offset = <0x40000>; - }; -+ intc: interrupt-controller@2080000 { -+ compatible = "qcom,msm-8660-qgic"; -+ interrupt-controller; -+ #interrupt-cells = <3>; -+ reg = < 0x02080000 0x1000 >, -+ < 0x02081000 0x1000 >; -+ }; - -- msmgpio: gpio@800000 { -- compatible = "qcom,msm-gpio"; -- reg = <0x00800000 0x4000>; -- gpio-controller; -- #gpio-cells = <2>; -- ngpio = <173>; -- interrupts = <0 16 0x4>; -- interrupt-controller; -- #interrupt-cells = <2>; -- }; + timer@2000000 { + compatible = "qcom,scss-timer", "qcom,msm-timer"; + interrupts = <1 0 0x301>, @@ -123,11 +109,15 @@ index c52a9e9..53837aaa2f 100644 + cpu-offset = <0x40000>; + }; -- gcc: clock-controller@900000 { -- compatible = "qcom,gcc-msm8660"; -- #clock-cells = <1>; -- #reset-cells = <1>; -- reg = <0x900000 0x4000>; +- msmgpio: gpio@800000 { +- compatible = "qcom,msm-gpio"; +- reg = <0x00800000 0x4000>; +- gpio-controller; +- #gpio-cells = <2>; +- ngpio = <173>; +- interrupts = <0 16 0x4>; +- interrupt-controller; +- #interrupt-cells = <2>; - }; + msmgpio: gpio@800000 { + compatible = "qcom,msm-gpio"; @@ -140,6 +130,19 @@ index c52a9e9..53837aaa2f 100644 + #interrupt-cells = <2>; + }; +- gcc: clock-controller@900000 { +- compatible = "qcom,gcc-msm8660"; +- #clock-cells = <1>; +- #reset-cells = <1>; +- reg = <0x900000 0x4000>; +- }; ++ gcc: clock-controller@900000 { ++ compatible = "qcom,gcc-msm8660"; ++ #clock-cells = <1>; ++ #reset-cells = <1>; ++ reg = <0x900000 0x4000>; ++ }; + - serial@19c40000 { - compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm"; - reg = <0x19c40000 0x1000>, @@ -148,13 +151,6 @@ index c52a9e9..53837aaa2f 100644 - clocks = <&gcc GSBI12_UART_CLK>, <&gcc GSBI12_H_CLK>; - clock-names = "core", "iface"; - }; -+ gcc: clock-controller@900000 { -+ compatible = "qcom,gcc-msm8660"; -+ #clock-cells = <1>; -+ #reset-cells = <1>; -+ reg = <0x900000 0x4000>; -+ }; -+ + gsbi12: gsbi@19c00000 { + compatible = "qcom,gsbi-v1.0.0"; + reg = <0x19c00000 0x100>; @@ -163,11 +159,7 @@ index c52a9e9..53837aaa2f 100644 + #address-cells = <1>; + #size-cells = <1>; + ranges; - -- qcom,ssbi@500000 { -- compatible = "qcom,ssbi"; -- reg = <0x500000 0x1000>; -- qcom,controller-type = "pmic-arbiter"; ++ + serial@19c40000 { + compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm"; + reg = <0x19c40000 0x1000>, @@ -178,7 +170,11 @@ index c52a9e9..53837aaa2f 100644 + status = "disabled"; + }; + }; -+ + +- qcom,ssbi@500000 { +- compatible = "qcom,ssbi"; +- reg = <0x500000 0x1000>; +- qcom,controller-type = "pmic-arbiter"; + qcom,ssbi@500000 { + compatible = "qcom,ssbi"; + reg = <0x500000 0x1000>; @@ -186,6 +182,3 @@ index c52a9e9..53837aaa2f 100644 + }; }; }; --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0094-ARM-dts-qcom-Add-initial-APQ8064-SoC-and-IFC6410-boa.patch b/target/linux/ipq806x/patches/0094-ARM-dts-qcom-Add-initial-APQ8064-SoC-and-IFC6410-boa.patch index 848cbc7834..fb2910b749 100644 --- a/target/linux/ipq806x/patches/0094-ARM-dts-qcom-Add-initial-APQ8064-SoC-and-IFC6410-boa.patch +++ b/target/linux/ipq806x/patches/0094-ARM-dts-qcom-Add-initial-APQ8064-SoC-and-IFC6410-boa.patch @@ -20,11 +20,9 @@ Signed-off-by: Kumar Gala <galak@codeaurora.org> create mode 100644 arch/arm/boot/dts/qcom-apq8064-v2.0.dtsi create mode 100644 arch/arm/boot/dts/qcom-apq8064.dtsi -diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile -index 4a89023..ee3dfea 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile -@@ -231,9 +231,11 @@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \ +@@ -231,9 +231,11 @@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420 dra7-evm.dtb dtb-$(CONFIG_ARCH_ORION5X) += orion5x-lacie-ethernet-disk-mini-v2.dtb dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb @@ -39,9 +37,6 @@ index 4a89023..ee3dfea 100644 dtb-$(CONFIG_ARCH_U8500) += ste-snowball.dtb \ ste-hrefprev60-stuib.dtb \ ste-hrefprev60-tvk.dtb \ -diff --git a/arch/arm/boot/dts/qcom-apq8064-ifc6410.dts b/arch/arm/boot/dts/qcom-apq8064-ifc6410.dts -new file mode 100644 -index 0000000..7c2441d --- /dev/null +++ b/arch/arm/boot/dts/qcom-apq8064-ifc6410.dts @@ -0,0 +1,16 @@ @@ -61,16 +56,10 @@ index 0000000..7c2441d + }; + }; +}; -diff --git a/arch/arm/boot/dts/qcom-apq8064-v2.0.dtsi b/arch/arm/boot/dts/qcom-apq8064-v2.0.dtsi -new file mode 100644 -index 0000000..935c394 --- /dev/null +++ b/arch/arm/boot/dts/qcom-apq8064-v2.0.dtsi @@ -0,0 +1 @@ +#include "qcom-apq8064.dtsi" -diff --git a/arch/arm/boot/dts/qcom-apq8064.dtsi b/arch/arm/boot/dts/qcom-apq8064.dtsi -new file mode 100644 -index 0000000..92bf793 --- /dev/null +++ b/arch/arm/boot/dts/qcom-apq8064.dtsi @@ -0,0 +1,170 @@ @@ -244,8 +233,6 @@ index 0000000..92bf793 + }; + }; +}; -diff --git a/arch/arm/mach-qcom/board.c b/arch/arm/mach-qcom/board.c -index bae617e..350fa8d 100644 --- a/arch/arm/mach-qcom/board.c +++ b/arch/arm/mach-qcom/board.c @@ -15,9 +15,10 @@ @@ -260,6 +247,3 @@ index bae617e..350fa8d 100644 NULL }; --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0095-ARM-dts-qcom-Add-APQ8084-MTP-board-support.patch b/target/linux/ipq806x/patches/0095-ARM-dts-qcom-Add-APQ8084-MTP-board-support.patch index a797266766..3c4f22114a 100644 --- a/target/linux/ipq806x/patches/0095-ARM-dts-qcom-Add-APQ8084-MTP-board-support.patch +++ b/target/linux/ipq806x/patches/0095-ARM-dts-qcom-Add-APQ8084-MTP-board-support.patch @@ -14,11 +14,9 @@ Signed-off-by: Kumar Gala <galak@codeaurora.org> 2 files changed, 7 insertions(+) create mode 100644 arch/arm/boot/dts/qcom-apq8084-mtp.dts -diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile -index ee3dfea..f2aeb95 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile -@@ -234,6 +234,7 @@ dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb +@@ -234,6 +234,7 @@ dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb. dtb-$(CONFIG_ARCH_QCOM) += \ qcom-apq8064-ifc6410.dtb \ qcom-apq8074-dragonboard.dtb \ @@ -26,9 +24,6 @@ index ee3dfea..f2aeb95 100644 qcom-msm8660-surf.dtb \ qcom-msm8960-cdp.dtb dtb-$(CONFIG_ARCH_U8500) += ste-snowball.dtb \ -diff --git a/arch/arm/boot/dts/qcom-apq8084-mtp.dts b/arch/arm/boot/dts/qcom-apq8084-mtp.dts -new file mode 100644 -index 0000000..9dae387 --- /dev/null +++ b/arch/arm/boot/dts/qcom-apq8084-mtp.dts @@ -0,0 +1,6 @@ @@ -38,6 +33,3 @@ index 0000000..9dae387 + model = "Qualcomm APQ 8084-MTP"; + compatible = "qcom,apq8084-mtp", "qcom,apq8084"; +}; --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0096-ARM-dts-qcom-Add-APQ8084-SoC-support.patch b/target/linux/ipq806x/patches/0096-ARM-dts-qcom-Add-APQ8084-SoC-support.patch index 87d70a54e5..18630595c4 100644 --- a/target/linux/ipq806x/patches/0096-ARM-dts-qcom-Add-APQ8084-SoC-support.patch +++ b/target/linux/ipq806x/patches/0096-ARM-dts-qcom-Add-APQ8084-SoC-support.patch @@ -14,9 +14,6 @@ Signed-off-by: Kumar Gala <galak@codeaurora.org> 2 files changed, 180 insertions(+) create mode 100644 arch/arm/boot/dts/qcom-apq8084.dtsi -diff --git a/arch/arm/boot/dts/qcom-apq8084.dtsi b/arch/arm/boot/dts/qcom-apq8084.dtsi -new file mode 100644 -index 0000000..e3e009a --- /dev/null +++ b/arch/arm/boot/dts/qcom-apq8084.dtsi @@ -0,0 +1,179 @@ @@ -199,8 +196,6 @@ index 0000000..e3e009a + }; + }; +}; -diff --git a/arch/arm/mach-qcom/board.c b/arch/arm/mach-qcom/board.c -index 350fa8d..c437a99 100644 --- a/arch/arm/mach-qcom/board.c +++ b/arch/arm/mach-qcom/board.c @@ -17,6 +17,7 @@ @@ -211,6 +206,3 @@ index 350fa8d..c437a99 100644 "qcom,msm8660-surf", "qcom,msm8960-cdp", NULL --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0097-ARM-debug-qcom-make-UART-address-selection-configura.patch b/target/linux/ipq806x/patches/0097-ARM-debug-qcom-make-UART-address-selection-configura.patch index 2f9cad735e..1c67fb70ea 100644 --- a/target/linux/ipq806x/patches/0097-ARM-debug-qcom-make-UART-address-selection-configura.patch +++ b/target/linux/ipq806x/patches/0097-ARM-debug-qcom-make-UART-address-selection-configura.patch @@ -25,8 +25,6 @@ Signed-off-by: Kumar Gala <galak@codeaurora.org> arch/arm/mach-msm/Kconfig | 3 -- 3 files changed, 38 insertions(+), 92 deletions(-) -diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug -index 4491c7b..1a5895d 100644 --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug @@ -353,56 +353,39 @@ choice @@ -179,8 +177,6 @@ index 4491c7b..1a5895d 100644 config DEBUG_UART_8250_SHIFT int "Register offset shift for the 8250 debug UART" -diff --git a/arch/arm/include/debug/msm.S b/arch/arm/include/debug/msm.S -index 9d653d4..9ef5761 100644 --- a/arch/arm/include/debug/msm.S +++ b/arch/arm/include/debug/msm.S @@ -15,51 +15,15 @@ @@ -248,8 +244,6 @@ index 9d653d4..9ef5761 100644 @ check for TX_EMT in UARTDM_SR ldr \rd, [\rx, #0x08] tst \rd, #0x08 -diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig -index a7f959e..9b26976 100644 --- a/arch/arm/mach-msm/Kconfig +++ b/arch/arm/mach-msm/Kconfig @@ -42,9 +42,6 @@ config ARCH_QSD8X50 @@ -262,6 +256,3 @@ index a7f959e..9b26976 100644 config MSM_SOC_REV_A bool --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0098-ARM-debug-qcom-add-UART-addresses-to-Kconfig-help-fo.patch b/target/linux/ipq806x/patches/0098-ARM-debug-qcom-add-UART-addresses-to-Kconfig-help-fo.patch index fdb5c67e22..a94a7c9a95 100644 --- a/target/linux/ipq806x/patches/0098-ARM-debug-qcom-add-UART-addresses-to-Kconfig-help-fo.patch +++ b/target/linux/ipq806x/patches/0098-ARM-debug-qcom-add-UART-addresses-to-Kconfig-help-fo.patch @@ -13,8 +13,6 @@ Signed-off-by: Kumar Gala <galak@codeaurora.org> arch/arm/Kconfig.debug | 1 + 1 file changed, 1 insertion(+) -diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug -index 1a5895d..7820af1 100644 --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug @@ -380,6 +380,7 @@ choice @@ -25,6 +23,3 @@ index 1a5895d..7820af1 100644 MSM8X60 0x19c40000 0xf0040000 MSM8960 0x16440000 0xf0040000 MSM8974 0xf991e000 0xfa71e000 --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0099-ARM-qcom-Enable-ARM_AMBA-option-for-Qualcomm-SOCs.patch b/target/linux/ipq806x/patches/0099-ARM-qcom-Enable-ARM_AMBA-option-for-Qualcomm-SOCs.patch index 4e603eaf5e..1212da2204 100644 --- a/target/linux/ipq806x/patches/0099-ARM-qcom-Enable-ARM_AMBA-option-for-Qualcomm-SOCs.patch +++ b/target/linux/ipq806x/patches/0099-ARM-qcom-Enable-ARM_AMBA-option-for-Qualcomm-SOCs.patch @@ -14,8 +14,6 @@ Signed-off-by: Kumar Gala <galak@codeaurora.org> arch/arm/mach-qcom/Kconfig | 1 + 1 file changed, 1 insertion(+) -diff --git a/arch/arm/mach-qcom/Kconfig b/arch/arm/mach-qcom/Kconfig -index 6440c11..63502cc 100644 --- a/arch/arm/mach-qcom/Kconfig +++ b/arch/arm/mach-qcom/Kconfig @@ -2,6 +2,7 @@ config ARCH_QCOM @@ -26,6 +24,3 @@ index 6440c11..63502cc 100644 select CLKSRC_OF select GENERIC_CLOCKEVENTS select HAVE_SMP --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0100-clk-qcom-Fix-msm8660-GCC-probe.patch b/target/linux/ipq806x/patches/0100-clk-qcom-Fix-msm8660-GCC-probe.patch index 1fbd80602a..f1f1445a44 100644 --- a/target/linux/ipq806x/patches/0100-clk-qcom-Fix-msm8660-GCC-probe.patch +++ b/target/linux/ipq806x/patches/0100-clk-qcom-Fix-msm8660-GCC-probe.patch @@ -14,11 +14,9 @@ Signed-off-by: Mike Turquette <mturquette@linaro.org> drivers/clk/qcom/gcc-msm8660.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) -diff --git a/drivers/clk/qcom/gcc-msm8660.c b/drivers/clk/qcom/gcc-msm8660.c -index 44bc6fa..0c4b727 100644 --- a/drivers/clk/qcom/gcc-msm8660.c +++ b/drivers/clk/qcom/gcc-msm8660.c -@@ -2718,6 +2718,18 @@ MODULE_DEVICE_TABLE(of, gcc_msm8660_match_table); +@@ -2718,6 +2718,18 @@ MODULE_DEVICE_TABLE(of, gcc_msm8660_matc static int gcc_msm8660_probe(struct platform_device *pdev) { @@ -37,6 +35,3 @@ index 44bc6fa..0c4b727 100644 return qcom_cc_probe(pdev, &gcc_msm8660_desc); } --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0101-clk-qcom-Fix-blsp2_ahb_clk-register-offset.patch b/target/linux/ipq806x/patches/0101-clk-qcom-Fix-blsp2_ahb_clk-register-offset.patch index 9555e6b803..705582f538 100644 --- a/target/linux/ipq806x/patches/0101-clk-qcom-Fix-blsp2_ahb_clk-register-offset.patch +++ b/target/linux/ipq806x/patches/0101-clk-qcom-Fix-blsp2_ahb_clk-register-offset.patch @@ -12,11 +12,9 @@ Signed-off-by: Mike Turquette <mturquette@linaro.org> drivers/clk/qcom/gcc-msm8974.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/drivers/clk/qcom/gcc-msm8974.c b/drivers/clk/qcom/gcc-msm8974.c -index 0d1edc1..7a420fc 100644 --- a/drivers/clk/qcom/gcc-msm8974.c +++ b/drivers/clk/qcom/gcc-msm8974.c -@@ -1341,7 +1341,7 @@ static struct clk_branch gcc_blsp1_uart6_apps_clk = { +@@ -1341,7 +1341,7 @@ static struct clk_branch gcc_blsp1_uart6 }; static struct clk_branch gcc_blsp2_ahb_clk = { @@ -25,6 +23,3 @@ index 0d1edc1..7a420fc 100644 .halt_check = BRANCH_HALT_VOTED, .clkr = { .enable_reg = 0x1484, --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0104-clk-qcom-Return-highest-rate-when-round_rate-exceeds.patch b/target/linux/ipq806x/patches/0104-clk-qcom-Return-highest-rate-when-round_rate-exceeds.patch index 8c959a5372..3312f2fc65 100644 --- a/target/linux/ipq806x/patches/0104-clk-qcom-Return-highest-rate-when-round_rate-exceeds.patch +++ b/target/linux/ipq806x/patches/0104-clk-qcom-Return-highest-rate-when-round_rate-exceeds.patch @@ -17,11 +17,9 @@ Signed-off-by: Mike Turquette <mturquette@linaro.org> drivers/clk/qcom/clk-rcg2.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -diff --git a/drivers/clk/qcom/clk-rcg2.c b/drivers/clk/qcom/clk-rcg2.c -index 0996a3a..cbecaec 100644 --- a/drivers/clk/qcom/clk-rcg2.c +++ b/drivers/clk/qcom/clk-rcg2.c -@@ -181,7 +181,8 @@ struct freq_tbl *find_freq(const struct freq_tbl *f, unsigned long rate) +@@ -181,7 +181,8 @@ struct freq_tbl *find_freq(const struct if (rate <= f->freq) return f; @@ -31,6 +29,3 @@ index 0996a3a..cbecaec 100644 } static long _freq_tbl_determine_rate(struct clk_hw *hw, --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0105-clk-qcom-Support-display-RCG-clocks.patch b/target/linux/ipq806x/patches/0105-clk-qcom-Support-display-RCG-clocks.patch index b95562956c..befdfebe1a 100644 --- a/target/linux/ipq806x/patches/0105-clk-qcom-Support-display-RCG-clocks.patch +++ b/target/linux/ipq806x/patches/0105-clk-qcom-Support-display-RCG-clocks.patch @@ -14,8 +14,6 @@ Signed-off-by: Mike Turquette <mturquette@linaro.org> drivers/clk/qcom/clk-rcg2.c | 299 ++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 287 insertions(+), 15 deletions(-) -diff --git a/drivers/clk/qcom/clk-rcg.h b/drivers/clk/qcom/clk-rcg.h -index 1d6b6de..b9ec11d 100644 --- a/drivers/clk/qcom/clk-rcg.h +++ b/drivers/clk/qcom/clk-rcg.h @@ -155,5 +155,8 @@ struct clk_rcg2 { @@ -27,8 +25,6 @@ index 1d6b6de..b9ec11d 100644 +extern const struct clk_ops clk_pixel_ops; #endif -diff --git a/drivers/clk/qcom/clk-rcg2.c b/drivers/clk/qcom/clk-rcg2.c -index cbecaec..cd185d5 100644 --- a/drivers/clk/qcom/clk-rcg2.c +++ b/drivers/clk/qcom/clk-rcg2.c @@ -19,6 +19,7 @@ @@ -39,7 +35,7 @@ index cbecaec..cd185d5 100644 #include <asm/div64.h> -@@ -225,31 +226,25 @@ static long clk_rcg2_determine_rate(struct clk_hw *hw, unsigned long rate, +@@ -225,31 +226,25 @@ static long clk_rcg2_determine_rate(stru return _freq_tbl_determine_rate(hw, rcg->freq_tbl, rate, p_rate, p); } @@ -78,7 +74,7 @@ index cbecaec..cd185d5 100644 if (ret) return ret; } -@@ -260,14 +255,26 @@ static int __clk_rcg2_set_rate(struct clk_hw *hw, unsigned long rate) +@@ -260,14 +255,26 @@ static int __clk_rcg2_set_rate(struct cl cfg |= rcg->parent_map[f->src] << CFG_SRC_SEL_SHIFT; if (rcg->mnd_width && f->n) cfg |= CFG_MODE_DUAL_EDGE; @@ -373,6 +369,3 @@ index cbecaec..cd185d5 100644 + .determine_rate = clk_pixel_determine_rate, +}; +EXPORT_SYMBOL_GPL(clk_pixel_ops); --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0106-clk-qcom-Properly-support-display-clocks-on-msm8974.patch b/target/linux/ipq806x/patches/0106-clk-qcom-Properly-support-display-clocks-on-msm8974.patch index ce9499afb1..c7989171fc 100644 --- a/target/linux/ipq806x/patches/0106-clk-qcom-Properly-support-display-clocks-on-msm8974.patch +++ b/target/linux/ipq806x/patches/0106-clk-qcom-Properly-support-display-clocks-on-msm8974.patch @@ -17,8 +17,6 @@ Signed-off-by: Mike Turquette <mturquette@linaro.org> drivers/clk/qcom/mmcc-msm8974.c | 105 ++++++++++++++++++++------------------- 1 file changed, 54 insertions(+), 51 deletions(-) -diff --git a/drivers/clk/qcom/mmcc-msm8974.c b/drivers/clk/qcom/mmcc-msm8974.c -index 62200bb..c65b905 100644 --- a/drivers/clk/qcom/mmcc-msm8974.c +++ b/drivers/clk/qcom/mmcc-msm8974.c @@ -41,9 +41,11 @@ @@ -33,7 +31,7 @@ index 62200bb..c65b905 100644 static const u8 mmcc_xo_mmpll0_mmpll1_gpll0_map[] = { [P_XO] = 0, -@@ -161,6 +163,24 @@ static const char *mmcc_xo_dsi_hdmi_edp_gpll0[] = { +@@ -161,6 +163,24 @@ static const char *mmcc_xo_dsi_hdmi_edp_ "dsi1pll", }; @@ -162,7 +160,7 @@ index 62200bb..c65b905 100644 }, }; -@@ -826,12 +836,12 @@ static struct clk_rcg2 edplink_clk_src = { +@@ -826,12 +836,12 @@ static struct clk_rcg2 edplink_clk_src = .parent_names = mmcc_xo_dsi_hdmi_edp_gpll0, .num_parents = 6, .ops = &clk_rcg2_ops, @@ -178,7 +176,7 @@ index 62200bb..c65b905 100644 { } }; -@@ -840,12 +850,12 @@ static struct clk_rcg2 edppixel_clk_src = { +@@ -840,12 +850,12 @@ static struct clk_rcg2 edppixel_clk_src .mnd_width = 8, .hid_width = 5, .parent_map = mmcc_xo_dsi_hdmi_edp_map, @@ -193,7 +191,7 @@ index 62200bb..c65b905 100644 }, }; -@@ -857,11 +867,11 @@ static struct freq_tbl ftbl_mdss_esc0_1_clk[] = { +@@ -857,11 +867,11 @@ static struct freq_tbl ftbl_mdss_esc0_1_ static struct clk_rcg2 esc0_clk_src = { .cmd_rcgr = 0x2160, .hid_width = 5, @@ -238,7 +236,7 @@ index 62200bb..c65b905 100644 { } }; -@@ -897,12 +899,13 @@ static struct clk_rcg2 extpclk_clk_src = { +@@ -897,12 +899,13 @@ static struct clk_rcg2 extpclk_clk_src = .cmd_rcgr = 0x2060, .hid_width = 5, .parent_map = mmcc_xo_dsi_hdmi_edp_gpll0_map, @@ -254,6 +252,3 @@ index 62200bb..c65b905 100644 }, }; --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0107-clk-qcom-Support-msm8974pro-global-clock-control-har.patch b/target/linux/ipq806x/patches/0107-clk-qcom-Support-msm8974pro-global-clock-control-har.patch index 1d0ee4573f..670acad9dc 100644 --- a/target/linux/ipq806x/patches/0107-clk-qcom-Support-msm8974pro-global-clock-control-har.patch +++ b/target/linux/ipq806x/patches/0107-clk-qcom-Support-msm8974pro-global-clock-control-har.patch @@ -16,8 +16,6 @@ Signed-off-by: Mike Turquette <mturquette@linaro.org> include/dt-bindings/clock/qcom,gcc-msm8974.h | 4 + 3 files changed, 130 insertions(+), 6 deletions(-) -diff --git a/Documentation/devicetree/bindings/clock/qcom,gcc.txt b/Documentation/devicetree/bindings/clock/qcom,gcc.txt -index 7b7104e..9cfcb4f 100644 --- a/Documentation/devicetree/bindings/clock/qcom,gcc.txt +++ b/Documentation/devicetree/bindings/clock/qcom,gcc.txt @@ -8,6 +8,8 @@ Required properties : @@ -29,8 +27,6 @@ index 7b7104e..9cfcb4f 100644 - reg : shall contain base register location and length - #clock-cells : shall contain 1 -diff --git a/drivers/clk/qcom/gcc-msm8974.c b/drivers/clk/qcom/gcc-msm8974.c -index 7a420fc..7af7c18 100644 --- a/drivers/clk/qcom/gcc-msm8974.c +++ b/drivers/clk/qcom/gcc-msm8974.c @@ -35,6 +35,7 @@ @@ -94,7 +90,7 @@ index 7a420fc..7af7c18 100644 static const struct freq_tbl ftbl_gcc_usb30_master_clk[] = { F(125000000, P_GPLL0, 1, 5, 24), { } -@@ -812,18 +852,33 @@ static const struct freq_tbl ftbl_gcc_sdcc1_4_apps_clk[] = { +@@ -812,18 +852,33 @@ static const struct freq_tbl ftbl_gcc_sd { } }; @@ -134,7 +130,7 @@ index 7a420fc..7af7c18 100644 }; static struct clk_rcg2 sdcc2_apps_clk_src = { -@@ -1995,6 +2050,38 @@ static struct clk_branch gcc_sdcc1_apps_clk = { +@@ -1995,6 +2050,38 @@ static struct clk_branch gcc_sdcc1_apps_ }, }; @@ -173,7 +169,7 @@ index 7a420fc..7af7c18 100644 static struct clk_branch gcc_sdcc2_ahb_clk = { .halt_reg = 0x0508, .clkr = { -@@ -2484,6 +2571,10 @@ static struct clk_regmap *gcc_msm8974_clocks[] = { +@@ -2484,6 +2571,10 @@ static struct clk_regmap *gcc_msm8974_cl [GCC_USB_HSIC_IO_CAL_SLEEP_CLK] = &gcc_usb_hsic_io_cal_sleep_clk.clkr, [GCC_USB_HSIC_SYSTEM_CLK] = &gcc_usb_hsic_system_clk.clkr, [GCC_MMSS_GPLL0_CLK_SRC] = &gcc_mmss_gpll0_clk_src, @@ -184,7 +180,7 @@ index 7a420fc..7af7c18 100644 }; static const struct qcom_reset_map gcc_msm8974_resets[] = { -@@ -2585,14 +2676,41 @@ static const struct qcom_cc_desc gcc_msm8974_desc = { +@@ -2585,14 +2676,41 @@ static const struct qcom_cc_desc gcc_msm static const struct of_device_id gcc_msm8974_match_table[] = { { .compatible = "qcom,gcc-msm8974" }, @@ -226,8 +222,6 @@ index 7a420fc..7af7c18 100644 /* Temporary until RPM clocks supported */ clk = clk_register_fixed_rate(dev, "xo", NULL, CLK_IS_ROOT, 19200000); -diff --git a/include/dt-bindings/clock/qcom,gcc-msm8974.h b/include/dt-bindings/clock/qcom,gcc-msm8974.h -index 223ca17..51e51c8 100644 --- a/include/dt-bindings/clock/qcom,gcc-msm8974.h +++ b/include/dt-bindings/clock/qcom,gcc-msm8974.h @@ -316,5 +316,9 @@ @@ -240,6 +234,3 @@ index 223ca17..51e51c8 100644 +#define GCC_SDCC1_CDCCAL_FF_CLK 305 #endif --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0108-clk-qcom-Return-error-pointers-for-unimplemented-clo.patch b/target/linux/ipq806x/patches/0108-clk-qcom-Return-error-pointers-for-unimplemented-clo.patch index 37806f154b..52d497fea7 100644 --- a/target/linux/ipq806x/patches/0108-clk-qcom-Return-error-pointers-for-unimplemented-clo.patch +++ b/target/linux/ipq806x/patches/0108-clk-qcom-Return-error-pointers-for-unimplemented-clo.patch @@ -16,11 +16,9 @@ Signed-off-by: Mike Turquette <mturquette@linaro.org> drivers/clk/qcom/common.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -diff --git a/drivers/clk/qcom/common.c b/drivers/clk/qcom/common.c -index 86b45fb..9b5a1cf 100644 --- a/drivers/clk/qcom/common.c +++ b/drivers/clk/qcom/common.c -@@ -62,8 +62,10 @@ int qcom_cc_probe(struct platform_device *pdev, const struct qcom_cc_desc *desc) +@@ -62,8 +62,10 @@ int qcom_cc_probe(struct platform_device data->clk_num = num_clks; for (i = 0; i < num_clks; i++) { @@ -32,6 +30,3 @@ index 86b45fb..9b5a1cf 100644 clk = devm_clk_register_regmap(dev, rclks[i]); if (IS_ERR(clk)) return PTR_ERR(clk); --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0109-libahci-Allow-drivers-to-override-start_engine.patch b/target/linux/ipq806x/patches/0109-libahci-Allow-drivers-to-override-start_engine.patch index 102fd4f6c3..b727e2693e 100644 --- a/target/linux/ipq806x/patches/0109-libahci-Allow-drivers-to-override-start_engine.patch +++ b/target/linux/ipq806x/patches/0109-libahci-Allow-drivers-to-override-start_engine.patch @@ -21,11 +21,9 @@ Signed-off-by: Tejun Heo <tj@kernel.org> drivers/ata/sata_highbank.c | 3 ++- 4 files changed, 31 insertions(+), 10 deletions(-) -diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c -index c81d809..8bfc477 100644 --- a/drivers/ata/ahci.c +++ b/drivers/ata/ahci.c -@@ -578,6 +578,7 @@ static int ahci_vt8251_hardreset(struct ata_link *link, unsigned int *class, +@@ -583,6 +583,7 @@ static int ahci_vt8251_hardreset(struct unsigned long deadline) { struct ata_port *ap = link->ap; @@ -33,7 +31,7 @@ index c81d809..8bfc477 100644 bool online; int rc; -@@ -588,7 +589,7 @@ static int ahci_vt8251_hardreset(struct ata_link *link, unsigned int *class, +@@ -593,7 +594,7 @@ static int ahci_vt8251_hardreset(struct rc = sata_link_hardreset(link, sata_ehc_deb_timing(&link->eh_context), deadline, &online, NULL); @@ -42,7 +40,7 @@ index c81d809..8bfc477 100644 DPRINTK("EXIT, rc=%d, class=%u\n", rc, *class); -@@ -603,6 +604,7 @@ static int ahci_p5wdh_hardreset(struct ata_link *link, unsigned int *class, +@@ -608,6 +609,7 @@ static int ahci_p5wdh_hardreset(struct a { struct ata_port *ap = link->ap; struct ahci_port_priv *pp = ap->private_data; @@ -50,7 +48,7 @@ index c81d809..8bfc477 100644 u8 *d2h_fis = pp->rx_fis + RX_FIS_D2H_REG; struct ata_taskfile tf; bool online; -@@ -618,7 +620,7 @@ static int ahci_p5wdh_hardreset(struct ata_link *link, unsigned int *class, +@@ -623,7 +625,7 @@ static int ahci_p5wdh_hardreset(struct a rc = sata_link_hardreset(link, sata_ehc_deb_timing(&link->eh_context), deadline, &online, NULL); @@ -59,11 +57,9 @@ index c81d809..8bfc477 100644 /* The pseudo configuration device on SIMG4726 attached to * ASUS P5W-DH Deluxe doesn't send signature FIS after -diff --git a/drivers/ata/ahci.h b/drivers/ata/ahci.h -index 2289efd..64d1a99 100644 --- a/drivers/ata/ahci.h +++ b/drivers/ata/ahci.h -@@ -323,6 +323,12 @@ struct ahci_host_priv { +@@ -324,6 +324,12 @@ struct ahci_host_priv { u32 em_msg_type; /* EM message type */ struct clk *clk; /* Only for platforms supporting clk */ void *plat_data; /* Other platform data */ @@ -76,11 +72,9 @@ index 2289efd..64d1a99 100644 }; extern int ahci_ignore_sss; -diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c -index 36605ab..f839bb3 100644 --- a/drivers/ata/libahci.c +++ b/drivers/ata/libahci.c -@@ -394,6 +394,9 @@ static ssize_t ahci_show_em_supported(struct device *dev, +@@ -394,6 +394,9 @@ static ssize_t ahci_show_em_supported(st * * If inconsistent, config values are fixed up by this function. * @@ -90,7 +84,7 @@ index 36605ab..f839bb3 100644 * LOCKING: * None. */ -@@ -500,6 +503,9 @@ void ahci_save_initial_config(struct device *dev, +@@ -500,6 +503,9 @@ void ahci_save_initial_config(struct dev hpriv->cap = cap; hpriv->cap2 = cap2; hpriv->port_map = port_map; @@ -100,7 +94,7 @@ index 36605ab..f839bb3 100644 } EXPORT_SYMBOL_GPL(ahci_save_initial_config); -@@ -766,7 +772,7 @@ static void ahci_start_port(struct ata_port *ap) +@@ -766,7 +772,7 @@ static void ahci_start_port(struct ata_p /* enable DMA */ if (!(hpriv->flags & AHCI_HFLAG_DELAY_ENGINE)) @@ -109,7 +103,7 @@ index 36605ab..f839bb3 100644 /* turn on LEDs */ if (ap->flags & ATA_FLAG_EM) { -@@ -1234,7 +1240,7 @@ int ahci_kick_engine(struct ata_port *ap) +@@ -1234,7 +1240,7 @@ int ahci_kick_engine(struct ata_port *ap /* restart engine */ out_restart: @@ -118,7 +112,7 @@ index 36605ab..f839bb3 100644 return rc; } EXPORT_SYMBOL_GPL(ahci_kick_engine); -@@ -1426,6 +1432,7 @@ static int ahci_hardreset(struct ata_link *link, unsigned int *class, +@@ -1426,6 +1432,7 @@ static int ahci_hardreset(struct ata_lin const unsigned long *timing = sata_ehc_deb_timing(&link->eh_context); struct ata_port *ap = link->ap; struct ahci_port_priv *pp = ap->private_data; @@ -126,7 +120,7 @@ index 36605ab..f839bb3 100644 u8 *d2h_fis = pp->rx_fis + RX_FIS_D2H_REG; struct ata_taskfile tf; bool online; -@@ -1443,7 +1450,7 @@ static int ahci_hardreset(struct ata_link *link, unsigned int *class, +@@ -1443,7 +1450,7 @@ static int ahci_hardreset(struct ata_lin rc = sata_link_hardreset(link, timing, deadline, &online, ahci_check_ready); @@ -135,7 +129,7 @@ index 36605ab..f839bb3 100644 if (online) *class = ahci_dev_classify(ap); -@@ -2007,10 +2014,12 @@ static void ahci_thaw(struct ata_port *ap) +@@ -2007,10 +2014,12 @@ static void ahci_thaw(struct ata_port *a void ahci_error_handler(struct ata_port *ap) { @@ -149,7 +143,7 @@ index 36605ab..f839bb3 100644 } sata_pmp_error_handler(ap); -@@ -2031,6 +2040,7 @@ static void ahci_post_internal_cmd(struct ata_queued_cmd *qc) +@@ -2031,6 +2040,7 @@ static void ahci_post_internal_cmd(struc static void ahci_set_aggressive_devslp(struct ata_port *ap, bool sleep) { @@ -157,7 +151,7 @@ index 36605ab..f839bb3 100644 void __iomem *port_mmio = ahci_port_base(ap); struct ata_device *dev = ap->link.device; u32 devslp, dm, dito, mdat, deto; -@@ -2094,7 +2104,7 @@ static void ahci_set_aggressive_devslp(struct ata_port *ap, bool sleep) +@@ -2094,7 +2104,7 @@ static void ahci_set_aggressive_devslp(s PORT_DEVSLP_ADSE); writel(devslp, port_mmio + PORT_DEVSLP); @@ -166,7 +160,7 @@ index 36605ab..f839bb3 100644 /* enable device sleep feature for the drive */ err_mask = ata_dev_set_feature(dev, -@@ -2106,6 +2116,7 @@ static void ahci_set_aggressive_devslp(struct ata_port *ap, bool sleep) +@@ -2106,6 +2116,7 @@ static void ahci_set_aggressive_devslp(s static void ahci_enable_fbs(struct ata_port *ap) { @@ -174,7 +168,7 @@ index 36605ab..f839bb3 100644 struct ahci_port_priv *pp = ap->private_data; void __iomem *port_mmio = ahci_port_base(ap); u32 fbs; -@@ -2134,11 +2145,12 @@ static void ahci_enable_fbs(struct ata_port *ap) +@@ -2134,11 +2145,12 @@ static void ahci_enable_fbs(struct ata_p } else dev_err(ap->host->dev, "Failed to enable FBS\n"); @@ -188,7 +182,7 @@ index 36605ab..f839bb3 100644 struct ahci_port_priv *pp = ap->private_data; void __iomem *port_mmio = ahci_port_base(ap); u32 fbs; -@@ -2166,7 +2178,7 @@ static void ahci_disable_fbs(struct ata_port *ap) +@@ -2166,7 +2178,7 @@ static void ahci_disable_fbs(struct ata_ pp->fbs_enabled = false; } @@ -197,11 +191,9 @@ index 36605ab..f839bb3 100644 } static void ahci_pmp_attach(struct ata_port *ap) -diff --git a/drivers/ata/sata_highbank.c b/drivers/ata/sata_highbank.c -index 870b11e..b3b18d1 100644 --- a/drivers/ata/sata_highbank.c +++ b/drivers/ata/sata_highbank.c -@@ -403,6 +403,7 @@ static int ahci_highbank_hardreset(struct ata_link *link, unsigned int *class, +@@ -403,6 +403,7 @@ static int ahci_highbank_hardreset(struc static const unsigned long timing[] = { 5, 100, 500}; struct ata_port *ap = link->ap; struct ahci_port_priv *pp = ap->private_data; @@ -209,7 +201,7 @@ index 870b11e..b3b18d1 100644 u8 *d2h_fis = pp->rx_fis + RX_FIS_D2H_REG; struct ata_taskfile tf; bool online; -@@ -431,7 +432,7 @@ static int ahci_highbank_hardreset(struct ata_link *link, unsigned int *class, +@@ -431,7 +432,7 @@ static int ahci_highbank_hardreset(struc break; } while (!online && retry--); @@ -218,6 +210,3 @@ index 870b11e..b3b18d1 100644 if (online) *class = ahci_dev_classify(ap); --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0110-ahci-platform-Add-support-for-devices-with-more-then.patch b/target/linux/ipq806x/patches/0110-ahci-platform-Add-support-for-devices-with-more-then.patch index 09c4f220b4..54f84ee072 100644 --- a/target/linux/ipq806x/patches/0110-ahci-platform-Add-support-for-devices-with-more-then.patch +++ b/target/linux/ipq806x/patches/0110-ahci-platform-Add-support-for-devices-with-more-then.patch @@ -18,8 +18,6 @@ Signed-off-by: Tejun Heo <tj@kernel.org> include/linux/ahci_platform.h | 4 + 4 files changed, 93 insertions(+), 28 deletions(-) -diff --git a/Documentation/devicetree/bindings/ata/ahci-platform.txt b/Documentation/devicetree/bindings/ata/ahci-platform.txt -index 89de156..3ced07d 100644 --- a/Documentation/devicetree/bindings/ata/ahci-platform.txt +++ b/Documentation/devicetree/bindings/ata/ahci-platform.txt @@ -10,6 +10,7 @@ Required properties: @@ -30,8 +28,6 @@ index 89de156..3ced07d 100644 Example: sata@ffe08000 { -diff --git a/drivers/ata/ahci.h b/drivers/ata/ahci.h -index 64d1a99..c12862b 100644 --- a/drivers/ata/ahci.h +++ b/drivers/ata/ahci.h @@ -51,6 +51,7 @@ @@ -42,7 +38,7 @@ index 64d1a99..c12862b 100644 AHCI_MAX_SG = 168, /* hardware max is 64K */ AHCI_DMA_BOUNDARY = 0xffffffff, AHCI_MAX_CMDS = 32, -@@ -321,7 +322,7 @@ struct ahci_host_priv { +@@ -322,7 +323,7 @@ struct ahci_host_priv { u32 em_loc; /* enclosure management location */ u32 em_buf_sz; /* EM buffer size in byte */ u32 em_msg_type; /* EM message type */ @@ -51,11 +47,9 @@ index 64d1a99..c12862b 100644 void *plat_data; /* Other platform data */ /* * Optional ahci_start_engine override, if not set this gets set to the -diff --git a/drivers/ata/ahci_platform.c b/drivers/ata/ahci_platform.c -index 4b231ba..2342a42 100644 --- a/drivers/ata/ahci_platform.c +++ b/drivers/ata/ahci_platform.c -@@ -87,6 +87,60 @@ static struct scsi_host_template ahci_platform_sht = { +@@ -87,6 +87,60 @@ static struct scsi_host_template ahci_pl AHCI_SHT("ahci_platform"), }; @@ -116,7 +110,7 @@ index 4b231ba..2342a42 100644 static int ahci_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; -@@ -97,6 +151,7 @@ static int ahci_probe(struct platform_device *pdev) +@@ -97,6 +151,7 @@ static int ahci_probe(struct platform_de struct ahci_host_priv *hpriv; struct ata_host *host; struct resource *mem; @@ -124,7 +118,7 @@ index 4b231ba..2342a42 100644 int irq; int n_ports; int i; -@@ -131,17 +186,31 @@ static int ahci_probe(struct platform_device *pdev) +@@ -131,17 +186,31 @@ static int ahci_probe(struct platform_de return -ENOMEM; } @@ -178,7 +172,7 @@ index 4b231ba..2342a42 100644 return rc; } -@@ -239,10 +306,8 @@ static void ahci_host_stop(struct ata_host *host) +@@ -239,10 +306,8 @@ static void ahci_host_stop(struct ata_ho if (pdata && pdata->exit) pdata->exit(dev); @@ -191,7 +185,7 @@ index 4b231ba..2342a42 100644 } #ifdef CONFIG_PM_SLEEP -@@ -277,8 +342,7 @@ static int ahci_suspend(struct device *dev) +@@ -277,8 +342,7 @@ static int ahci_suspend(struct device *d if (pdata && pdata->suspend) return pdata->suspend(dev); @@ -201,7 +195,7 @@ index 4b231ba..2342a42 100644 return 0; } -@@ -290,13 +354,9 @@ static int ahci_resume(struct device *dev) +@@ -290,13 +354,9 @@ static int ahci_resume(struct device *de struct ahci_host_priv *hpriv = host->private_data; int rc; @@ -218,7 +212,7 @@ index 4b231ba..2342a42 100644 if (pdata && pdata->resume) { rc = pdata->resume(dev); -@@ -317,8 +377,7 @@ static int ahci_resume(struct device *dev) +@@ -317,8 +377,7 @@ static int ahci_resume(struct device *de return 0; disable_unprepare_clk: @@ -228,8 +222,6 @@ index 4b231ba..2342a42 100644 return rc; } -diff --git a/include/linux/ahci_platform.h b/include/linux/ahci_platform.h -index 73a2500..769d065 100644 --- a/include/linux/ahci_platform.h +++ b/include/linux/ahci_platform.h @@ -19,6 +19,7 @@ @@ -248,6 +240,3 @@ index 73a2500..769d065 100644 +void ahci_platform_disable_clks(struct ahci_host_priv *hpriv); + #endif /* _AHCI_PLATFORM_H */ --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0111-ahci-platform-Add-support-for-an-optional-regulator-.patch b/target/linux/ipq806x/patches/0111-ahci-platform-Add-support-for-an-optional-regulator-.patch index 2d6ac0bd98..a8b1c6f8dd 100644 --- a/target/linux/ipq806x/patches/0111-ahci-platform-Add-support-for-an-optional-regulator-.patch +++ b/target/linux/ipq806x/patches/0111-ahci-platform-Add-support-for-an-optional-regulator-.patch @@ -12,8 +12,6 @@ Signed-off-by: Tejun Heo <tj@kernel.org> drivers/ata/ahci_platform.c | 36 ++++++++++++++++++-- 3 files changed, 37 insertions(+), 2 deletions(-) -diff --git a/Documentation/devicetree/bindings/ata/ahci-platform.txt b/Documentation/devicetree/bindings/ata/ahci-platform.txt -index 3ced07d..1ac807f 100644 --- a/Documentation/devicetree/bindings/ata/ahci-platform.txt +++ b/Documentation/devicetree/bindings/ata/ahci-platform.txt @@ -11,6 +11,7 @@ Required properties: @@ -24,8 +22,6 @@ index 3ced07d..1ac807f 100644 Example: sata@ffe08000 { -diff --git a/drivers/ata/ahci.h b/drivers/ata/ahci.h -index c12862b..bf8100c 100644 --- a/drivers/ata/ahci.h +++ b/drivers/ata/ahci.h @@ -37,6 +37,7 @@ @@ -36,7 +32,7 @@ index c12862b..bf8100c 100644 /* Enclosure Management Control */ #define EM_CTRL_MSG_TYPE 0x000f0000 -@@ -323,6 +324,7 @@ struct ahci_host_priv { +@@ -324,6 +325,7 @@ struct ahci_host_priv { u32 em_buf_sz; /* EM buffer size in byte */ u32 em_msg_type; /* EM message type */ struct clk *clks[AHCI_MAX_CLKS]; /* Optional */ @@ -44,11 +40,9 @@ index c12862b..bf8100c 100644 void *plat_data; /* Other platform data */ /* * Optional ahci_start_engine override, if not set this gets set to the -diff --git a/drivers/ata/ahci_platform.c b/drivers/ata/ahci_platform.c -index 2342a42..8f18ebe 100644 --- a/drivers/ata/ahci_platform.c +++ b/drivers/ata/ahci_platform.c -@@ -186,6 +186,14 @@ static int ahci_probe(struct platform_device *pdev) +@@ -186,6 +186,14 @@ static int ahci_probe(struct platform_de return -ENOMEM; } @@ -63,7 +57,7 @@ index 2342a42..8f18ebe 100644 for (i = 0; i < AHCI_MAX_CLKS; i++) { /* * For now we must use clk_get(dev, NULL) for the first clock, -@@ -207,9 +215,15 @@ static int ahci_probe(struct platform_device *pdev) +@@ -207,9 +215,15 @@ static int ahci_probe(struct platform_de hpriv->clks[i] = clk; } @@ -90,7 +84,7 @@ index 2342a42..8f18ebe 100644 free_clk: ahci_put_clks(hpriv); return rc; -@@ -308,6 +325,9 @@ static void ahci_host_stop(struct ata_host *host) +@@ -308,6 +325,9 @@ static void ahci_host_stop(struct ata_ho ahci_disable_clks(hpriv); ahci_put_clks(hpriv); @@ -100,7 +94,7 @@ index 2342a42..8f18ebe 100644 } #ifdef CONFIG_PM_SLEEP -@@ -344,6 +364,9 @@ static int ahci_suspend(struct device *dev) +@@ -344,6 +364,9 @@ static int ahci_suspend(struct device *d ahci_disable_clks(hpriv); @@ -110,7 +104,7 @@ index 2342a42..8f18ebe 100644 return 0; } -@@ -354,9 +377,15 @@ static int ahci_resume(struct device *dev) +@@ -354,9 +377,15 @@ static int ahci_resume(struct device *de struct ahci_host_priv *hpriv = host->private_data; int rc; @@ -127,7 +121,7 @@ index 2342a42..8f18ebe 100644 if (pdata && pdata->resume) { rc = pdata->resume(dev); -@@ -378,6 +407,9 @@ static int ahci_resume(struct device *dev) +@@ -378,6 +407,9 @@ static int ahci_resume(struct device *de disable_unprepare_clk: ahci_disable_clks(hpriv); @@ -137,6 +131,3 @@ index 2342a42..8f18ebe 100644 return rc; } --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0112-ahci-platform-Add-enable_-disable_resources-helper-f.patch b/target/linux/ipq806x/patches/0112-ahci-platform-Add-enable_-disable_resources-helper-f.patch index ad6adbebf5..888ee324f8 100644 --- a/target/linux/ipq806x/patches/0112-ahci-platform-Add-enable_-disable_resources-helper-f.patch +++ b/target/linux/ipq806x/patches/0112-ahci-platform-Add-enable_-disable_resources-helper-f.patch @@ -13,11 +13,9 @@ Signed-off-by: Tejun Heo <tj@kernel.org> include/linux/ahci_platform.h | 2 + 2 files changed, 71 insertions(+), 37 deletions(-) -diff --git a/drivers/ata/ahci_platform.c b/drivers/ata/ahci_platform.c -index 8f18ebe..656d285 100644 --- a/drivers/ata/ahci_platform.c +++ b/drivers/ata/ahci_platform.c -@@ -133,6 +133,62 @@ void ahci_platform_disable_clks(struct ahci_host_priv *hpriv) +@@ -133,6 +133,62 @@ void ahci_platform_disable_clks(struct a } EXPORT_SYMBOL_GPL(ahci_platform_disable_clks); @@ -80,7 +78,7 @@ index 8f18ebe..656d285 100644 static void ahci_put_clks(struct ahci_host_priv *hpriv) { int c; -@@ -215,15 +271,9 @@ static int ahci_probe(struct platform_device *pdev) +@@ -215,15 +271,9 @@ static int ahci_probe(struct platform_de hpriv->clks[i] = clk; } @@ -98,7 +96,7 @@ index 8f18ebe..656d285 100644 /* * Some platforms might need to prepare for mmio region access, -@@ -234,7 +284,7 @@ static int ahci_probe(struct platform_device *pdev) +@@ -234,7 +284,7 @@ static int ahci_probe(struct platform_de if (pdata && pdata->init) { rc = pdata->init(dev, hpriv->mmio); if (rc) @@ -107,7 +105,7 @@ index 8f18ebe..656d285 100644 } ahci_save_initial_config(dev, hpriv, -@@ -304,11 +354,8 @@ static int ahci_probe(struct platform_device *pdev) +@@ -304,11 +354,8 @@ static int ahci_probe(struct platform_de pdata_exit: if (pdata && pdata->exit) pdata->exit(dev); @@ -121,7 +119,7 @@ index 8f18ebe..656d285 100644 free_clk: ahci_put_clks(hpriv); return rc; -@@ -323,11 +370,8 @@ static void ahci_host_stop(struct ata_host *host) +@@ -323,11 +370,8 @@ static void ahci_host_stop(struct ata_ho if (pdata && pdata->exit) pdata->exit(dev); @@ -134,7 +132,7 @@ index 8f18ebe..656d285 100644 } #ifdef CONFIG_PM_SLEEP -@@ -362,10 +406,7 @@ static int ahci_suspend(struct device *dev) +@@ -362,10 +406,7 @@ static int ahci_suspend(struct device *d if (pdata && pdata->suspend) return pdata->suspend(dev); @@ -146,7 +144,7 @@ index 8f18ebe..656d285 100644 return 0; } -@@ -377,26 +418,20 @@ static int ahci_resume(struct device *dev) +@@ -377,26 +418,20 @@ static int ahci_resume(struct device *de struct ahci_host_priv *hpriv = host->private_data; int rc; @@ -177,7 +175,7 @@ index 8f18ebe..656d285 100644 ahci_init_controller(host); } -@@ -405,11 +440,8 @@ static int ahci_resume(struct device *dev) +@@ -405,11 +440,8 @@ static int ahci_resume(struct device *de return 0; @@ -191,8 +189,6 @@ index 8f18ebe..656d285 100644 return rc; } -diff --git a/include/linux/ahci_platform.h b/include/linux/ahci_platform.h -index 769d065..b674b01 100644 --- a/include/linux/ahci_platform.h +++ b/include/linux/ahci_platform.h @@ -33,5 +33,7 @@ struct ahci_platform_data { @@ -203,6 +199,3 @@ index 769d065..b674b01 100644 +void ahci_platform_disable_resources(struct ahci_host_priv *hpriv); #endif /* _AHCI_PLATFORM_H */ --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0113-ata-delete-non-required-instances-of-include-linux-i.patch b/target/linux/ipq806x/patches/0113-ata-delete-non-required-instances-of-include-linux-i.patch index c7db74020d..18e034e23e 100644 --- a/target/linux/ipq806x/patches/0113-ata-delete-non-required-instances-of-include-linux-i.patch +++ b/target/linux/ipq806x/patches/0113-ata-delete-non-required-instances-of-include-linux-i.patch @@ -83,8 +83,6 @@ Signed-off-by: Tejun Heo <tj@kernel.org> drivers/ata/sata_vsc.c | 1 - 68 files changed, 68 deletions(-) -diff --git a/drivers/ata/acard-ahci.c b/drivers/ata/acard-ahci.c -index fd665d9..b51605a 100644 --- a/drivers/ata/acard-ahci.c +++ b/drivers/ata/acard-ahci.c @@ -36,7 +36,6 @@ @@ -95,8 +93,6 @@ index fd665d9..b51605a 100644 #include <linux/blkdev.h> #include <linux/delay.h> #include <linux/interrupt.h> -diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c -index 8bfc477..a52a5b6 100644 --- a/drivers/ata/ahci.c +++ b/drivers/ata/ahci.c @@ -35,7 +35,6 @@ @@ -107,8 +103,6 @@ index 8bfc477..a52a5b6 100644 #include <linux/blkdev.h> #include <linux/delay.h> #include <linux/interrupt.h> -diff --git a/drivers/ata/ahci_platform.c b/drivers/ata/ahci_platform.c -index 656d285..a32df31 100644 --- a/drivers/ata/ahci_platform.c +++ b/drivers/ata/ahci_platform.c @@ -17,7 +17,6 @@ @@ -119,8 +113,6 @@ index 656d285..a32df31 100644 #include <linux/interrupt.h> #include <linux/device.h> #include <linux/platform_device.h> -diff --git a/drivers/ata/ata_generic.c b/drivers/ata/ata_generic.c -index 7d19665..9498a7d 100644 --- a/drivers/ata/ata_generic.c +++ b/drivers/ata/ata_generic.c @@ -19,7 +19,6 @@ @@ -131,8 +123,6 @@ index 7d19665..9498a7d 100644 #include <linux/blkdev.h> #include <linux/delay.h> #include <scsi/scsi_host.h> -diff --git a/drivers/ata/libahci.c b/drivers/ata/libahci.c -index f839bb3..fa02770 100644 --- a/drivers/ata/libahci.c +++ b/drivers/ata/libahci.c @@ -35,7 +35,6 @@ @@ -143,8 +133,6 @@ index f839bb3..fa02770 100644 #include <linux/blkdev.h> #include <linux/delay.h> #include <linux/interrupt.h> -diff --git a/drivers/ata/pata_acpi.c b/drivers/ata/pata_acpi.c -index 62c9ac8..5108b87 100644 --- a/drivers/ata/pata_acpi.c +++ b/drivers/ata/pata_acpi.c @@ -7,7 +7,6 @@ @@ -155,8 +143,6 @@ index 62c9ac8..5108b87 100644 #include <linux/blkdev.h> #include <linux/delay.h> #include <linux/device.h> -diff --git a/drivers/ata/pata_amd.c b/drivers/ata/pata_amd.c -index d23e2b3..1206fa6 100644 --- a/drivers/ata/pata_amd.c +++ b/drivers/ata/pata_amd.c @@ -17,7 +17,6 @@ @@ -167,8 +153,6 @@ index d23e2b3..1206fa6 100644 #include <linux/blkdev.h> #include <linux/delay.h> #include <scsi/scsi_host.h> -diff --git a/drivers/ata/pata_artop.c b/drivers/ata/pata_artop.c -index 1581dee..3aa4e65 100644 --- a/drivers/ata/pata_artop.c +++ b/drivers/ata/pata_artop.c @@ -19,7 +19,6 @@ @@ -179,8 +163,6 @@ index 1581dee..3aa4e65 100644 #include <linux/blkdev.h> #include <linux/delay.h> #include <linux/device.h> -diff --git a/drivers/ata/pata_at91.c b/drivers/ata/pata_at91.c -index d63ee8f..e9c8727 100644 --- a/drivers/ata/pata_at91.c +++ b/drivers/ata/pata_at91.c @@ -18,7 +18,6 @@ @@ -191,8 +173,6 @@ index d63ee8f..e9c8727 100644 #include <linux/blkdev.h> #include <linux/gfp.h> #include <scsi/scsi_host.h> -diff --git a/drivers/ata/pata_atiixp.c b/drivers/ata/pata_atiixp.c -index 24e5105..30fa4ca 100644 --- a/drivers/ata/pata_atiixp.c +++ b/drivers/ata/pata_atiixp.c @@ -15,7 +15,6 @@ @@ -203,8 +183,6 @@ index 24e5105..30fa4ca 100644 #include <linux/blkdev.h> #include <linux/delay.h> #include <scsi/scsi_host.h> -diff --git a/drivers/ata/pata_atp867x.c b/drivers/ata/pata_atp867x.c -index 2ca5026..7e73a0f 100644 --- a/drivers/ata/pata_atp867x.c +++ b/drivers/ata/pata_atp867x.c @@ -29,7 +29,6 @@ @@ -215,8 +193,6 @@ index 2ca5026..7e73a0f 100644 #include <linux/blkdev.h> #include <linux/delay.h> #include <linux/device.h> -diff --git a/drivers/ata/pata_cmd640.c b/drivers/ata/pata_cmd640.c -index 8fb69e5..57f1be6 100644 --- a/drivers/ata/pata_cmd640.c +++ b/drivers/ata/pata_cmd640.c @@ -15,7 +15,6 @@ @@ -227,8 +203,6 @@ index 8fb69e5..57f1be6 100644 #include <linux/blkdev.h> #include <linux/delay.h> #include <linux/gfp.h> -diff --git a/drivers/ata/pata_cmd64x.c b/drivers/ata/pata_cmd64x.c -index 1275a8d..6bca350 100644 --- a/drivers/ata/pata_cmd64x.c +++ b/drivers/ata/pata_cmd64x.c @@ -26,7 +26,6 @@ @@ -239,8 +213,6 @@ index 1275a8d..6bca350 100644 #include <linux/blkdev.h> #include <linux/delay.h> #include <scsi/scsi_host.h> -diff --git a/drivers/ata/pata_cs5520.c b/drivers/ata/pata_cs5520.c -index f10baab..bcde4b7 100644 --- a/drivers/ata/pata_cs5520.c +++ b/drivers/ata/pata_cs5520.c @@ -34,7 +34,6 @@ @@ -251,8 +223,6 @@ index f10baab..bcde4b7 100644 #include <linux/blkdev.h> #include <linux/delay.h> #include <scsi/scsi_host.h> -diff --git a/drivers/ata/pata_cs5530.c b/drivers/ata/pata_cs5530.c -index f07f229..8afe854 100644 --- a/drivers/ata/pata_cs5530.c +++ b/drivers/ata/pata_cs5530.c @@ -26,7 +26,6 @@ @@ -263,8 +233,6 @@ index f07f229..8afe854 100644 #include <linux/blkdev.h> #include <linux/delay.h> #include <scsi/scsi_host.h> -diff --git a/drivers/ata/pata_cs5535.c b/drivers/ata/pata_cs5535.c -index 997e16a..2c0986f 100644 --- a/drivers/ata/pata_cs5535.c +++ b/drivers/ata/pata_cs5535.c @@ -31,7 +31,6 @@ @@ -275,8 +243,6 @@ index 997e16a..2c0986f 100644 #include <linux/blkdev.h> #include <linux/delay.h> #include <scsi/scsi_host.h> -diff --git a/drivers/ata/pata_cs5536.c b/drivers/ata/pata_cs5536.c -index 0448860..32ddcae 100644 --- a/drivers/ata/pata_cs5536.c +++ b/drivers/ata/pata_cs5536.c @@ -33,7 +33,6 @@ @@ -287,8 +253,6 @@ index 0448860..32ddcae 100644 #include <linux/blkdev.h> #include <linux/delay.h> #include <linux/libata.h> -diff --git a/drivers/ata/pata_cypress.c b/drivers/ata/pata_cypress.c -index 810bc99..3435bd6 100644 --- a/drivers/ata/pata_cypress.c +++ b/drivers/ata/pata_cypress.c @@ -11,7 +11,6 @@ @@ -299,8 +263,6 @@ index 810bc99..3435bd6 100644 #include <linux/blkdev.h> #include <linux/delay.h> #include <scsi/scsi_host.h> -diff --git a/drivers/ata/pata_efar.c b/drivers/ata/pata_efar.c -index 3c12fd7..f440892 100644 --- a/drivers/ata/pata_efar.c +++ b/drivers/ata/pata_efar.c @@ -14,7 +14,6 @@ @@ -311,8 +273,6 @@ index 3c12fd7..f440892 100644 #include <linux/blkdev.h> #include <linux/delay.h> #include <linux/device.h> -diff --git a/drivers/ata/pata_ep93xx.c b/drivers/ata/pata_ep93xx.c -index 980b88e..cad9d45 100644 --- a/drivers/ata/pata_ep93xx.c +++ b/drivers/ata/pata_ep93xx.c @@ -34,7 +34,6 @@ @@ -323,8 +283,6 @@ index 980b88e..cad9d45 100644 #include <linux/blkdev.h> #include <scsi/scsi_host.h> #include <linux/ata.h> -diff --git a/drivers/ata/pata_hpt366.c b/drivers/ata/pata_hpt366.c -index 35b5213..8e76f79 100644 --- a/drivers/ata/pata_hpt366.c +++ b/drivers/ata/pata_hpt366.c @@ -19,7 +19,6 @@ @@ -335,8 +293,6 @@ index 35b5213..8e76f79 100644 #include <linux/blkdev.h> #include <linux/delay.h> #include <scsi/scsi_host.h> -diff --git a/drivers/ata/pata_hpt37x.c b/drivers/ata/pata_hpt37x.c -index a9d74ef..3ba843f 100644 --- a/drivers/ata/pata_hpt37x.c +++ b/drivers/ata/pata_hpt37x.c @@ -19,7 +19,6 @@ @@ -347,8 +303,6 @@ index a9d74ef..3ba843f 100644 #include <linux/blkdev.h> #include <linux/delay.h> #include <scsi/scsi_host.h> -diff --git a/drivers/ata/pata_hpt3x2n.c b/drivers/ata/pata_hpt3x2n.c -index 4be0398..b93c0f0 100644 --- a/drivers/ata/pata_hpt3x2n.c +++ b/drivers/ata/pata_hpt3x2n.c @@ -20,7 +20,6 @@ @@ -359,8 +313,6 @@ index 4be0398..b93c0f0 100644 #include <linux/blkdev.h> #include <linux/delay.h> #include <scsi/scsi_host.h> -diff --git a/drivers/ata/pata_hpt3x3.c b/drivers/ata/pata_hpt3x3.c -index 85cf286..255c5aa 100644 --- a/drivers/ata/pata_hpt3x3.c +++ b/drivers/ata/pata_hpt3x3.c @@ -16,7 +16,6 @@ @@ -371,8 +323,6 @@ index 85cf286..255c5aa 100644 #include <linux/blkdev.h> #include <linux/delay.h> #include <scsi/scsi_host.h> -diff --git a/drivers/ata/pata_imx.c b/drivers/ata/pata_imx.c -index b0b18ec..7e69797 100644 --- a/drivers/ata/pata_imx.c +++ b/drivers/ata/pata_imx.c @@ -15,7 +15,6 @@ @@ -383,8 +333,6 @@ index b0b18ec..7e69797 100644 #include <linux/blkdev.h> #include <scsi/scsi_host.h> #include <linux/ata.h> -diff --git a/drivers/ata/pata_it8213.c b/drivers/ata/pata_it8213.c -index 2a8dd95..81369d1 100644 --- a/drivers/ata/pata_it8213.c +++ b/drivers/ata/pata_it8213.c @@ -10,7 +10,6 @@ @@ -395,8 +343,6 @@ index 2a8dd95..81369d1 100644 #include <linux/blkdev.h> #include <linux/delay.h> #include <linux/device.h> -diff --git a/drivers/ata/pata_it821x.c b/drivers/ata/pata_it821x.c -index 581e04d..dc3d787 100644 --- a/drivers/ata/pata_it821x.c +++ b/drivers/ata/pata_it821x.c @@ -72,7 +72,6 @@ @@ -407,8 +353,6 @@ index 581e04d..dc3d787 100644 #include <linux/blkdev.h> #include <linux/delay.h> #include <linux/slab.h> -diff --git a/drivers/ata/pata_jmicron.c b/drivers/ata/pata_jmicron.c -index 76e739b0..b1cfa02 100644 --- a/drivers/ata/pata_jmicron.c +++ b/drivers/ata/pata_jmicron.c @@ -10,7 +10,6 @@ @@ -419,8 +363,6 @@ index 76e739b0..b1cfa02 100644 #include <linux/blkdev.h> #include <linux/delay.h> #include <linux/device.h> -diff --git a/drivers/ata/pata_marvell.c b/drivers/ata/pata_marvell.c -index a4f5e78..6bad3df 100644 --- a/drivers/ata/pata_marvell.c +++ b/drivers/ata/pata_marvell.c @@ -11,7 +11,6 @@ @@ -431,8 +373,6 @@ index a4f5e78..6bad3df 100644 #include <linux/blkdev.h> #include <linux/delay.h> #include <linux/device.h> -diff --git a/drivers/ata/pata_mpiix.c b/drivers/ata/pata_mpiix.c -index 1f5f28b..f39a537 100644 --- a/drivers/ata/pata_mpiix.c +++ b/drivers/ata/pata_mpiix.c @@ -28,7 +28,6 @@ @@ -443,8 +383,6 @@ index 1f5f28b..f39a537 100644 #include <linux/blkdev.h> #include <linux/delay.h> #include <scsi/scsi_host.h> -diff --git a/drivers/ata/pata_netcell.c b/drivers/ata/pata_netcell.c -index ad1a0fe..e3b9709 100644 --- a/drivers/ata/pata_netcell.c +++ b/drivers/ata/pata_netcell.c @@ -7,7 +7,6 @@ @@ -455,8 +393,6 @@ index ad1a0fe..e3b9709 100644 #include <linux/blkdev.h> #include <linux/delay.h> #include <linux/device.h> -diff --git a/drivers/ata/pata_ninja32.c b/drivers/ata/pata_ninja32.c -index 9513e07..56201a6 100644 --- a/drivers/ata/pata_ninja32.c +++ b/drivers/ata/pata_ninja32.c @@ -37,7 +37,6 @@ @@ -467,8 +403,6 @@ index 9513e07..56201a6 100644 #include <linux/blkdev.h> #include <linux/delay.h> #include <scsi/scsi_host.h> -diff --git a/drivers/ata/pata_ns87410.c b/drivers/ata/pata_ns87410.c -index 0c424da..6154c3e 100644 --- a/drivers/ata/pata_ns87410.c +++ b/drivers/ata/pata_ns87410.c @@ -20,7 +20,6 @@ @@ -479,8 +413,6 @@ index 0c424da..6154c3e 100644 #include <linux/blkdev.h> #include <linux/delay.h> #include <scsi/scsi_host.h> -diff --git a/drivers/ata/pata_ns87415.c b/drivers/ata/pata_ns87415.c -index 16dc3a6..d44df7c 100644 --- a/drivers/ata/pata_ns87415.c +++ b/drivers/ata/pata_ns87415.c @@ -25,7 +25,6 @@ @@ -491,8 +423,6 @@ index 16dc3a6..d44df7c 100644 #include <linux/blkdev.h> #include <linux/delay.h> #include <linux/device.h> -diff --git a/drivers/ata/pata_oldpiix.c b/drivers/ata/pata_oldpiix.c -index d77b2e1..319b644 100644 --- a/drivers/ata/pata_oldpiix.c +++ b/drivers/ata/pata_oldpiix.c @@ -16,7 +16,6 @@ @@ -503,8 +433,6 @@ index d77b2e1..319b644 100644 #include <linux/blkdev.h> #include <linux/delay.h> #include <linux/device.h> -diff --git a/drivers/ata/pata_opti.c b/drivers/ata/pata_opti.c -index 4ea70cd..fb042e0 100644 --- a/drivers/ata/pata_opti.c +++ b/drivers/ata/pata_opti.c @@ -26,7 +26,6 @@ @@ -515,8 +443,6 @@ index 4ea70cd..fb042e0 100644 #include <linux/blkdev.h> #include <linux/delay.h> #include <scsi/scsi_host.h> -diff --git a/drivers/ata/pata_optidma.c b/drivers/ata/pata_optidma.c -index 78ede3f..bb71ea2 100644 --- a/drivers/ata/pata_optidma.c +++ b/drivers/ata/pata_optidma.c @@ -25,7 +25,6 @@ @@ -527,8 +453,6 @@ index 78ede3f..bb71ea2 100644 #include <linux/blkdev.h> #include <linux/delay.h> #include <scsi/scsi_host.h> -diff --git a/drivers/ata/pata_pcmcia.c b/drivers/ata/pata_pcmcia.c -index 40254f4..bcc4b96 100644 --- a/drivers/ata/pata_pcmcia.c +++ b/drivers/ata/pata_pcmcia.c @@ -26,7 +26,6 @@ @@ -539,8 +463,6 @@ index 40254f4..bcc4b96 100644 #include <linux/blkdev.h> #include <linux/delay.h> #include <linux/slab.h> -diff --git a/drivers/ata/pata_pdc2027x.c b/drivers/ata/pata_pdc2027x.c -index 9d874c8..1151f23 100644 --- a/drivers/ata/pata_pdc2027x.c +++ b/drivers/ata/pata_pdc2027x.c @@ -25,7 +25,6 @@ @@ -551,8 +473,6 @@ index 9d874c8..1151f23 100644 #include <linux/blkdev.h> #include <linux/delay.h> #include <linux/device.h> -diff --git a/drivers/ata/pata_pdc202xx_old.c b/drivers/ata/pata_pdc202xx_old.c -index c34fc50..defa050 100644 --- a/drivers/ata/pata_pdc202xx_old.c +++ b/drivers/ata/pata_pdc202xx_old.c @@ -15,7 +15,6 @@ @@ -563,8 +483,6 @@ index c34fc50..defa050 100644 #include <linux/blkdev.h> #include <linux/delay.h> #include <scsi/scsi_host.h> -diff --git a/drivers/ata/pata_piccolo.c b/drivers/ata/pata_piccolo.c -index 2beb6b5..0b46be1 100644 --- a/drivers/ata/pata_piccolo.c +++ b/drivers/ata/pata_piccolo.c @@ -18,7 +18,6 @@ @@ -575,8 +493,6 @@ index 2beb6b5..0b46be1 100644 #include <linux/blkdev.h> #include <linux/delay.h> #include <scsi/scsi_host.h> -diff --git a/drivers/ata/pata_platform.c b/drivers/ata/pata_platform.c -index 0279488..a5579b5 100644 --- a/drivers/ata/pata_platform.c +++ b/drivers/ata/pata_platform.c @@ -13,7 +13,6 @@ @@ -587,8 +503,6 @@ index 0279488..a5579b5 100644 #include <linux/blkdev.h> #include <scsi/scsi_host.h> #include <linux/ata.h> -diff --git a/drivers/ata/pata_pxa.c b/drivers/ata/pata_pxa.c -index a6f05ac..73259bf 100644 --- a/drivers/ata/pata_pxa.c +++ b/drivers/ata/pata_pxa.c @@ -20,7 +20,6 @@ @@ -599,8 +513,6 @@ index a6f05ac..73259bf 100644 #include <linux/blkdev.h> #include <linux/ata.h> #include <linux/libata.h> -diff --git a/drivers/ata/pata_radisys.c b/drivers/ata/pata_radisys.c -index f582ba1..be3f102 100644 --- a/drivers/ata/pata_radisys.c +++ b/drivers/ata/pata_radisys.c @@ -15,7 +15,6 @@ @@ -611,8 +523,6 @@ index f582ba1..be3f102 100644 #include <linux/blkdev.h> #include <linux/delay.h> #include <linux/device.h> -diff --git a/drivers/ata/pata_rdc.c b/drivers/ata/pata_rdc.c -index 79a970f..521b213 100644 --- a/drivers/ata/pata_rdc.c +++ b/drivers/ata/pata_rdc.c @@ -24,7 +24,6 @@ @@ -623,8 +533,6 @@ index 79a970f..521b213 100644 #include <linux/blkdev.h> #include <linux/delay.h> #include <linux/device.h> -diff --git a/drivers/ata/pata_rz1000.c b/drivers/ata/pata_rz1000.c -index 040b093..caedc90 100644 --- a/drivers/ata/pata_rz1000.c +++ b/drivers/ata/pata_rz1000.c @@ -14,7 +14,6 @@ @@ -635,8 +543,6 @@ index 040b093..caedc90 100644 #include <linux/blkdev.h> #include <linux/delay.h> #include <scsi/scsi_host.h> -diff --git a/drivers/ata/pata_sc1200.c b/drivers/ata/pata_sc1200.c -index ce2f828..96a232f 100644 --- a/drivers/ata/pata_sc1200.c +++ b/drivers/ata/pata_sc1200.c @@ -32,7 +32,6 @@ @@ -647,8 +553,6 @@ index ce2f828..96a232f 100644 #include <linux/blkdev.h> #include <linux/delay.h> #include <scsi/scsi_host.h> -diff --git a/drivers/ata/pata_scc.c b/drivers/ata/pata_scc.c -index f35f15f..f1f5b5a 100644 --- a/drivers/ata/pata_scc.c +++ b/drivers/ata/pata_scc.c @@ -35,7 +35,6 @@ @@ -659,8 +563,6 @@ index f35f15f..f1f5b5a 100644 #include <linux/blkdev.h> #include <linux/delay.h> #include <linux/device.h> -diff --git a/drivers/ata/pata_sch.c b/drivers/ata/pata_sch.c -index d3830c4..5a1cde0 100644 --- a/drivers/ata/pata_sch.c +++ b/drivers/ata/pata_sch.c @@ -27,7 +27,6 @@ @@ -671,8 +573,6 @@ index d3830c4..5a1cde0 100644 #include <linux/blkdev.h> #include <linux/delay.h> #include <linux/device.h> -diff --git a/drivers/ata/pata_serverworks.c b/drivers/ata/pata_serverworks.c -index 96c6a79..e27f31f 100644 --- a/drivers/ata/pata_serverworks.c +++ b/drivers/ata/pata_serverworks.c @@ -34,7 +34,6 @@ @@ -683,8 +583,6 @@ index 96c6a79..e27f31f 100644 #include <linux/blkdev.h> #include <linux/delay.h> #include <scsi/scsi_host.h> -diff --git a/drivers/ata/pata_sil680.c b/drivers/ata/pata_sil680.c -index c4b0b07..73fe362 100644 --- a/drivers/ata/pata_sil680.c +++ b/drivers/ata/pata_sil680.c @@ -25,7 +25,6 @@ @@ -695,8 +593,6 @@ index c4b0b07..73fe362 100644 #include <linux/blkdev.h> #include <linux/delay.h> #include <scsi/scsi_host.h> -diff --git a/drivers/ata/pata_sis.c b/drivers/ata/pata_sis.c -index 1e83636..78d913a 100644 --- a/drivers/ata/pata_sis.c +++ b/drivers/ata/pata_sis.c @@ -26,7 +26,6 @@ @@ -707,8 +603,6 @@ index 1e83636..78d913a 100644 #include <linux/blkdev.h> #include <linux/delay.h> #include <linux/device.h> -diff --git a/drivers/ata/pata_sl82c105.c b/drivers/ata/pata_sl82c105.c -index 6816911..900f0e4 100644 --- a/drivers/ata/pata_sl82c105.c +++ b/drivers/ata/pata_sl82c105.c @@ -19,7 +19,6 @@ @@ -719,8 +613,6 @@ index 6816911..900f0e4 100644 #include <linux/blkdev.h> #include <linux/delay.h> #include <scsi/scsi_host.h> -diff --git a/drivers/ata/pata_triflex.c b/drivers/ata/pata_triflex.c -index 94473da..7bc78e2 100644 --- a/drivers/ata/pata_triflex.c +++ b/drivers/ata/pata_triflex.c @@ -36,7 +36,6 @@ @@ -731,8 +623,6 @@ index 94473da..7bc78e2 100644 #include <linux/blkdev.h> #include <linux/delay.h> #include <scsi/scsi_host.h> -diff --git a/drivers/ata/pata_via.c b/drivers/ata/pata_via.c -index c3ab9a6..f6c9632 100644 --- a/drivers/ata/pata_via.c +++ b/drivers/ata/pata_via.c @@ -55,7 +55,6 @@ @@ -743,8 +633,6 @@ index c3ab9a6..f6c9632 100644 #include <linux/blkdev.h> #include <linux/delay.h> #include <linux/gfp.h> -diff --git a/drivers/ata/pdc_adma.c b/drivers/ata/pdc_adma.c -index 8ea6e6a..f10631b 100644 --- a/drivers/ata/pdc_adma.c +++ b/drivers/ata/pdc_adma.c @@ -36,7 +36,6 @@ @@ -755,8 +643,6 @@ index 8ea6e6a..f10631b 100644 #include <linux/blkdev.h> #include <linux/delay.h> #include <linux/interrupt.h> -diff --git a/drivers/ata/sata_dwc_460ex.c b/drivers/ata/sata_dwc_460ex.c -index 523524b..73510d0 100644 --- a/drivers/ata/sata_dwc_460ex.c +++ b/drivers/ata/sata_dwc_460ex.c @@ -29,7 +29,6 @@ @@ -767,8 +653,6 @@ index 523524b..73510d0 100644 #include <linux/device.h> #include <linux/of_address.h> #include <linux/of_irq.h> -diff --git a/drivers/ata/sata_highbank.c b/drivers/ata/sata_highbank.c -index b3b18d1..d4df0bf 100644 --- a/drivers/ata/sata_highbank.c +++ b/drivers/ata/sata_highbank.c @@ -19,7 +19,6 @@ @@ -779,8 +663,6 @@ index b3b18d1..d4df0bf 100644 #include <linux/types.h> #include <linux/err.h> #include <linux/io.h> -diff --git a/drivers/ata/sata_nv.c b/drivers/ata/sata_nv.c -index d74def8..ba5f271 100644 --- a/drivers/ata/sata_nv.c +++ b/drivers/ata/sata_nv.c @@ -40,7 +40,6 @@ @@ -791,8 +673,6 @@ index d74def8..ba5f271 100644 #include <linux/blkdev.h> #include <linux/delay.h> #include <linux/interrupt.h> -diff --git a/drivers/ata/sata_promise.c b/drivers/ata/sata_promise.c -index 97f4acb..3638887 100644 --- a/drivers/ata/sata_promise.c +++ b/drivers/ata/sata_promise.c @@ -35,7 +35,6 @@ @@ -803,8 +683,6 @@ index 97f4acb..3638887 100644 #include <linux/blkdev.h> #include <linux/delay.h> #include <linux/interrupt.h> -diff --git a/drivers/ata/sata_qstor.c b/drivers/ata/sata_qstor.c -index 3b0dd57..9a6bd4c 100644 --- a/drivers/ata/sata_qstor.c +++ b/drivers/ata/sata_qstor.c @@ -31,7 +31,6 @@ @@ -815,8 +693,6 @@ index 3b0dd57..9a6bd4c 100644 #include <linux/blkdev.h> #include <linux/delay.h> #include <linux/interrupt.h> -diff --git a/drivers/ata/sata_sil.c b/drivers/ata/sata_sil.c -index b7695e8..3062f86 100644 --- a/drivers/ata/sata_sil.c +++ b/drivers/ata/sata_sil.c @@ -37,7 +37,6 @@ @@ -827,8 +703,6 @@ index b7695e8..3062f86 100644 #include <linux/blkdev.h> #include <linux/delay.h> #include <linux/interrupt.h> -diff --git a/drivers/ata/sata_sis.c b/drivers/ata/sata_sis.c -index 1ad2f62..b513428 100644 --- a/drivers/ata/sata_sis.c +++ b/drivers/ata/sata_sis.c @@ -33,7 +33,6 @@ @@ -839,8 +713,6 @@ index 1ad2f62..b513428 100644 #include <linux/blkdev.h> #include <linux/delay.h> #include <linux/interrupt.h> -diff --git a/drivers/ata/sata_svw.c b/drivers/ata/sata_svw.c -index dc4f701..c630fa8 100644 --- a/drivers/ata/sata_svw.c +++ b/drivers/ata/sata_svw.c @@ -39,7 +39,6 @@ @@ -851,8 +723,6 @@ index dc4f701..c630fa8 100644 #include <linux/blkdev.h> #include <linux/delay.h> #include <linux/interrupt.h> -diff --git a/drivers/ata/sata_sx4.c b/drivers/ata/sata_sx4.c -index 9947010..6cd0312 100644 --- a/drivers/ata/sata_sx4.c +++ b/drivers/ata/sata_sx4.c @@ -82,7 +82,6 @@ @@ -863,8 +733,6 @@ index 9947010..6cd0312 100644 #include <linux/blkdev.h> #include <linux/delay.h> #include <linux/interrupt.h> -diff --git a/drivers/ata/sata_uli.c b/drivers/ata/sata_uli.c -index 6d64891..08f98c3 100644 --- a/drivers/ata/sata_uli.c +++ b/drivers/ata/sata_uli.c @@ -28,7 +28,6 @@ @@ -875,8 +743,6 @@ index 6d64891..08f98c3 100644 #include <linux/blkdev.h> #include <linux/delay.h> #include <linux/interrupt.h> -diff --git a/drivers/ata/sata_via.c b/drivers/ata/sata_via.c -index 87f056e..f72e842 100644 --- a/drivers/ata/sata_via.c +++ b/drivers/ata/sata_via.c @@ -36,7 +36,6 @@ @@ -887,8 +753,6 @@ index 87f056e..f72e842 100644 #include <linux/blkdev.h> #include <linux/delay.h> #include <linux/device.h> -diff --git a/drivers/ata/sata_vsc.c b/drivers/ata/sata_vsc.c -index 44f304b..29e847a 100644 --- a/drivers/ata/sata_vsc.c +++ b/drivers/ata/sata_vsc.c @@ -37,7 +37,6 @@ @@ -899,6 +763,3 @@ index 44f304b..29e847a 100644 #include <linux/blkdev.h> #include <linux/delay.h> #include <linux/interrupt.h> --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0114-ahci-platform-Library-ise-ahci_probe-functionality.patch b/target/linux/ipq806x/patches/0114-ahci-platform-Library-ise-ahci_probe-functionality.patch index 9b9c7afd47..3b638d45ac 100644 --- a/target/linux/ipq806x/patches/0114-ahci-platform-Library-ise-ahci_probe-functionality.patch +++ b/target/linux/ipq806x/patches/0114-ahci-platform-Library-ise-ahci_probe-functionality.patch @@ -28,11 +28,9 @@ Signed-off-by: Tejun Heo <tj@kernel.org> include/linux/ahci_platform.h | 14 +++ 2 files changed, 137 insertions(+), 65 deletions(-) -diff --git a/drivers/ata/ahci_platform.c b/drivers/ata/ahci_platform.c -index a32df31..19e9eaa 100644 --- a/drivers/ata/ahci_platform.c +++ b/drivers/ata/ahci_platform.c -@@ -188,64 +188,60 @@ void ahci_platform_disable_resources(struct ahci_host_priv *hpriv) +@@ -188,64 +188,60 @@ void ahci_platform_disable_resources(str } EXPORT_SYMBOL_GPL(ahci_platform_disable_resources); @@ -85,31 +83,31 @@ index a32df31..19e9eaa 100644 - dev_err(dev, "no mmio space\n"); - return -EINVAL; - } -- ++ if (!devres_open_group(dev, NULL, GFP_KERNEL)) ++ return ERR_PTR(-ENOMEM); + - irq = platform_get_irq(pdev, 0); - if (irq <= 0) { - dev_err(dev, "no irq\n"); - return -EINVAL; - } -+ if (!devres_open_group(dev, NULL, GFP_KERNEL)) -+ return ERR_PTR(-ENOMEM); - +- - if (pdata && pdata->ata_port_info) - pi = *pdata->ata_port_info; -- -- hpriv = devm_kzalloc(dev, sizeof(*hpriv), GFP_KERNEL); -- if (!hpriv) { -- dev_err(dev, "can't alloc ahci_host_priv\n"); -- return -ENOMEM; -- } + hpriv = devres_alloc(ahci_platform_put_resources, sizeof(*hpriv), + GFP_KERNEL); + if (!hpriv) + goto err_out; -- hpriv->flags |= (unsigned long)pi.private_data; +- hpriv = devm_kzalloc(dev, sizeof(*hpriv), GFP_KERNEL); +- if (!hpriv) { +- dev_err(dev, "can't alloc ahci_host_priv\n"); +- return -ENOMEM; +- } + devres_add(dev, hpriv); +- hpriv->flags |= (unsigned long)pi.private_data; +- - hpriv->mmio = devm_ioremap(dev, mem->start, resource_size(mem)); + hpriv->mmio = devm_ioremap_resource(dev, + platform_get_resource(pdev, IORESOURCE_MEM, 0)); @@ -129,7 +127,7 @@ index a32df31..19e9eaa 100644 hpriv->target_pwr = NULL; } -@@ -264,33 +260,59 @@ static int ahci_probe(struct platform_device *pdev) +@@ -264,33 +260,59 @@ static int ahci_probe(struct platform_de if (IS_ERR(clk)) { rc = PTR_ERR(clk); if (rc == -EPROBE_DEFER) @@ -207,7 +205,7 @@ index a32df31..19e9eaa 100644 if (hpriv->cap & HOST_CAP_NCQ) pi.flags |= ATA_FLAG_NCQ; -@@ -307,10 +329,8 @@ static int ahci_probe(struct platform_device *pdev) +@@ -307,10 +329,8 @@ static int ahci_probe(struct platform_de n_ports = max(ahci_nr_ports(hpriv->cap), fls(hpriv->port_map)); host = ata_host_alloc_pinfo(dev, ppi, n_ports); @@ -220,7 +218,7 @@ index a32df31..19e9eaa 100644 host->private_data = hpriv; -@@ -325,7 +345,8 @@ static int ahci_probe(struct platform_device *pdev) +@@ -325,7 +345,8 @@ static int ahci_probe(struct platform_de for (i = 0; i < host->n_ports; i++) { struct ata_port *ap = host->ports[i]; @@ -230,7 +228,7 @@ index a32df31..19e9eaa 100644 ata_port_desc(ap, "port 0x%x", 0x100 + ap->port_no * 0x80); /* set enclosure management message type */ -@@ -339,13 +360,53 @@ static int ahci_probe(struct platform_device *pdev) +@@ -339,13 +360,53 @@ static int ahci_probe(struct platform_de rc = ahci_reset_controller(host); if (rc) @@ -296,7 +294,7 @@ index a32df31..19e9eaa 100644 return rc; } -@@ -370,7 +429,6 @@ static void ahci_host_stop(struct ata_host *host) +@@ -370,7 +429,6 @@ static void ahci_host_stop(struct ata_ho pdata->exit(dev); ahci_platform_disable_resources(hpriv); @@ -304,8 +302,6 @@ index a32df31..19e9eaa 100644 } #ifdef CONFIG_PM_SLEEP -diff --git a/include/linux/ahci_platform.h b/include/linux/ahci_platform.h -index b674b01..b80c51c 100644 --- a/include/linux/ahci_platform.h +++ b/include/linux/ahci_platform.h @@ -20,7 +20,14 @@ @@ -323,7 +319,7 @@ index b674b01..b80c51c 100644 struct ahci_platform_data { int (*init)(struct device *dev, void __iomem *addr); void (*exit)(struct device *dev); -@@ -35,5 +42,12 @@ int ahci_platform_enable_clks(struct ahci_host_priv *hpriv); +@@ -35,5 +42,12 @@ int ahci_platform_enable_clks(struct ahc void ahci_platform_disable_clks(struct ahci_host_priv *hpriv); int ahci_platform_enable_resources(struct ahci_host_priv *hpriv); void ahci_platform_disable_resources(struct ahci_host_priv *hpriv); @@ -336,6 +332,3 @@ index b674b01..b80c51c 100644 + unsigned int mask_port_map); #endif /* _AHCI_PLATFORM_H */ --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0115-ahci-platform-Library-ise-suspend-resume-functionali.patch b/target/linux/ipq806x/patches/0115-ahci-platform-Library-ise-suspend-resume-functionali.patch index 9a9cb074e8..8cc7d7acc9 100644 --- a/target/linux/ipq806x/patches/0115-ahci-platform-Library-ise-suspend-resume-functionali.patch +++ b/target/linux/ipq806x/patches/0115-ahci-platform-Library-ise-suspend-resume-functionali.patch @@ -17,11 +17,9 @@ Signed-off-by: Tejun Heo <tj@kernel.org> include/linux/ahci_platform.h | 5 +++ 2 files changed, 87 insertions(+), 15 deletions(-) -diff --git a/drivers/ata/ahci_platform.c b/drivers/ata/ahci_platform.c -index 19e9eaa..01f7bbe 100644 --- a/drivers/ata/ahci_platform.c +++ b/drivers/ata/ahci_platform.c -@@ -432,14 +432,23 @@ static void ahci_host_stop(struct ata_host *host) +@@ -432,14 +432,23 @@ static void ahci_host_stop(struct ata_ho } #ifdef CONFIG_PM_SLEEP @@ -48,7 +46,7 @@ index 19e9eaa..01f7bbe 100644 if (hpriv->flags & AHCI_HFLAG_NO_SUSPEND) { dev_err(dev, "firmware update required for suspend/resume\n"); -@@ -456,7 +465,58 @@ static int ahci_suspend(struct device *dev) +@@ -456,7 +465,58 @@ static int ahci_suspend(struct device *d writel(ctl, mmio + HOST_CTL); readl(mmio + HOST_CTL); /* flush */ @@ -108,7 +106,7 @@ index 19e9eaa..01f7bbe 100644 if (rc) return rc; -@@ -467,8 +527,19 @@ static int ahci_suspend(struct device *dev) +@@ -467,8 +527,19 @@ static int ahci_suspend(struct device *d return 0; } @@ -129,7 +127,7 @@ index 19e9eaa..01f7bbe 100644 { struct ahci_platform_data *pdata = dev_get_platdata(dev); struct ata_host *host = dev_get_drvdata(dev); -@@ -485,15 +556,9 @@ static int ahci_resume(struct device *dev) +@@ -485,15 +556,9 @@ static int ahci_resume(struct device *de goto disable_resources; } @@ -161,11 +159,9 @@ index 19e9eaa..01f7bbe 100644 static const struct of_device_id ahci_of_match[] = { { .compatible = "snps,spear-ahci", }, -diff --git a/include/linux/ahci_platform.h b/include/linux/ahci_platform.h -index b80c51c..542f268 100644 --- a/include/linux/ahci_platform.h +++ b/include/linux/ahci_platform.h -@@ -50,4 +50,9 @@ int ahci_platform_init_host(struct platform_device *pdev, +@@ -50,4 +50,9 @@ int ahci_platform_init_host(struct platf unsigned int force_port_map, unsigned int mask_port_map); @@ -175,6 +171,3 @@ index b80c51c..542f268 100644 +int ahci_platform_resume(struct device *dev); + #endif /* _AHCI_PLATFORM_H */ --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0116-ata-ahci_platform-Add-DT-compatible-for-Synopsis-DWC.patch b/target/linux/ipq806x/patches/0116-ata-ahci_platform-Add-DT-compatible-for-Synopsis-DWC.patch index 72c2c2e07d..e64e5c9eaa 100644 --- a/target/linux/ipq806x/patches/0116-ata-ahci_platform-Add-DT-compatible-for-Synopsis-DWC.patch +++ b/target/linux/ipq806x/patches/0116-ata-ahci_platform-Add-DT-compatible-for-Synopsis-DWC.patch @@ -15,11 +15,9 @@ Signed-off-by: Tejun Heo <tj@kernel.org> drivers/ata/ahci_platform.c | 1 + 1 file changed, 1 insertion(+) -diff --git a/drivers/ata/ahci_platform.c b/drivers/ata/ahci_platform.c -index 01f7bbe..968e7d9 100644 --- a/drivers/ata/ahci_platform.c +++ b/drivers/ata/ahci_platform.c -@@ -577,6 +577,7 @@ static const struct of_device_id ahci_of_match[] = { +@@ -577,6 +577,7 @@ static const struct of_device_id ahci_of { .compatible = "snps,spear-ahci", }, { .compatible = "snps,exynos5440-ahci", }, { .compatible = "ibm,476gtr-ahci", }, @@ -27,6 +25,3 @@ index 01f7bbe..968e7d9 100644 {}, }; MODULE_DEVICE_TABLE(of, ahci_of_match); --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0117-ata-ahci_platform-Manage-SATA-PHY.patch b/target/linux/ipq806x/patches/0117-ata-ahci_platform-Manage-SATA-PHY.patch index fab7e57635..20211dcc1d 100644 --- a/target/linux/ipq806x/patches/0117-ata-ahci_platform-Manage-SATA-PHY.patch +++ b/target/linux/ipq806x/patches/0117-ata-ahci_platform-Manage-SATA-PHY.patch @@ -18,8 +18,6 @@ Signed-off-by: Tejun Heo<tj@kernel.org> drivers/ata/ahci_platform.c | 47 +++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 47 insertions(+), 2 deletions(-) -diff --git a/drivers/ata/ahci.h b/drivers/ata/ahci.h -index bf8100c..3ab7ac9 100644 --- a/drivers/ata/ahci.h +++ b/drivers/ata/ahci.h @@ -37,6 +37,7 @@ @@ -30,7 +28,7 @@ index bf8100c..3ab7ac9 100644 #include <linux/regulator/consumer.h> /* Enclosure Management Control */ -@@ -325,6 +326,7 @@ struct ahci_host_priv { +@@ -326,6 +327,7 @@ struct ahci_host_priv { u32 em_msg_type; /* EM message type */ struct clk *clks[AHCI_MAX_CLKS]; /* Optional */ struct regulator *target_pwr; /* Optional */ @@ -38,8 +36,6 @@ index bf8100c..3ab7ac9 100644 void *plat_data; /* Other platform data */ /* * Optional ahci_start_engine override, if not set this gets set to the -diff --git a/drivers/ata/ahci_platform.c b/drivers/ata/ahci_platform.c -index 968e7d9..243dde3 100644 --- a/drivers/ata/ahci_platform.c +++ b/drivers/ata/ahci_platform.c @@ -22,6 +22,7 @@ @@ -50,7 +46,7 @@ index 968e7d9..243dde3 100644 #include "ahci.h" static void ahci_host_stop(struct ata_host *host); -@@ -140,6 +141,7 @@ EXPORT_SYMBOL_GPL(ahci_platform_disable_clks); +@@ -140,6 +141,7 @@ EXPORT_SYMBOL_GPL(ahci_platform_disable_ * following order: * 1) Regulator * 2) Clocks (through ahci_platform_enable_clks) @@ -58,7 +54,7 @@ index 968e7d9..243dde3 100644 * * If resource enabling fails at any point the previous enabled resources * are disabled in reverse order. -@@ -161,8 +163,23 @@ int ahci_platform_enable_resources(struct ahci_host_priv *hpriv) +@@ -161,8 +163,23 @@ int ahci_platform_enable_resources(struc if (rc) goto disable_regulator; @@ -82,7 +78,7 @@ index 968e7d9..243dde3 100644 disable_regulator: if (hpriv->target_pwr) regulator_disable(hpriv->target_pwr); -@@ -176,11 +193,17 @@ EXPORT_SYMBOL_GPL(ahci_platform_enable_resources); +@@ -176,11 +193,17 @@ EXPORT_SYMBOL_GPL(ahci_platform_enable_r * * This function disables all ahci_platform managed resources in the * following order: @@ -102,7 +98,7 @@ index 968e7d9..243dde3 100644 ahci_platform_disable_clks(hpriv); if (hpriv->target_pwr) -@@ -208,6 +231,7 @@ static void ahci_platform_put_resources(struct device *dev, void *res) +@@ -208,6 +231,7 @@ static void ahci_platform_put_resources( * 2) regulator for controlling the targets power (optional) * 3) 0 - AHCI_MAX_CLKS clocks, as specified in the devs devicetree node, * or for non devicetree enabled platforms a single clock @@ -110,7 +106,7 @@ index 968e7d9..243dde3 100644 * * RETURNS: * The allocated ahci_host_priv on success, otherwise an ERR_PTR value -@@ -266,6 +290,25 @@ struct ahci_host_priv *ahci_platform_get_resources( +@@ -266,6 +290,25 @@ struct ahci_host_priv *ahci_platform_get hpriv->clks[i] = clk; } @@ -136,6 +132,3 @@ index 968e7d9..243dde3 100644 devres_remove_group(dev, NULL); return hpriv; --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0118-ata-ahci_platform-runtime-resume-the-device-before-u.patch b/target/linux/ipq806x/patches/0118-ata-ahci_platform-runtime-resume-the-device-before-u.patch index 2f3e707c31..6603bb9537 100644 --- a/target/linux/ipq806x/patches/0118-ata-ahci_platform-runtime-resume-the-device-before-u.patch +++ b/target/linux/ipq806x/patches/0118-ata-ahci_platform-runtime-resume-the-device-before-u.patch @@ -22,11 +22,9 @@ Signed-off-by: Tejun Heo <tj@kernel.org> drivers/ata/ahci_platform.c | 15 +++++++++++++++ 2 files changed, 16 insertions(+) -diff --git a/drivers/ata/ahci.h b/drivers/ata/ahci.h -index 3ab7ac9..51af275 100644 --- a/drivers/ata/ahci.h +++ b/drivers/ata/ahci.h -@@ -324,6 +324,7 @@ struct ahci_host_priv { +@@ -325,6 +325,7 @@ struct ahci_host_priv { u32 em_loc; /* enclosure management location */ u32 em_buf_sz; /* EM buffer size in byte */ u32 em_msg_type; /* EM message type */ @@ -34,8 +32,6 @@ index 3ab7ac9..51af275 100644 struct clk *clks[AHCI_MAX_CLKS]; /* Optional */ struct regulator *target_pwr; /* Optional */ struct phy *phy; /* If platform uses phy */ -diff --git a/drivers/ata/ahci_platform.c b/drivers/ata/ahci_platform.c -index 243dde3..fc32863 100644 --- a/drivers/ata/ahci_platform.c +++ b/drivers/ata/ahci_platform.c @@ -23,6 +23,7 @@ @@ -46,7 +42,7 @@ index 243dde3..fc32863 100644 #include "ahci.h" static void ahci_host_stop(struct ata_host *host); -@@ -216,6 +217,11 @@ static void ahci_platform_put_resources(struct device *dev, void *res) +@@ -216,6 +217,11 @@ static void ahci_platform_put_resources( struct ahci_host_priv *hpriv = res; int c; @@ -58,7 +54,7 @@ index 243dde3..fc32863 100644 for (c = 0; c < AHCI_MAX_CLKS && hpriv->clks[c]; c++) clk_put(hpriv->clks[c]); } -@@ -309,6 +315,10 @@ struct ahci_host_priv *ahci_platform_get_resources( +@@ -309,6 +315,10 @@ struct ahci_host_priv *ahci_platform_get } } @@ -69,7 +65,7 @@ index 243dde3..fc32863 100644 devres_remove_group(dev, NULL); return hpriv; -@@ -603,6 +613,11 @@ int ahci_platform_resume(struct device *dev) +@@ -603,6 +613,11 @@ int ahci_platform_resume(struct device * if (rc) goto disable_resources; @@ -81,6 +77,3 @@ index 243dde3..fc32863 100644 return 0; disable_resources: --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0119-ahci_platform-Drop-support-for-ahci-strict-platform-.patch b/target/linux/ipq806x/patches/0119-ahci_platform-Drop-support-for-ahci-strict-platform-.patch index efccae45af..2e833ce757 100644 --- a/target/linux/ipq806x/patches/0119-ahci_platform-Drop-support-for-ahci-strict-platform-.patch +++ b/target/linux/ipq806x/patches/0119-ahci_platform-Drop-support-for-ahci-strict-platform-.patch @@ -13,11 +13,9 @@ Signed-off-by: Tejun Heo <tj@kernel.org> drivers/ata/ahci_platform.c | 11 ----------- 1 file changed, 11 deletions(-) -diff --git a/drivers/ata/ahci_platform.c b/drivers/ata/ahci_platform.c -index fc32863..d3d2bad 100644 --- a/drivers/ata/ahci_platform.c +++ b/drivers/ata/ahci_platform.c -@@ -31,7 +31,6 @@ static void ahci_host_stop(struct ata_host *host); +@@ -31,7 +31,6 @@ static void ahci_host_stop(struct ata_ho enum ahci_type { AHCI, /* standard platform ahci */ IMX53_AHCI, /* ahci on i.mx53 */ @@ -25,7 +23,7 @@ index fc32863..d3d2bad 100644 }; static struct platform_device_id ahci_devtype[] = { -@@ -42,9 +41,6 @@ static struct platform_device_id ahci_devtype[] = { +@@ -42,9 +41,6 @@ static struct platform_device_id ahci_de .name = "imx53-ahci", .driver_data = IMX53_AHCI, }, { @@ -35,7 +33,7 @@ index fc32863..d3d2bad 100644 /* sentinel */ } }; -@@ -75,13 +71,6 @@ static const struct ata_port_info ahci_port_info[] = { +@@ -75,13 +71,6 @@ static const struct ata_port_info ahci_p .udma_mask = ATA_UDMA6, .port_ops = &ahci_platform_retry_srst_ops, }, @@ -49,6 +47,3 @@ index fc32863..d3d2bad 100644 }; static struct scsi_host_template ahci_platform_sht = { --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0120-ahci_platform-Drop-support-for-imx53-ahci-platform-d.patch b/target/linux/ipq806x/patches/0120-ahci_platform-Drop-support-for-imx53-ahci-platform-d.patch index 8d0f64ce35..b18c04f8ee 100644 --- a/target/linux/ipq806x/patches/0120-ahci_platform-Drop-support-for-imx53-ahci-platform-d.patch +++ b/target/linux/ipq806x/patches/0120-ahci_platform-Drop-support-for-imx53-ahci-platform-d.patch @@ -21,8 +21,6 @@ Signed-off-by: Tejun Heo <tj@kernel.org> drivers/ata/ahci_platform.c | 46 ++++++------------------------------------- 1 file changed, 6 insertions(+), 40 deletions(-) -diff --git a/drivers/ata/ahci_platform.c b/drivers/ata/ahci_platform.c -index d3d2bad..8fab4bf 100644 --- a/drivers/ata/ahci_platform.c +++ b/drivers/ata/ahci_platform.c @@ -28,49 +28,17 @@ @@ -80,7 +78,7 @@ index d3d2bad..8fab4bf 100644 }; static struct scsi_host_template ahci_platform_sht = { -@@ -416,7 +384,6 @@ static int ahci_probe(struct platform_device *pdev) +@@ -416,7 +384,6 @@ static int ahci_probe(struct platform_de { struct device *dev = &pdev->dev; struct ahci_platform_data *pdata = dev_get_platdata(dev); @@ -88,7 +86,7 @@ index d3d2bad..8fab4bf 100644 const struct ata_port_info *pi_template; struct ahci_host_priv *hpriv; int rc; -@@ -444,7 +411,7 @@ static int ahci_probe(struct platform_device *pdev) +@@ -444,7 +411,7 @@ static int ahci_probe(struct platform_de if (pdata && pdata->ata_port_info) pi_template = pdata->ata_port_info; else @@ -97,7 +95,7 @@ index d3d2bad..8fab4bf 100644 rc = ahci_platform_init_host(pdev, hpriv, pi_template, pdata ? pdata->force_port_map : 0, -@@ -638,7 +605,6 @@ static struct platform_driver ahci_driver = { +@@ -638,7 +605,6 @@ static struct platform_driver ahci_drive .of_match_table = ahci_of_match, .pm = &ahci_pm_ops, }, @@ -105,6 +103,3 @@ index d3d2bad..8fab4bf 100644 }; module_platform_driver(ahci_driver); --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0121-ahci_platform-Drop-unused-ahci_platform_data-members.patch b/target/linux/ipq806x/patches/0121-ahci_platform-Drop-unused-ahci_platform_data-members.patch index e8f2378b02..2895a2b6e5 100644 --- a/target/linux/ipq806x/patches/0121-ahci_platform-Drop-unused-ahci_platform_data-members.patch +++ b/target/linux/ipq806x/patches/0121-ahci_platform-Drop-unused-ahci_platform_data-members.patch @@ -15,11 +15,9 @@ Signed-off-by: Tejun Heo <tj@kernel.org> include/linux/ahci_platform.h | 3 --- 2 files changed, 1 insertion(+), 12 deletions(-) -diff --git a/drivers/ata/ahci_platform.c b/drivers/ata/ahci_platform.c -index 8fab4bf..db24d2a 100644 --- a/drivers/ata/ahci_platform.c +++ b/drivers/ata/ahci_platform.c -@@ -384,7 +384,6 @@ static int ahci_probe(struct platform_device *pdev) +@@ -384,7 +384,6 @@ static int ahci_probe(struct platform_de { struct device *dev = &pdev->dev; struct ahci_platform_data *pdata = dev_get_platdata(dev); @@ -27,7 +25,7 @@ index 8fab4bf..db24d2a 100644 struct ahci_host_priv *hpriv; int rc; -@@ -408,14 +407,7 @@ static int ahci_probe(struct platform_device *pdev) +@@ -408,14 +407,7 @@ static int ahci_probe(struct platform_de goto disable_resources; } @@ -43,8 +41,6 @@ index 8fab4bf..db24d2a 100644 if (rc) goto pdata_exit; -diff --git a/include/linux/ahci_platform.h b/include/linux/ahci_platform.h -index 542f268..1f16d50 100644 --- a/include/linux/ahci_platform.h +++ b/include/linux/ahci_platform.h @@ -33,9 +33,6 @@ struct ahci_platform_data { @@ -57,6 +53,3 @@ index 542f268..1f16d50 100644 }; int ahci_platform_enable_clks(struct ahci_host_priv *hpriv); --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0122-ata-ahci_platform-fix-devm_ioremap_resource-return-v.patch b/target/linux/ipq806x/patches/0122-ata-ahci_platform-fix-devm_ioremap_resource-return-v.patch index 1a5925b48a..322a039606 100644 --- a/target/linux/ipq806x/patches/0122-ata-ahci_platform-fix-devm_ioremap_resource-return-v.patch +++ b/target/linux/ipq806x/patches/0122-ata-ahci_platform-fix-devm_ioremap_resource-return-v.patch @@ -16,11 +16,9 @@ Signed-off-by: Tejun Heo <tj@kernel.org> drivers/ata/ahci_platform.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -diff --git a/drivers/ata/ahci_platform.c b/drivers/ata/ahci_platform.c -index db24d2a..70fbf66 100644 --- a/drivers/ata/ahci_platform.c +++ b/drivers/ata/ahci_platform.c -@@ -199,8 +199,7 @@ static void ahci_platform_put_resources(struct device *dev, void *res) +@@ -199,8 +199,7 @@ static void ahci_platform_put_resources( * RETURNS: * The allocated ahci_host_priv on success, otherwise an ERR_PTR value */ @@ -30,7 +28,7 @@ index db24d2a..70fbf66 100644 { struct device *dev = &pdev->dev; struct ahci_host_priv *hpriv; -@@ -219,8 +218,9 @@ struct ahci_host_priv *ahci_platform_get_resources( +@@ -219,8 +218,9 @@ struct ahci_host_priv *ahci_platform_get hpriv->mmio = devm_ioremap_resource(dev, platform_get_resource(pdev, IORESOURCE_MEM, 0)); @@ -41,6 +39,3 @@ index db24d2a..70fbf66 100644 goto err_out; } --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0123-ata-ahci_platform-fix-ahci_platform_data-suspend-met.patch b/target/linux/ipq806x/patches/0123-ata-ahci_platform-fix-ahci_platform_data-suspend-met.patch index ce1d840b90..1a9e6d174c 100644 --- a/target/linux/ipq806x/patches/0123-ata-ahci_platform-fix-ahci_platform_data-suspend-met.patch +++ b/target/linux/ipq806x/patches/0123-ata-ahci_platform-fix-ahci_platform_data-suspend-met.patch @@ -19,11 +19,9 @@ Signed-off-by: Tejun Heo <tj@kernel.org> drivers/ata/ahci_platform.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) -diff --git a/drivers/ata/ahci_platform.c b/drivers/ata/ahci_platform.c -index 70fbf66..7bd6adf 100644 --- a/drivers/ata/ahci_platform.c +++ b/drivers/ata/ahci_platform.c -@@ -521,12 +521,19 @@ int ahci_platform_suspend(struct device *dev) +@@ -521,12 +521,19 @@ int ahci_platform_suspend(struct device if (rc) return rc; @@ -45,6 +43,3 @@ index 70fbf66..7bd6adf 100644 } EXPORT_SYMBOL_GPL(ahci_platform_suspend); --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0124-ata-move-library-code-from-ahci_platform.c-to-libahc.patch b/target/linux/ipq806x/patches/0124-ata-move-library-code-from-ahci_platform.c-to-libahc.patch index bd45720661..d35b1dc950 100644 --- a/target/linux/ipq806x/patches/0124-ata-move-library-code-from-ahci_platform.c-to-libahc.patch +++ b/target/linux/ipq806x/patches/0124-ata-move-library-code-from-ahci_platform.c-to-libahc.patch @@ -23,8 +23,6 @@ Conflicts: 4 files changed, 544 insertions(+), 518 deletions(-) create mode 100644 drivers/ata/libahci_platform.c -diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig -index 868429a..dc950f3 100644 --- a/drivers/ata/Kconfig +++ b/drivers/ata/Kconfig @@ -99,7 +99,7 @@ config SATA_AHCI_PLATFORM @@ -36,8 +34,6 @@ index 868429a..dc950f3 100644 help This option enables support for the Freescale i.MX SoC's onboard AHCI SATA. -diff --git a/drivers/ata/Makefile b/drivers/ata/Makefile -index 46518c6..366b743 100644 --- a/drivers/ata/Makefile +++ b/drivers/ata/Makefile @@ -4,13 +4,13 @@ obj-$(CONFIG_ATA) += libata.o @@ -56,8 +52,6 @@ index 46518c6..366b743 100644 # SFF w/ custom DMA obj-$(CONFIG_PDC_ADMA) += pdc_adma.o -diff --git a/drivers/ata/ahci_platform.c b/drivers/ata/ahci_platform.c -index 7bd6adf..ef67e79 100644 --- a/drivers/ata/ahci_platform.c +++ b/drivers/ata/ahci_platform.c @@ -12,28 +12,15 @@ @@ -89,7 +83,7 @@ index 7bd6adf..ef67e79 100644 static const struct ata_port_info ahci_port_info = { .flags = AHCI_FLAG_COMMON, .pio_mask = ATA_PIO4, -@@ -41,345 +28,6 @@ static const struct ata_port_info ahci_port_info = { +@@ -41,345 +28,6 @@ static const struct ata_port_info ahci_p .port_ops = &ahci_platform_ops, }; @@ -605,9 +599,6 @@ index 7bd6adf..ef67e79 100644 static SIMPLE_DEV_PM_OPS(ahci_pm_ops, ahci_platform_suspend, ahci_platform_resume); -diff --git a/drivers/ata/libahci_platform.c b/drivers/ata/libahci_platform.c -new file mode 100644 -index 0000000..7cb3a85 --- /dev/null +++ b/drivers/ata/libahci_platform.c @@ -0,0 +1,541 @@ @@ -1152,6 +1143,3 @@ index 0000000..7cb3a85 +MODULE_DESCRIPTION("AHCI SATA platform library"); +MODULE_AUTHOR("Anton Vorontsov <avorontsov@ru.mvista.com>"); +MODULE_LICENSE("GPL"); --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0125-clk-qcom-Add-support-for-IPQ8064-s-global-clock-cont.patch b/target/linux/ipq806x/patches/0125-clk-qcom-Add-support-for-IPQ8064-s-global-clock-cont.patch index 250ca6e85d..4c4e2634f7 100644 --- a/target/linux/ipq806x/patches/0125-clk-qcom-Add-support-for-IPQ8064-s-global-clock-cont.patch +++ b/target/linux/ipq806x/patches/0125-clk-qcom-Add-support-for-IPQ8064-s-global-clock-cont.patch @@ -24,8 +24,6 @@ Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> create mode 100644 include/dt-bindings/clock/qcom,gcc-ipq806x.h create mode 100644 include/dt-bindings/reset/qcom,gcc-ipq806x.h -diff --git a/Documentation/devicetree/bindings/clock/qcom,gcc.txt b/Documentation/devicetree/bindings/clock/qcom,gcc.txt -index 9cfcb4f..0171509 100644 --- a/Documentation/devicetree/bindings/clock/qcom,gcc.txt +++ b/Documentation/devicetree/bindings/clock/qcom,gcc.txt @@ -5,6 +5,7 @@ Required properties : @@ -36,8 +34,6 @@ index 9cfcb4f..0171509 100644 "qcom,gcc-msm8660" "qcom,gcc-msm8960" "qcom,gcc-msm8974" -diff --git a/drivers/clk/qcom/Kconfig b/drivers/clk/qcom/Kconfig -index 7f696b7..cfaa54c 100644 --- a/drivers/clk/qcom/Kconfig +++ b/drivers/clk/qcom/Kconfig @@ -4,6 +4,14 @@ config COMMON_CLK_QCOM @@ -55,8 +51,6 @@ index 7f696b7..cfaa54c 100644 config MSM_GCC_8660 tristate "MSM8660 Global Clock Controller" depends on COMMON_CLK_QCOM -diff --git a/drivers/clk/qcom/Makefile b/drivers/clk/qcom/Makefile -index 689e05b..df2a1b3 100644 --- a/drivers/clk/qcom/Makefile +++ b/drivers/clk/qcom/Makefile @@ -8,6 +8,7 @@ clk-qcom-y += clk-rcg2.o @@ -67,9 +61,6 @@ index 689e05b..df2a1b3 100644 obj-$(CONFIG_MSM_GCC_8660) += gcc-msm8660.o obj-$(CONFIG_MSM_GCC_8960) += gcc-msm8960.o obj-$(CONFIG_MSM_GCC_8974) += gcc-msm8974.o -diff --git a/drivers/clk/qcom/gcc-ipq806x.c b/drivers/clk/qcom/gcc-ipq806x.c -new file mode 100644 -index 0000000..278c5fe --- /dev/null +++ b/drivers/clk/qcom/gcc-ipq806x.c @@ -0,0 +1,2424 @@ @@ -2497,9 +2488,6 @@ index 0000000..278c5fe +MODULE_DESCRIPTION("QCOM GCC IPQ806x Driver"); +MODULE_LICENSE("GPL v2"); +MODULE_ALIAS("platform:gcc-ipq806x"); -diff --git a/include/dt-bindings/clock/qcom,gcc-ipq806x.h b/include/dt-bindings/clock/qcom,gcc-ipq806x.h -new file mode 100644 -index 0000000..3b0f8e7 --- /dev/null +++ b/include/dt-bindings/clock/qcom,gcc-ipq806x.h @@ -0,0 +1,293 @@ @@ -2796,9 +2784,6 @@ index 0000000..3b0f8e7 +#define UBI32_CORE2_CLK 279 + +#endif -diff --git a/include/dt-bindings/reset/qcom,gcc-ipq806x.h b/include/dt-bindings/reset/qcom,gcc-ipq806x.h -new file mode 100644 -index 0000000..0ad5ef9 --- /dev/null +++ b/include/dt-bindings/reset/qcom,gcc-ipq806x.h @@ -0,0 +1,132 @@ @@ -2934,6 +2919,3 @@ index 0000000..0ad5ef9 +#define NSSFB0_RESET 113 +#define NSSFB1_RESET 114 +#endif --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0126-clk-Add-safe-switch-hook.patch b/target/linux/ipq806x/patches/0126-clk-Add-safe-switch-hook.patch index bda409363e..4ee9350180 100644 --- a/target/linux/ipq806x/patches/0126-clk-Add-safe-switch-hook.patch +++ b/target/linux/ipq806x/patches/0126-clk-Add-safe-switch-hook.patch @@ -19,11 +19,9 @@ Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> include/linux/clk-provider.h | 1 + 3 files changed, 49 insertions(+), 7 deletions(-) -diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c -index b94a311..0582068 100644 --- a/drivers/clk/clk.c +++ b/drivers/clk/clk.c -@@ -1356,6 +1356,7 @@ static void clk_calc_subtree(struct clk *clk, unsigned long new_rate, +@@ -1356,6 +1356,7 @@ static void clk_calc_subtree(struct clk struct clk *new_parent, u8 p_index) { struct clk *child; @@ -31,7 +29,7 @@ index b94a311..0582068 100644 clk->new_rate = new_rate; clk->new_parent = new_parent; -@@ -1365,6 +1366,17 @@ static void clk_calc_subtree(struct clk *clk, unsigned long new_rate, +@@ -1365,6 +1366,17 @@ static void clk_calc_subtree(struct clk if (new_parent && new_parent != clk->parent) new_parent->new_child = clk; @@ -95,7 +93,7 @@ index b94a311..0582068 100644 fail_clk = clk; } -@@ -1499,7 +1539,8 @@ static void clk_change_rate(struct clk *clk) +@@ -1499,7 +1539,8 @@ static void clk_change_rate(struct clk * else if (clk->parent) best_parent_rate = clk->parent->rate; @@ -105,7 +103,7 @@ index b94a311..0582068 100644 old_parent = __clk_set_parent_before(clk, clk->new_parent); if (clk->ops->set_rate_and_parent) { -@@ -1522,9 +1563,6 @@ static void clk_change_rate(struct clk *clk) +@@ -1522,9 +1563,6 @@ static void clk_change_rate(struct clk * else clk->rate = best_parent_rate; @@ -115,7 +113,7 @@ index b94a311..0582068 100644 hlist_for_each_entry(child, &clk->children, child_node) { /* Skip children who will be reparented to another clock */ if (child->new_parent && child->new_parent != clk) -@@ -1598,6 +1636,7 @@ int clk_set_rate(struct clk *clk, unsigned long rate) +@@ -1598,6 +1636,7 @@ int clk_set_rate(struct clk *clk, unsign /* change the rates */ clk_change_rate(top); @@ -123,8 +121,6 @@ index b94a311..0582068 100644 out: clk_prepare_unlock(); -diff --git a/include/linux/clk-private.h b/include/linux/clk-private.h -index efbf70b..f48684a 100644 --- a/include/linux/clk-private.h +++ b/include/linux/clk-private.h @@ -38,8 +38,10 @@ struct clk { @@ -138,8 +134,6 @@ index efbf70b..f48684a 100644 struct clk *new_parent; struct clk *new_child; unsigned long flags; -diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h -index 939533d..300fcb8 100644 --- a/include/linux/clk-provider.h +++ b/include/linux/clk-provider.h @@ -157,6 +157,7 @@ struct clk_ops { @@ -150,6 +144,3 @@ index 939533d..300fcb8 100644 int (*set_rate)(struct clk_hw *hw, unsigned long, unsigned long); int (*set_rate_and_parent)(struct clk_hw *hw, --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0127-clk-qcom-Add-support-for-setting-rates-on-PLLs.patch b/target/linux/ipq806x/patches/0127-clk-qcom-Add-support-for-setting-rates-on-PLLs.patch index 2983b8444b..07ffdacc77 100644 --- a/target/linux/ipq806x/patches/0127-clk-qcom-Add-support-for-setting-rates-on-PLLs.patch +++ b/target/linux/ipq806x/patches/0127-clk-qcom-Add-support-for-setting-rates-on-PLLs.patch @@ -12,8 +12,6 @@ Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> drivers/clk/qcom/clk-pll.h | 20 +++++++++++++ 2 files changed, 87 insertions(+), 1 deletion(-) -diff --git a/drivers/clk/qcom/clk-pll.c b/drivers/clk/qcom/clk-pll.c -index 0f927c5..80c7a76 100644 --- a/drivers/clk/qcom/clk-pll.c +++ b/drivers/clk/qcom/clk-pll.c @@ -97,7 +97,7 @@ static unsigned long @@ -25,7 +23,7 @@ index 0f927c5..80c7a76 100644 unsigned long rate; u64 tmp; -@@ -116,13 +116,79 @@ clk_pll_recalc_rate(struct clk_hw *hw, unsigned long parent_rate) +@@ -116,13 +116,79 @@ clk_pll_recalc_rate(struct clk_hw *hw, u do_div(tmp, n); rate += tmp; } @@ -105,8 +103,6 @@ index 0f927c5..80c7a76 100644 }; EXPORT_SYMBOL_GPL(clk_pll_ops); -diff --git a/drivers/clk/qcom/clk-pll.h b/drivers/clk/qcom/clk-pll.h -index 0775a99..5f9928b 100644 --- a/drivers/clk/qcom/clk-pll.h +++ b/drivers/clk/qcom/clk-pll.h @@ -18,6 +18,21 @@ @@ -150,6 +146,3 @@ index 0775a99..5f9928b 100644 struct clk_regmap clkr; }; --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0128-clk-qcom-Add-support-for-banked-MD-RCGs.patch b/target/linux/ipq806x/patches/0128-clk-qcom-Add-support-for-banked-MD-RCGs.patch index 0b9e237c71..b55d709381 100644 --- a/target/linux/ipq806x/patches/0128-clk-qcom-Add-support-for-banked-MD-RCGs.patch +++ b/target/linux/ipq806x/patches/0128-clk-qcom-Add-support-for-banked-MD-RCGs.patch @@ -15,11 +15,9 @@ Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> drivers/clk/qcom/mmcc-msm8960.c | 24 +++++++--- 3 files changed, 73 insertions(+), 55 deletions(-) -diff --git a/drivers/clk/qcom/clk-rcg.c b/drivers/clk/qcom/clk-rcg.c -index abfc2b6..7bce729 100644 --- a/drivers/clk/qcom/clk-rcg.c +++ b/drivers/clk/qcom/clk-rcg.c -@@ -67,16 +67,16 @@ static u8 clk_dyn_rcg_get_parent(struct clk_hw *hw) +@@ -67,16 +67,16 @@ static u8 clk_dyn_rcg_get_parent(struct { struct clk_dyn_rcg *rcg = to_clk_dyn_rcg(hw); int num_parents = __clk_get_num_parents(hw->clk); @@ -40,7 +38,7 @@ index abfc2b6..7bce729 100644 ns = ns_to_src(s, ns); for (i = 0; i < num_parents; i++) -@@ -192,90 +192,93 @@ static u32 mn_to_reg(struct mn *mn, u32 m, u32 n, u32 val) +@@ -192,90 +192,93 @@ static u32 mn_to_reg(struct mn *mn, u32 static void configure_bank(struct clk_dyn_rcg *rcg, const struct freq_tbl *f) { @@ -166,7 +164,7 @@ index abfc2b6..7bce729 100644 configure_bank(rcg, &f); return 0; -@@ -336,28 +339,30 @@ clk_dyn_rcg_recalc_rate(struct clk_hw *hw, unsigned long parent_rate) +@@ -336,28 +339,30 @@ clk_dyn_rcg_recalc_rate(struct clk_hw *h u32 m, n, pre_div, ns, md, mode, reg; int bank; struct mn *mn; @@ -208,8 +206,6 @@ index abfc2b6..7bce729 100644 } static const -diff --git a/drivers/clk/qcom/clk-rcg.h b/drivers/clk/qcom/clk-rcg.h -index b9ec11d..5f8b06d 100644 --- a/drivers/clk/qcom/clk-rcg.h +++ b/drivers/clk/qcom/clk-rcg.h @@ -102,7 +102,7 @@ extern const struct clk_ops clk_rcg_ops; @@ -232,11 +228,9 @@ index b9ec11d..5f8b06d 100644 u8 mux_sel_bit; -diff --git a/drivers/clk/qcom/mmcc-msm8960.c b/drivers/clk/qcom/mmcc-msm8960.c -index 12f3c0b..ce48ad1 100644 --- a/drivers/clk/qcom/mmcc-msm8960.c +++ b/drivers/clk/qcom/mmcc-msm8960.c -@@ -726,9 +726,11 @@ static struct freq_tbl clk_tbl_gfx2d[] = { +@@ -726,9 +726,11 @@ static struct freq_tbl clk_tbl_gfx2d[] = }; static struct clk_dyn_rcg gfx2d0_src = { @@ -262,7 +256,7 @@ index 12f3c0b..ce48ad1 100644 .mn[0] = { .mnctr_en_bit = 8, .mnctr_reset_bit = 25, -@@ -862,9 +866,11 @@ static struct freq_tbl clk_tbl_gfx3d[] = { +@@ -862,9 +866,11 @@ static struct freq_tbl clk_tbl_gfx3d[] = }; static struct clk_dyn_rcg gfx3d_src = { @@ -299,7 +293,7 @@ index 12f3c0b..ce48ad1 100644 .p[0] = { .pre_div_shift = 22, .pre_div_width = 4, -@@ -1355,9 +1365,11 @@ static struct freq_tbl clk_tbl_vcodec[] = { +@@ -1355,9 +1365,11 @@ static struct freq_tbl clk_tbl_vcodec[] }; static struct clk_dyn_rcg vcodec_src = { @@ -312,6 +306,3 @@ index 12f3c0b..ce48ad1 100644 .mn[0] = { .mnctr_en_bit = 5, .mnctr_reset_bit = 31, --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0129-clk-qcom-Add-support-for-NSS-GMAC-clocks-and-resets.patch b/target/linux/ipq806x/patches/0129-clk-qcom-Add-support-for-NSS-GMAC-clocks-and-resets.patch index 4c59580372..8b8839ad04 100644 --- a/target/linux/ipq806x/patches/0129-clk-qcom-Add-support-for-NSS-GMAC-clocks-and-resets.patch +++ b/target/linux/ipq806x/patches/0129-clk-qcom-Add-support-for-NSS-GMAC-clocks-and-resets.patch @@ -18,8 +18,6 @@ Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> include/dt-bindings/reset/qcom,gcc-ipq806x.h | 43 ++ 3 files changed, 755 insertions(+), 1 deletion(-) -diff --git a/drivers/clk/qcom/gcc-ipq806x.c b/drivers/clk/qcom/gcc-ipq806x.c -index 278c5fe..f7916be 100644 --- a/drivers/clk/qcom/gcc-ipq806x.c +++ b/drivers/clk/qcom/gcc-ipq806x.c @@ -32,6 +32,33 @@ @@ -103,7 +101,7 @@ index 278c5fe..f7916be 100644 static const u8 gcc_pxo_pll8_map[] = { [P_PXO] = 0, -@@ -157,6 +219,22 @@ static const char *gcc_pxo_pll8_pll0_map[] = { +@@ -157,6 +219,22 @@ static const char *gcc_pxo_pll8_pll0_map "pll0", }; @@ -126,7 +124,7 @@ index 278c5fe..f7916be 100644 static struct freq_tbl clk_tbl_gsbi_uart[] = { { 1843200, P_PLL8, 2, 6, 625 }, { 3686400, P_PLL8, 2, 12, 625 }, -@@ -2132,12 +2210,567 @@ static struct clk_branch usb_fs1_h_clk = { +@@ -2132,12 +2210,567 @@ static struct clk_branch usb_fs1_h_clk = }, }; @@ -694,7 +692,7 @@ index 278c5fe..f7916be 100644 [GSBI1_UART_SRC] = &gsbi1_uart_src.clkr, [GSBI1_UART_CLK] = &gsbi1_uart_clk.clkr, [GSBI2_UART_SRC] = &gsbi2_uart_src.clkr, -@@ -2232,6 +2865,19 @@ static struct clk_regmap *gcc_ipq806x_clks[] = { +@@ -2232,6 +2865,19 @@ static struct clk_regmap *gcc_ipq806x_cl [USB_FS1_XCVR_SRC] = &usb_fs1_xcvr_clk_src.clkr, [USB_FS1_XCVR_CLK] = &usb_fs1_xcvr_clk.clkr, [USB_FS1_SYSTEM_CLK] = &usb_fs1_sys_clk.clkr, @@ -714,7 +712,7 @@ index 278c5fe..f7916be 100644 }; static const struct qcom_reset_map gcc_ipq806x_resets[] = { -@@ -2350,6 +2996,48 @@ static const struct qcom_reset_map gcc_ipq806x_resets[] = { +@@ -2350,6 +2996,48 @@ static const struct qcom_reset_map gcc_i [USB30_1_PHY_RESET] = { 0x3b58, 0 }, [NSSFB0_RESET] = { 0x3b60, 6 }, [NSSFB1_RESET] = { 0x3b60, 7 }, @@ -763,7 +761,7 @@ index 278c5fe..f7916be 100644 }; static const struct regmap_config gcc_ipq806x_regmap_config = { -@@ -2378,6 +3066,8 @@ static int gcc_ipq806x_probe(struct platform_device *pdev) +@@ -2378,6 +3066,8 @@ static int gcc_ipq806x_probe(struct plat { struct clk *clk; struct device *dev = &pdev->dev; @@ -772,7 +770,7 @@ index 278c5fe..f7916be 100644 /* Temporary until RPM clocks supported */ clk = clk_register_fixed_rate(dev, "cxo", NULL, CLK_IS_ROOT, 25000000); -@@ -2388,7 +3078,25 @@ static int gcc_ipq806x_probe(struct platform_device *pdev) +@@ -2388,7 +3078,25 @@ static int gcc_ipq806x_probe(struct plat if (IS_ERR(clk)) return PTR_ERR(clk); @@ -799,8 +797,6 @@ index 278c5fe..f7916be 100644 } static int gcc_ipq806x_remove(struct platform_device *pdev) -diff --git a/include/dt-bindings/clock/qcom,gcc-ipq806x.h b/include/dt-bindings/clock/qcom,gcc-ipq806x.h -index 3b0f8e7..0fd3e8a 100644 --- a/include/dt-bindings/clock/qcom,gcc-ipq806x.h +++ b/include/dt-bindings/clock/qcom,gcc-ipq806x.h @@ -289,5 +289,8 @@ @@ -812,8 +808,6 @@ index 3b0f8e7..0fd3e8a 100644 +#define NSS_CORE_CLK 282 /* Virtual */ #endif -diff --git a/include/dt-bindings/reset/qcom,gcc-ipq806x.h b/include/dt-bindings/reset/qcom,gcc-ipq806x.h -index 0ad5ef9..de9c814 100644 --- a/include/dt-bindings/reset/qcom,gcc-ipq806x.h +++ b/include/dt-bindings/reset/qcom,gcc-ipq806x.h @@ -129,4 +129,47 @@ @@ -864,6 +858,3 @@ index 0ad5ef9..de9c814 100644 +#define NSS_SRDS_N_RESET 156 + #endif --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0130-ARM-qcom-Add-initial-IPQ8064-SoC-and-AP148-device-tr.patch b/target/linux/ipq806x/patches/0130-ARM-qcom-Add-initial-IPQ8064-SoC-and-AP148-device-tr.patch index 4c0eed85ca..8fda0a17c4 100644 --- a/target/linux/ipq806x/patches/0130-ARM-qcom-Add-initial-IPQ8064-SoC-and-AP148-device-tr.patch +++ b/target/linux/ipq806x/patches/0130-ARM-qcom-Add-initial-IPQ8064-SoC-and-AP148-device-tr.patch @@ -19,8 +19,6 @@ Signed-off-by: Kumar Gala <galak@codeaurora.org> create mode 100644 arch/arm/boot/dts/qcom-ipq8064-v1.0.dtsi create mode 100644 arch/arm/boot/dts/qcom-ipq8064.dtsi -diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile -index f2aeb95..f22c51d 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -235,6 +235,7 @@ dtb-$(CONFIG_ARCH_QCOM) += \ @@ -31,9 +29,6 @@ index f2aeb95..f22c51d 100644 qcom-msm8660-surf.dtb \ qcom-msm8960-cdp.dtb dtb-$(CONFIG_ARCH_U8500) += ste-snowball.dtb \ -diff --git a/arch/arm/boot/dts/qcom-ipq8064-ap148.dts b/arch/arm/boot/dts/qcom-ipq8064-ap148.dts -new file mode 100644 -index 0000000..100b6eb --- /dev/null +++ b/arch/arm/boot/dts/qcom-ipq8064-ap148.dts @@ -0,0 +1,25 @@ @@ -62,16 +57,10 @@ index 0000000..100b6eb + }; + }; +}; -diff --git a/arch/arm/boot/dts/qcom-ipq8064-v1.0.dtsi b/arch/arm/boot/dts/qcom-ipq8064-v1.0.dtsi -new file mode 100644 -index 0000000..7093b07 --- /dev/null +++ b/arch/arm/boot/dts/qcom-ipq8064-v1.0.dtsi @@ -0,0 +1 @@ +#include "qcom-ipq8064.dtsi" -diff --git a/arch/arm/boot/dts/qcom-ipq8064.dtsi b/arch/arm/boot/dts/qcom-ipq8064.dtsi -new file mode 100644 -index 0000000..952afb7 --- /dev/null +++ b/arch/arm/boot/dts/qcom-ipq8064.dtsi @@ -0,0 +1,176 @@ @@ -251,11 +240,9 @@ index 0000000..952afb7 + }; + }; +}; -diff --git a/arch/arm/mach-qcom/board.c b/arch/arm/mach-qcom/board.c -index c437a99..6d8bbf7 100644 --- a/arch/arm/mach-qcom/board.c +++ b/arch/arm/mach-qcom/board.c -@@ -18,6 +18,8 @@ static const char * const qcom_dt_match[] __initconst = { +@@ -18,6 +18,8 @@ static const char * const qcom_dt_match[ "qcom,apq8064", "qcom,apq8074-dragonboard", "qcom,apq8084", @@ -264,6 +251,3 @@ index c437a99..6d8bbf7 100644 "qcom,msm8660-surf", "qcom,msm8960-cdp", NULL --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0131-ARM-qcom-config-Enable-IPQ806x-support.patch b/target/linux/ipq806x/patches/0131-ARM-qcom-config-Enable-IPQ806x-support.patch index 8b20c4b68d..3a0e3ead2a 100644 --- a/target/linux/ipq806x/patches/0131-ARM-qcom-config-Enable-IPQ806x-support.patch +++ b/target/linux/ipq806x/patches/0131-ARM-qcom-config-Enable-IPQ806x-support.patch @@ -8,8 +8,6 @@ Signed-off-by: Kumar Gala <galak@codeaurora.org> arch/arm/configs/qcom_defconfig | 1 + 1 file changed, 1 insertion(+) -diff --git a/arch/arm/configs/qcom_defconfig b/arch/arm/configs/qcom_defconfig -index 42ebd72..1752a4d 100644 --- a/arch/arm/configs/qcom_defconfig +++ b/arch/arm/configs/qcom_defconfig @@ -133,6 +133,7 @@ CONFIG_QCOM_BAM_DMA=y @@ -20,6 +18,3 @@ index 42ebd72..1752a4d 100644 CONFIG_MSM_GCC_8660=y CONFIG_MSM_MMCC_8960=y CONFIG_MSM_MMCC_8974=y --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0132-XXX-Add-boot-support-for-u-boot.ipq-image.patch b/target/linux/ipq806x/patches/0132-XXX-Add-boot-support-for-u-boot.ipq-image.patch index c94c75abe2..c09c3a68f3 100644 --- a/target/linux/ipq806x/patches/0132-XXX-Add-boot-support-for-u-boot.ipq-image.patch +++ b/target/linux/ipq806x/patches/0132-XXX-Add-boot-support-for-u-boot.ipq-image.patch @@ -8,11 +8,9 @@ Subject: [PATCH 132/182] XXX: Add boot support for u-boot.ipq image arch/arm/boot/Makefile | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) -diff --git a/arch/arm/Makefile b/arch/arm/Makefile -index 51e5bed..e9fc731 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile -@@ -297,7 +297,7 @@ archprepare: +@@ -302,7 +302,7 @@ archprepare: # Convert bzImage to zImage bzImage: zImage @@ -21,8 +19,6 @@ index 51e5bed..e9fc731 100644 INSTALL_TARGETS = zinstall uinstall install PHONY += bzImage $(BOOT_TARGETS) $(INSTALL_TARGETS) -diff --git a/arch/arm/boot/Makefile b/arch/arm/boot/Makefile -index ec2f806..3cbc83e 100644 --- a/arch/arm/boot/Makefile +++ b/arch/arm/boot/Makefile @@ -25,7 +25,7 @@ INITRD_PHYS := $(initrd_phys-y) @@ -50,6 +46,3 @@ index ec2f806..3cbc83e 100644 $(obj)/bootp/bootp: $(obj)/zImage initrd FORCE $(Q)$(MAKE) $(build)=$(obj)/bootp $@ @: --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0133-spi-qup-Remove-chip-select-function.patch b/target/linux/ipq806x/patches/0133-spi-qup-Remove-chip-select-function.patch index 3881064b6b..14ae782b49 100644 --- a/target/linux/ipq806x/patches/0133-spi-qup-Remove-chip-select-function.patch +++ b/target/linux/ipq806x/patches/0133-spi-qup-Remove-chip-select-function.patch @@ -13,8 +13,6 @@ Signed-off-by: Andy Gross <agross@codeaurora.org> drivers/spi/spi-qup.c | 33 ++++---------------- 2 files changed, 12 insertions(+), 27 deletions(-) -diff --git a/Documentation/devicetree/bindings/spi/qcom,spi-qup.txt b/Documentation/devicetree/bindings/spi/qcom,spi-qup.txt -index b82a268..bee6ff2 100644 --- a/Documentation/devicetree/bindings/spi/qcom,spi-qup.txt +++ b/Documentation/devicetree/bindings/spi/qcom,spi-qup.txt @@ -23,6 +23,12 @@ Optional properties: @@ -30,11 +28,9 @@ index b82a268..bee6ff2 100644 SPI slave nodes must be children of the SPI master node and can contain properties described in Documentation/devicetree/bindings/spi/spi-bus.txt -diff --git a/drivers/spi/spi-qup.c b/drivers/spi/spi-qup.c -index 65bf18e..dc128ac 100644 --- a/drivers/spi/spi-qup.c +++ b/drivers/spi/spi-qup.c -@@ -424,31 +424,6 @@ static int spi_qup_io_config(struct spi_device *spi, struct spi_transfer *xfer) +@@ -424,31 +424,6 @@ static int spi_qup_io_config(struct spi_ return 0; } @@ -66,7 +62,7 @@ index 65bf18e..dc128ac 100644 static int spi_qup_transfer_one(struct spi_master *master, struct spi_device *spi, struct spi_transfer *xfer) -@@ -571,12 +546,16 @@ static int spi_qup_probe(struct platform_device *pdev) +@@ -571,12 +546,16 @@ static int spi_qup_probe(struct platform return -ENOMEM; } @@ -85,6 +81,3 @@ index 65bf18e..dc128ac 100644 master->transfer_one = spi_qup_transfer_one; master->dev.of_node = pdev->dev.of_node; master->auto_runtime_pm = true; --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0134-spi-qup-Fix-order-of-spi_register_master.patch b/target/linux/ipq806x/patches/0134-spi-qup-Fix-order-of-spi_register_master.patch index c8738ccac8..93afe28f15 100644 --- a/target/linux/ipq806x/patches/0134-spi-qup-Fix-order-of-spi_register_master.patch +++ b/target/linux/ipq806x/patches/0134-spi-qup-Fix-order-of-spi_register_master.patch @@ -13,11 +13,9 @@ Acked-by: Ivan T. Ivanov <iivanov@mm-sol.com> drivers/spi/spi-qup.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) -diff --git a/drivers/spi/spi-qup.c b/drivers/spi/spi-qup.c -index dc128ac..a404298 100644 --- a/drivers/spi/spi-qup.c +++ b/drivers/spi/spi-qup.c -@@ -619,16 +619,19 @@ static int spi_qup_probe(struct platform_device *pdev) +@@ -619,16 +619,19 @@ static int spi_qup_probe(struct platform if (ret) goto error; @@ -41,6 +39,3 @@ index dc128ac..a404298 100644 error: clk_disable_unprepare(cclk); clk_disable_unprepare(iclk); --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0135-spi-qup-Add-support-for-v1.1.1.patch b/target/linux/ipq806x/patches/0135-spi-qup-Add-support-for-v1.1.1.patch index c1ccc21197..86cce61322 100644 --- a/target/linux/ipq806x/patches/0135-spi-qup-Add-support-for-v1.1.1.patch +++ b/target/linux/ipq806x/patches/0135-spi-qup-Add-support-for-v1.1.1.patch @@ -11,11 +11,9 @@ Signed-off-by: Andy Gross <agross@codeaurora.org> drivers/spi/spi-qup.c | 36 ++++++++++++-------- 2 files changed, 27 insertions(+), 15 deletions(-) -diff --git a/Documentation/devicetree/bindings/spi/qcom,spi-qup.txt b/Documentation/devicetree/bindings/spi/qcom,spi-qup.txt -index bee6ff2..e2c88df 100644 --- a/Documentation/devicetree/bindings/spi/qcom,spi-qup.txt +++ b/Documentation/devicetree/bindings/spi/qcom,spi-qup.txt -@@ -7,7 +7,11 @@ SPI in master mode supports up to 50MHz, up to four chip selects, programmable +@@ -7,7 +7,11 @@ SPI in master mode supports up to 50MHz, data path from 4 bits to 32 bits and numerous protocol variants. Required properties: @@ -28,8 +26,6 @@ index bee6ff2..e2c88df 100644 - reg: Should contain base register location and length - interrupts: Interrupt number used by this controller -diff --git a/drivers/spi/spi-qup.c b/drivers/spi/spi-qup.c -index a404298..c137226 100644 --- a/drivers/spi/spi-qup.c +++ b/drivers/spi/spi-qup.c @@ -142,6 +142,7 @@ struct spi_qup { @@ -40,7 +36,7 @@ index a404298..c137226 100644 }; -@@ -420,7 +421,9 @@ static int spi_qup_io_config(struct spi_device *spi, struct spi_transfer *xfer) +@@ -420,7 +421,9 @@ static int spi_qup_io_config(struct spi_ config |= QUP_CONFIG_SPI_MODE; writel_relaxed(config, controller->base + QUP_CONFIG); @@ -51,7 +47,7 @@ index a404298..c137226 100644 return 0; } -@@ -486,7 +489,7 @@ static int spi_qup_probe(struct platform_device *pdev) +@@ -486,7 +489,7 @@ static int spi_qup_probe(struct platform struct resource *res; struct device *dev; void __iomem *base; @@ -60,7 +56,7 @@ index a404298..c137226 100644 int ret, irq, size; dev = &pdev->dev; -@@ -529,15 +532,6 @@ static int spi_qup_probe(struct platform_device *pdev) +@@ -529,15 +532,6 @@ static int spi_qup_probe(struct platform return ret; } @@ -76,7 +72,7 @@ index a404298..c137226 100644 master = spi_alloc_master(dev, sizeof(struct spi_qup)); if (!master) { clk_disable_unprepare(cclk); -@@ -570,6 +564,10 @@ static int spi_qup_probe(struct platform_device *pdev) +@@ -570,6 +564,10 @@ static int spi_qup_probe(struct platform controller->cclk = cclk; controller->irq = irq; @@ -87,7 +83,7 @@ index a404298..c137226 100644 spin_lock_init(&controller->lock); init_completion(&controller->done); -@@ -593,8 +591,8 @@ static int spi_qup_probe(struct platform_device *pdev) +@@ -593,8 +591,8 @@ static int spi_qup_probe(struct platform size = QUP_IO_M_INPUT_FIFO_SIZE(iomode); controller->in_fifo_sz = controller->in_blk_sz * (2 << size); @@ -98,7 +94,7 @@ index a404298..c137226 100644 controller->out_blk_sz, controller->out_fifo_sz); writel_relaxed(1, base + QUP_SW_RESET); -@@ -607,10 +605,19 @@ static int spi_qup_probe(struct platform_device *pdev) +@@ -607,10 +605,19 @@ static int spi_qup_probe(struct platform writel_relaxed(0, base + QUP_OPERATIONAL); writel_relaxed(0, base + QUP_IO_M_MODES); @@ -119,7 +115,7 @@ index a404298..c137226 100644 writel_relaxed(0, base + SPI_CONFIG); writel_relaxed(SPI_IO_C_NO_TRI_STATE, base + SPI_IO_CONTROL); -@@ -732,6 +739,7 @@ static int spi_qup_remove(struct platform_device *pdev) +@@ -732,6 +739,7 @@ static int spi_qup_remove(struct platfor } static struct of_device_id spi_qup_dt_match[] = { @@ -127,6 +123,3 @@ index a404298..c137226 100644 { .compatible = "qcom,spi-qup-v2.1.1", }, { .compatible = "qcom,spi-qup-v2.2.1", }, { } --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0136-ARM-ipq8064-ap148-Add-i2c-pinctrl-nodes.patch b/target/linux/ipq806x/patches/0136-ARM-ipq8064-ap148-Add-i2c-pinctrl-nodes.patch index 7c4757da99..7e9776e57f 100644 --- a/target/linux/ipq806x/patches/0136-ARM-ipq8064-ap148-Add-i2c-pinctrl-nodes.patch +++ b/target/linux/ipq806x/patches/0136-ARM-ipq8064-ap148-Add-i2c-pinctrl-nodes.patch @@ -9,8 +9,6 @@ Signed-off-by: Andy Gross <agross@codeaurora.org> arch/arm/boot/dts/qcom-ipq8064.dtsi | 27 +++++++++++++++++++++++++++ 2 files changed, 44 insertions(+) -diff --git a/arch/arm/boot/dts/qcom-ipq8064-ap148.dts b/arch/arm/boot/dts/qcom-ipq8064-ap148.dts -index 100b6eb..dbb546d 100644 --- a/arch/arm/boot/dts/qcom-ipq8064-ap148.dts +++ b/arch/arm/boot/dts/qcom-ipq8064-ap148.dts @@ -14,12 +14,29 @@ @@ -43,8 +41,6 @@ index 100b6eb..dbb546d 100644 }; }; }; -diff --git a/arch/arm/boot/dts/qcom-ipq8064.dtsi b/arch/arm/boot/dts/qcom-ipq8064.dtsi -index 952afb7..b39c1ef 100644 --- a/arch/arm/boot/dts/qcom-ipq8064.dtsi +++ b/arch/arm/boot/dts/qcom-ipq8064.dtsi @@ -137,6 +137,20 @@ @@ -88,6 +84,3 @@ index 952afb7..b39c1ef 100644 }; qcom,ssbi@500000 { --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0137-ARM-qcom-ipq8064-ap148-Add-SPI-related-bindings.patch b/target/linux/ipq806x/patches/0137-ARM-qcom-ipq8064-ap148-Add-SPI-related-bindings.patch index 4a0385db27..f72446eb9e 100644 --- a/target/linux/ipq806x/patches/0137-ARM-qcom-ipq8064-ap148-Add-SPI-related-bindings.patch +++ b/target/linux/ipq806x/patches/0137-ARM-qcom-ipq8064-ap148-Add-SPI-related-bindings.patch @@ -9,8 +9,6 @@ Signed-off-by: Andy Gross <agross@codeaurora.org> arch/arm/boot/dts/qcom-ipq8064.dtsi | 47 ++++++++++++++++++++++++++++++ 2 files changed, 89 insertions(+) -diff --git a/arch/arm/boot/dts/qcom-ipq8064-ap148.dts b/arch/arm/boot/dts/qcom-ipq8064-ap148.dts -index dbb546d..158a09f 100644 --- a/arch/arm/boot/dts/qcom-ipq8064-ap148.dts +++ b/arch/arm/boot/dts/qcom-ipq8064-ap148.dts @@ -20,6 +20,15 @@ @@ -68,8 +66,6 @@ index dbb546d..158a09f 100644 + }; }; }; -diff --git a/arch/arm/boot/dts/qcom-ipq8064.dtsi b/arch/arm/boot/dts/qcom-ipq8064.dtsi -index b39c1ef..244f857 100644 --- a/arch/arm/boot/dts/qcom-ipq8064.dtsi +++ b/arch/arm/boot/dts/qcom-ipq8064.dtsi @@ -187,6 +187,53 @@ @@ -126,6 +122,3 @@ index b39c1ef..244f857 100644 qcom,ssbi@500000 { compatible = "qcom,ssbi"; reg = <0x00500000 0x1000>; --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0138-PCI-qcom-Add-support-for-pcie-controllers-on-IPQ8064.patch b/target/linux/ipq806x/patches/0138-PCI-qcom-Add-support-for-pcie-controllers-on-IPQ8064.patch index b1ff04b90d..8aaa766bcb 100644 --- a/target/linux/ipq806x/patches/0138-PCI-qcom-Add-support-for-pcie-controllers-on-IPQ8064.patch +++ b/target/linux/ipq806x/patches/0138-PCI-qcom-Add-support-for-pcie-controllers-on-IPQ8064.patch @@ -11,8 +11,6 @@ Subject: [PATCH 138/182] PCI: qcom: Add support for pcie controllers on 3 files changed, 685 insertions(+) create mode 100644 drivers/pci/host/pci-qcom.c -diff --git a/arch/arm/mach-qcom/Kconfig b/arch/arm/mach-qcom/Kconfig -index 63502cc..4d242e5 100644 --- a/arch/arm/mach-qcom/Kconfig +++ b/arch/arm/mach-qcom/Kconfig @@ -7,6 +7,8 @@ config ARCH_QCOM @@ -24,8 +22,6 @@ index 63502cc..4d242e5 100644 select QCOM_SCM if SMP help Support for Qualcomm's devicetree based systems. -diff --git a/drivers/pci/host/Makefile b/drivers/pci/host/Makefile -index 13fb333..be80744 100644 --- a/drivers/pci/host/Makefile +++ b/drivers/pci/host/Makefile @@ -4,3 +4,4 @@ obj-$(CONFIG_PCI_IMX6) += pci-imx6.o @@ -33,9 +29,6 @@ index 13fb333..be80744 100644 obj-$(CONFIG_PCI_TEGRA) += pci-tegra.o obj-$(CONFIG_PCI_RCAR_GEN2) += pci-rcar-gen2.o +obj-$(CONFIG_ARCH_QCOM) += pci-qcom.o -diff --git a/drivers/pci/host/pci-qcom.c b/drivers/pci/host/pci-qcom.c -new file mode 100644 -index 0000000..76d7b88 --- /dev/null +++ b/drivers/pci/host/pci-qcom.c @@ -0,0 +1,682 @@ @@ -721,6 +714,3 @@ index 0000000..76d7b88 + dev->class = (dev->class & 0xff) | (PCI_CLASS_BRIDGE_PCI << 8); +} +DECLARE_PCI_FIXUP_EARLY(PCIE_VENDOR_ID_RCP, PCIE_DEVICE_ID_RCP, msm_pcie_fixup_early); --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0139-ARM-dts-msm-Add-PCIe-related-nodes-for-IPQ8064-AP148.patch b/target/linux/ipq806x/patches/0139-ARM-dts-msm-Add-PCIe-related-nodes-for-IPQ8064-AP148.patch index 1105f140e7..1fd205256d 100644 --- a/target/linux/ipq806x/patches/0139-ARM-dts-msm-Add-PCIe-related-nodes-for-IPQ8064-AP148.patch +++ b/target/linux/ipq806x/patches/0139-ARM-dts-msm-Add-PCIe-related-nodes-for-IPQ8064-AP148.patch @@ -9,8 +9,6 @@ Subject: [PATCH 139/182] ARM: dts: msm: Add PCIe related nodes for arch/arm/boot/dts/qcom-ipq8064.dtsi | 93 ++++++++++++++++++++++++++++++ 2 files changed, 131 insertions(+) -diff --git a/arch/arm/boot/dts/qcom-ipq8064-ap148.dts b/arch/arm/boot/dts/qcom-ipq8064-ap148.dts -index 158a09f..11f7a77 100644 --- a/arch/arm/boot/dts/qcom-ipq8064-ap148.dts +++ b/arch/arm/boot/dts/qcom-ipq8064-ap148.dts @@ -21,6 +21,22 @@ @@ -64,8 +62,6 @@ index 158a09f..11f7a77 100644 + }; }; }; -diff --git a/arch/arm/boot/dts/qcom-ipq8064.dtsi b/arch/arm/boot/dts/qcom-ipq8064.dtsi -index 244f857..42a651f 100644 --- a/arch/arm/boot/dts/qcom-ipq8064.dtsi +++ b/arch/arm/boot/dts/qcom-ipq8064.dtsi @@ -2,6 +2,7 @@ @@ -174,6 +170,3 @@ index 244f857..42a651f 100644 + }; }; }; --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0140-ARM-qcom-config-Enable-PCI-support-for-IPQ806x.patch b/target/linux/ipq806x/patches/0140-ARM-qcom-config-Enable-PCI-support-for-IPQ806x.patch index e8519e1107..14a5db48ba 100644 --- a/target/linux/ipq806x/patches/0140-ARM-qcom-config-Enable-PCI-support-for-IPQ806x.patch +++ b/target/linux/ipq806x/patches/0140-ARM-qcom-config-Enable-PCI-support-for-IPQ806x.patch @@ -7,8 +7,6 @@ Subject: [PATCH 140/182] ARM: qcom: config: Enable PCI support for IPQ806x arch/arm/configs/qcom_defconfig | 3 +++ 1 file changed, 3 insertions(+) -diff --git a/arch/arm/configs/qcom_defconfig b/arch/arm/configs/qcom_defconfig -index 1752a4d..4866dec 100644 --- a/arch/arm/configs/qcom_defconfig +++ b/arch/arm/configs/qcom_defconfig @@ -21,6 +21,8 @@ CONFIG_ARCH_QCOM=y @@ -28,6 +26,3 @@ index 1752a4d..4866dec 100644 CONFIG_SERIAL_MSM=y CONFIG_SERIAL_MSM_CONSOLE=y CONFIG_HW_RANDOM=y --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0141-ahci-platform-Bump-max-number-of-clocks-to-5.patch b/target/linux/ipq806x/patches/0141-ahci-platform-Bump-max-number-of-clocks-to-5.patch index 0a41b3e866..2f5adcaf41 100644 --- a/target/linux/ipq806x/patches/0141-ahci-platform-Bump-max-number-of-clocks-to-5.patch +++ b/target/linux/ipq806x/patches/0141-ahci-platform-Bump-max-number-of-clocks-to-5.patch @@ -10,8 +10,6 @@ Signed-off-by: Kumar Gala <galak@codeaurora.org> drivers/ata/ahci.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/drivers/ata/ahci.h b/drivers/ata/ahci.h -index 51af275..6357e34 100644 --- a/drivers/ata/ahci.h +++ b/drivers/ata/ahci.h @@ -53,7 +53,7 @@ @@ -23,6 +21,3 @@ index 51af275..6357e34 100644 AHCI_MAX_SG = 168, /* hardware max is 64K */ AHCI_DMA_BOUNDARY = 0xffffffff, AHCI_MAX_CMDS = 32, --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0142-ata-Add-Qualcomm-ARM-SoC-AHCI-SATA-host-controller-d.patch b/target/linux/ipq806x/patches/0142-ata-Add-Qualcomm-ARM-SoC-AHCI-SATA-host-controller-d.patch index 678a33f472..aaedbb374b 100644 --- a/target/linux/ipq806x/patches/0142-ata-Add-Qualcomm-ARM-SoC-AHCI-SATA-host-controller-d.patch +++ b/target/linux/ipq806x/patches/0142-ata-Add-Qualcomm-ARM-SoC-AHCI-SATA-host-controller-d.patch @@ -16,8 +16,6 @@ Signed-off-by: Kumar Gala <galak@codeaurora.org> 3 files changed, 97 insertions(+) create mode 100644 drivers/ata/ahci_qcom.c -diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig -index dc950f3..da05034 100644 --- a/drivers/ata/Kconfig +++ b/drivers/ata/Kconfig @@ -106,6 +106,16 @@ config AHCI_IMX @@ -37,8 +35,6 @@ index dc950f3..da05034 100644 config SATA_FSL tristate "Freescale 3.0Gbps SATA support" depends on FSL_SOC -diff --git a/drivers/ata/Makefile b/drivers/ata/Makefile -index 366b743..e08044f 100644 --- a/drivers/ata/Makefile +++ b/drivers/ata/Makefile @@ -11,6 +11,7 @@ obj-$(CONFIG_SATA_SIL24) += sata_sil24.o @@ -49,9 +45,6 @@ index 366b743..e08044f 100644 # SFF w/ custom DMA obj-$(CONFIG_PDC_ADMA) += pdc_adma.o -diff --git a/drivers/ata/ahci_qcom.c b/drivers/ata/ahci_qcom.c -new file mode 100644 -index 0000000..bfb7a77 --- /dev/null +++ b/drivers/ata/ahci_qcom.c @@ -0,0 +1,86 @@ @@ -141,6 +134,3 @@ index 0000000..bfb7a77 +MODULE_DESCRIPTION("Qualcomm AHCI SATA platform driver"); +MODULE_LICENSE("GPL v2"); +MODULE_ALIAS("ahci:qcom"); --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0143-ata-qcom-Add-device-tree-bindings-information.patch b/target/linux/ipq806x/patches/0143-ata-qcom-Add-device-tree-bindings-information.patch index ef795bf054..01ca7336ee 100644 --- a/target/linux/ipq806x/patches/0143-ata-qcom-Add-device-tree-bindings-information.patch +++ b/target/linux/ipq806x/patches/0143-ata-qcom-Add-device-tree-bindings-information.patch @@ -12,9 +12,6 @@ Signed-off-by: Kumar Gala <galak@codeaurora.org> 1 file changed, 40 insertions(+) create mode 100644 Documentation/devicetree/bindings/ata/qcom-sata.txt -diff --git a/Documentation/devicetree/bindings/ata/qcom-sata.txt b/Documentation/devicetree/bindings/ata/qcom-sata.txt -new file mode 100644 -index 0000000..5e74e41 --- /dev/null +++ b/Documentation/devicetree/bindings/ata/qcom-sata.txt @@ -0,0 +1,40 @@ @@ -58,6 +55,3 @@ index 0000000..5e74e41 + phys = <&sata_phy>; + phy-names = "sata-phy"; + }; --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0144-phy-qcom-Add-driver-for-QCOM-IPQ806x-SATA-PHY.patch b/target/linux/ipq806x/patches/0144-phy-qcom-Add-driver-for-QCOM-IPQ806x-SATA-PHY.patch index 862be0835e..9a5457df6c 100644 --- a/target/linux/ipq806x/patches/0144-phy-qcom-Add-driver-for-QCOM-IPQ806x-SATA-PHY.patch +++ b/target/linux/ipq806x/patches/0144-phy-qcom-Add-driver-for-QCOM-IPQ806x-SATA-PHY.patch @@ -14,8 +14,6 @@ Signed-off-by: Kumar Gala <galak@codeaurora.org> 3 files changed, 219 insertions(+) create mode 100644 drivers/phy/phy-qcom-ipq806x-sata.c -diff --git a/drivers/phy/Kconfig b/drivers/phy/Kconfig -index c7a551c..3642a65 100644 --- a/drivers/phy/Kconfig +++ b/drivers/phy/Kconfig @@ -65,4 +65,11 @@ config BCM_KONA_USB2_PHY @@ -30,18 +28,13 @@ index c7a551c..3642a65 100644 + select GENERIC_PHY + endmenu -diff --git a/drivers/phy/Makefile b/drivers/phy/Makefile -index b57c253..74f78cc 100644 --- a/drivers/phy/Makefile +++ b/drivers/phy/Makefile -@@ -9,3 +9,4 @@ obj-$(CONFIG_PHY_EXYNOS_MIPI_VIDEO) += phy-exynos-mipi-video.o +@@ -9,3 +9,4 @@ obj-$(CONFIG_PHY_EXYNOS_MIPI_VIDEO) += p obj-$(CONFIG_PHY_MVEBU_SATA) += phy-mvebu-sata.o obj-$(CONFIG_OMAP_USB2) += phy-omap-usb2.o obj-$(CONFIG_TWL4030_USB) += phy-twl4030-usb.o +obj-$(CONFIG_PHY_QCOM_IPQ806X_SATA) += phy-qcom-ipq806x-sata.o -diff --git a/drivers/phy/phy-qcom-ipq806x-sata.c b/drivers/phy/phy-qcom-ipq806x-sata.c -new file mode 100644 -index 0000000..e931aee --- /dev/null +++ b/drivers/phy/phy-qcom-ipq806x-sata.c @@ -0,0 +1,211 @@ @@ -256,6 +249,3 @@ index 0000000..e931aee + +MODULE_DESCRIPTION("QCOM IPQ806x SATA PHY driver"); +MODULE_LICENSE("GPL v2"); --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0145-phy-qcom-Add-device-tree-bindings-information.patch b/target/linux/ipq806x/patches/0145-phy-qcom-Add-device-tree-bindings-information.patch index 1791228113..bd5e5d4fb3 100644 --- a/target/linux/ipq806x/patches/0145-phy-qcom-Add-device-tree-bindings-information.patch +++ b/target/linux/ipq806x/patches/0145-phy-qcom-Add-device-tree-bindings-information.patch @@ -12,9 +12,6 @@ Signed-off-by: Kumar Gala <galak@codeaurora.org> 1 file changed, 23 insertions(+) create mode 100644 Documentation/devicetree/bindings/phy/qcom-phy.txt -diff --git a/Documentation/devicetree/bindings/phy/qcom-phy.txt b/Documentation/devicetree/bindings/phy/qcom-phy.txt -new file mode 100644 -index 0000000..76bfbd0 --- /dev/null +++ b/Documentation/devicetree/bindings/phy/qcom-phy.txt @@ -0,0 +1,23 @@ @@ -41,6 +38,3 @@ index 0000000..76bfbd0 + + #phy-cells = <0>; + }; --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0146-ARM-dts-qcom-Add-SATA-support-for-IPQ8064-and-AP148-.patch b/target/linux/ipq806x/patches/0146-ARM-dts-qcom-Add-SATA-support-for-IPQ8064-and-AP148-.patch index 0d196ad212..da124c74d1 100644 --- a/target/linux/ipq806x/patches/0146-ARM-dts-qcom-Add-SATA-support-for-IPQ8064-and-AP148-.patch +++ b/target/linux/ipq806x/patches/0146-ARM-dts-qcom-Add-SATA-support-for-IPQ8064-and-AP148-.patch @@ -9,8 +9,6 @@ Subject: [PATCH 146/182] ARM: dts: qcom: Add SATA support for IPQ8064 and arch/arm/boot/dts/qcom-ipq8064.dtsi | 30 ++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+) -diff --git a/arch/arm/boot/dts/qcom-ipq8064-ap148.dts b/arch/arm/boot/dts/qcom-ipq8064-ap148.dts -index 11f7a77..c752889 100644 --- a/arch/arm/boot/dts/qcom-ipq8064-ap148.dts +++ b/arch/arm/boot/dts/qcom-ipq8064-ap148.dts @@ -118,5 +118,13 @@ @@ -27,8 +25,6 @@ index 11f7a77..c752889 100644 + }; }; }; -diff --git a/arch/arm/boot/dts/qcom-ipq8064.dtsi b/arch/arm/boot/dts/qcom-ipq8064.dtsi -index 42a651f..93c0315 100644 --- a/arch/arm/boot/dts/qcom-ipq8064.dtsi +++ b/arch/arm/boot/dts/qcom-ipq8064.dtsi @@ -339,5 +339,35 @@ @@ -67,6 +63,3 @@ index 42a651f..93c0315 100644 + }; }; }; --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0147-ARM-qcom-Enable-SATA-SATA-PHY-drivers-in-defconfig.patch b/target/linux/ipq806x/patches/0147-ARM-qcom-Enable-SATA-SATA-PHY-drivers-in-defconfig.patch index 43e9dff160..7465f56e4f 100644 --- a/target/linux/ipq806x/patches/0147-ARM-qcom-Enable-SATA-SATA-PHY-drivers-in-defconfig.patch +++ b/target/linux/ipq806x/patches/0147-ARM-qcom-Enable-SATA-SATA-PHY-drivers-in-defconfig.patch @@ -7,8 +7,6 @@ Subject: [PATCH 147/182] ARM: qcom: Enable SATA/SATA-PHY drivers in defconfig arch/arm/configs/qcom_defconfig | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) -diff --git a/arch/arm/configs/qcom_defconfig b/arch/arm/configs/qcom_defconfig -index 4866dec..84c6639 100644 --- a/arch/arm/configs/qcom_defconfig +++ b/arch/arm/configs/qcom_defconfig @@ -57,7 +57,6 @@ CONFIG_MTD_BLOCK=y @@ -37,6 +35,3 @@ index 4866dec..84c6639 100644 CONFIG_EXT2_FS=y CONFIG_EXT2_FS_XATTR=y CONFIG_EXT3_FS=y --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0148-ARM-qcom-enable-default-CPU_IDLE-to-get-wfi-support-.patch b/target/linux/ipq806x/patches/0148-ARM-qcom-enable-default-CPU_IDLE-to-get-wfi-support-.patch index 29d712679d..c68a23b2fe 100644 --- a/target/linux/ipq806x/patches/0148-ARM-qcom-enable-default-CPU_IDLE-to-get-wfi-support-.patch +++ b/target/linux/ipq806x/patches/0148-ARM-qcom-enable-default-CPU_IDLE-to-get-wfi-support-.patch @@ -9,8 +9,6 @@ Signed-off-by: Kumar Gala <galak@codeaurora.org> arch/arm/configs/qcom_defconfig | 1 + 1 file changed, 1 insertion(+) -diff --git a/arch/arm/configs/qcom_defconfig b/arch/arm/configs/qcom_defconfig -index 84c6639..85a35af 100644 --- a/arch/arm/configs/qcom_defconfig +++ b/arch/arm/configs/qcom_defconfig @@ -31,6 +31,7 @@ CONFIG_HIGHPTE=y @@ -21,6 +19,3 @@ index 84c6639..85a35af 100644 CONFIG_VFP=y CONFIG_NEON=y # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0149-pinctrl-qcom-Add-BUS_HOLD-Keeper-bias.patch b/target/linux/ipq806x/patches/0149-pinctrl-qcom-Add-BUS_HOLD-Keeper-bias.patch index 8e21ee8a97..8b2e18ab84 100644 --- a/target/linux/ipq806x/patches/0149-pinctrl-qcom-Add-BUS_HOLD-Keeper-bias.patch +++ b/target/linux/ipq806x/patches/0149-pinctrl-qcom-Add-BUS_HOLD-Keeper-bias.patch @@ -10,11 +10,9 @@ Signed-off-by: Andy Gross <agross@codeaurora.org> drivers/pinctrl/pinctrl-msm.c | 8 ++++++++ 1 file changed, 8 insertions(+) -diff --git a/drivers/pinctrl/pinctrl-msm.c b/drivers/pinctrl/pinctrl-msm.c -index 7d67d34..f054b25 100644 --- a/drivers/pinctrl/pinctrl-msm.c +++ b/drivers/pinctrl/pinctrl-msm.c -@@ -207,6 +207,7 @@ static int msm_config_reg(struct msm_pinctrl *pctrl, +@@ -207,6 +207,7 @@ static int msm_config_reg(struct msm_pin case PIN_CONFIG_BIAS_DISABLE: case PIN_CONFIG_BIAS_PULL_DOWN: case PIN_CONFIG_BIAS_PULL_UP: @@ -22,7 +20,7 @@ index 7d67d34..f054b25 100644 *bit = g->pull_bit; *mask = 3; break; -@@ -243,6 +244,7 @@ static int msm_config_set(struct pinctrl_dev *pctldev, unsigned int pin, +@@ -243,6 +244,7 @@ static int msm_config_set(struct pinctrl #define MSM_NO_PULL 0 #define MSM_PULL_DOWN 1 @@ -30,7 +28,7 @@ index 7d67d34..f054b25 100644 #define MSM_PULL_UP 3 static unsigned msm_regval_to_drive(u32 val) -@@ -280,6 +282,9 @@ static int msm_config_group_get(struct pinctrl_dev *pctldev, +@@ -280,6 +282,9 @@ static int msm_config_group_get(struct p case PIN_CONFIG_BIAS_PULL_DOWN: arg = arg == MSM_PULL_DOWN; break; @@ -40,7 +38,7 @@ index 7d67d34..f054b25 100644 case PIN_CONFIG_BIAS_PULL_UP: arg = arg == MSM_PULL_UP; break; -@@ -339,6 +344,9 @@ static int msm_config_group_set(struct pinctrl_dev *pctldev, +@@ -339,6 +344,9 @@ static int msm_config_group_set(struct p case PIN_CONFIG_BIAS_PULL_DOWN: arg = MSM_PULL_DOWN; break; @@ -50,6 +48,3 @@ index 7d67d34..f054b25 100644 case PIN_CONFIG_BIAS_PULL_UP: arg = MSM_PULL_UP; break; --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0150-mtd-nand-Add-Qualcomm-NAND-controller.patch b/target/linux/ipq806x/patches/0150-mtd-nand-Add-Qualcomm-NAND-controller.patch index 5a9fb51f03..f19045ed73 100644 --- a/target/linux/ipq806x/patches/0150-mtd-nand-Add-Qualcomm-NAND-controller.patch +++ b/target/linux/ipq806x/patches/0150-mtd-nand-Add-Qualcomm-NAND-controller.patch @@ -19,8 +19,6 @@ Signed-off-by: Andy Gross <agross@codeaurora.org> create mode 100644 drivers/mtd/nand/qcom_nand.c create mode 100644 drivers/mtd/nand/qcom_nand.h -diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig -index 90ff447..6e3842f 100644 --- a/drivers/mtd/nand/Kconfig +++ b/drivers/mtd/nand/Kconfig @@ -510,4 +510,22 @@ config MTD_NAND_XWAY @@ -46,11 +44,9 @@ index 90ff447..6e3842f 100644 + Support for some NAND chips connected to the QCOM NAND controller. + endif # MTD_NAND -diff --git a/drivers/mtd/nand/Makefile b/drivers/mtd/nand/Makefile -index 542b568..6ef3c02 100644 --- a/drivers/mtd/nand/Makefile +++ b/drivers/mtd/nand/Makefile -@@ -49,5 +49,7 @@ obj-$(CONFIG_MTD_NAND_JZ4740) += jz4740_nand.o +@@ -49,5 +49,7 @@ obj-$(CONFIG_MTD_NAND_JZ4740) += jz4740 obj-$(CONFIG_MTD_NAND_GPMI_NAND) += gpmi-nand/ obj-$(CONFIG_MTD_NAND_XWAY) += xway_nand.o obj-$(CONFIG_MTD_NAND_BCM47XXNFLASH) += bcm47xxnflash/ @@ -58,9 +54,6 @@ index 542b568..6ef3c02 100644 +obj-$(CONFIG_MTD_QCOM_DMA) += qcom_adm_dma.o nand-objs := nand_base.o nand_bbt.o -diff --git a/drivers/mtd/nand/qcom_adm_dma.c b/drivers/mtd/nand/qcom_adm_dma.c -new file mode 100644 -index 0000000..46d8473 --- /dev/null +++ b/drivers/mtd/nand/qcom_adm_dma.c @@ -0,0 +1,797 @@ @@ -861,9 +854,6 @@ index 0000000..46d8473 + return 0; +} +arch_initcall(msm_init_datamover); -diff --git a/drivers/mtd/nand/qcom_adm_dma.h b/drivers/mtd/nand/qcom_adm_dma.h -new file mode 100644 -index 0000000..1014d57 --- /dev/null +++ b/drivers/mtd/nand/qcom_adm_dma.h @@ -0,0 +1,268 @@ @@ -1135,9 +1125,6 @@ index 0000000..1014d57 +#define CMD_SRC_CRCI(n) (((n) & 15) << 3) + +#endif -diff --git a/drivers/mtd/nand/qcom_nand.c b/drivers/mtd/nand/qcom_nand.c -new file mode 100644 -index 0000000..9314132 --- /dev/null +++ b/drivers/mtd/nand/qcom_nand.c @@ -0,0 +1,7455 @@ @@ -8596,9 +8583,6 @@ index 0000000..9314132 + +MODULE_LICENSE("GPL"); +MODULE_DESCRIPTION("msm_nand flash driver code"); -diff --git a/drivers/mtd/nand/qcom_nand.h b/drivers/mtd/nand/qcom_nand.h -new file mode 100644 -index 0000000..468186c --- /dev/null +++ b/drivers/mtd/nand/qcom_nand.h @@ -0,0 +1,196 @@ @@ -8798,6 +8782,3 @@ index 0000000..468186c +extern struct flash_platform_data msm_nand_data; + +#endif --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0151-ARM-ipq8064-Add-nand-device-info.patch b/target/linux/ipq806x/patches/0151-ARM-ipq8064-Add-nand-device-info.patch index b79c16f34e..b460454352 100644 --- a/target/linux/ipq806x/patches/0151-ARM-ipq8064-Add-nand-device-info.patch +++ b/target/linux/ipq806x/patches/0151-ARM-ipq8064-Add-nand-device-info.patch @@ -9,8 +9,6 @@ Signed-off-by: Andy Gross <agross@codeaurora.org> arch/arm/boot/dts/qcom-ipq8064.dtsi | 33 +++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+) -diff --git a/arch/arm/boot/dts/qcom-ipq8064-ap148.dts b/arch/arm/boot/dts/qcom-ipq8064-ap148.dts -index c752889..4062eb6 100644 --- a/arch/arm/boot/dts/qcom-ipq8064-ap148.dts +++ b/arch/arm/boot/dts/qcom-ipq8064-ap148.dts @@ -45,6 +45,29 @@ @@ -60,8 +58,6 @@ index c752889..4062eb6 100644 + }; }; }; -diff --git a/arch/arm/boot/dts/qcom-ipq8064.dtsi b/arch/arm/boot/dts/qcom-ipq8064.dtsi -index 93c0315..d9fce15 100644 --- a/arch/arm/boot/dts/qcom-ipq8064.dtsi +++ b/arch/arm/boot/dts/qcom-ipq8064.dtsi @@ -76,6 +76,7 @@ @@ -110,6 +106,3 @@ index 93c0315..d9fce15 100644 + }; }; }; --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0152-ARM-qcom-config-Add-NAND-config-options.patch b/target/linux/ipq806x/patches/0152-ARM-qcom-config-Add-NAND-config-options.patch index 97f012dfb6..a2489e49e5 100644 --- a/target/linux/ipq806x/patches/0152-ARM-qcom-config-Add-NAND-config-options.patch +++ b/target/linux/ipq806x/patches/0152-ARM-qcom-config-Add-NAND-config-options.patch @@ -10,8 +10,6 @@ Signed-off-by: Andy Gross <agross@codeaurora.org> arch/arm/configs/qcom_defconfig | 1 + 1 file changed, 1 insertion(+) -diff --git a/arch/arm/configs/qcom_defconfig b/arch/arm/configs/qcom_defconfig -index 85a35af..e3f9013 100644 --- a/arch/arm/configs/qcom_defconfig +++ b/arch/arm/configs/qcom_defconfig @@ -56,6 +56,7 @@ CONFIG_DEVTMPFS_MOUNT=y @@ -22,6 +20,3 @@ index 85a35af..e3f9013 100644 CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_RAM=y CONFIG_SCSI_TGT=y --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0153-soc-qcom-tcsr-Add-TCSR-driver.patch b/target/linux/ipq806x/patches/0153-soc-qcom-tcsr-Add-TCSR-driver.patch index 03b65e6872..65e4c2ff33 100644 --- a/target/linux/ipq806x/patches/0153-soc-qcom-tcsr-Add-TCSR-driver.patch +++ b/target/linux/ipq806x/patches/0153-soc-qcom-tcsr-Add-TCSR-driver.patch @@ -17,9 +17,6 @@ Signed-off-by: Andy Gross <agross@codeaurora.org> create mode 100644 drivers/soc/qcom/qcom_tcsr.c create mode 100644 include/dt-bindings/soc/qcom,tcsr.h -diff --git a/Documentation/devicetree/bindings/soc/qcom/qcom,tcsr.txt b/Documentation/devicetree/bindings/soc/qcom/qcom,tcsr.txt -new file mode 100644 -index 0000000..6ea74c1 --- /dev/null +++ b/Documentation/devicetree/bindings/soc/qcom/qcom,tcsr.txt @@ -0,0 +1,25 @@ @@ -48,8 +45,6 @@ index 0000000..6ea74c1 + }; + + -diff --git a/drivers/soc/qcom/Kconfig b/drivers/soc/qcom/Kconfig -index 7bd2c94..3e4486a 100644 --- a/drivers/soc/qcom/Kconfig +++ b/drivers/soc/qcom/Kconfig @@ -9,3 +9,9 @@ config QCOM_GSBI @@ -62,16 +57,11 @@ index 7bd2c94..3e4486a 100644 + help + Say y here to enable TCSR support. The TCSR provides control + functions for various peripherals. -diff --git a/drivers/soc/qcom/Makefile b/drivers/soc/qcom/Makefile -index 4389012..d299492 100644 --- a/drivers/soc/qcom/Makefile +++ b/drivers/soc/qcom/Makefile @@ -1 +1,2 @@ obj-$(CONFIG_QCOM_GSBI) += qcom_gsbi.o +obj-$(CONFIG_QCOM_TCSR) += qcom_tcsr.o -diff --git a/drivers/soc/qcom/qcom_tcsr.c b/drivers/soc/qcom/qcom_tcsr.c -new file mode 100644 -index 0000000..dd33153 --- /dev/null +++ b/drivers/soc/qcom/qcom_tcsr.c @@ -0,0 +1,64 @@ @@ -139,9 +129,6 @@ index 0000000..dd33153 +MODULE_AUTHOR("Andy Gross <agross@codeaurora.org>"); +MODULE_DESCRIPTION("QCOM TCSR driver"); +MODULE_LICENSE("GPL v2"); -diff --git a/include/dt-bindings/soc/qcom,tcsr.h b/include/dt-bindings/soc/qcom,tcsr.h -new file mode 100644 -index 0000000..c9d497a --- /dev/null +++ b/include/dt-bindings/soc/qcom,tcsr.h @@ -0,0 +1,19 @@ @@ -164,6 +151,3 @@ index 0000000..c9d497a +#define TCSR_USB_SELECT_USB3_DUAL 0x3 + +#endif --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0154-clk-qcom-Correct-UTMI-clock-frequency-table.patch b/target/linux/ipq806x/patches/0154-clk-qcom-Correct-UTMI-clock-frequency-table.patch index 28951ab18b..1d81970c96 100644 --- a/target/linux/ipq806x/patches/0154-clk-qcom-Correct-UTMI-clock-frequency-table.patch +++ b/target/linux/ipq806x/patches/0154-clk-qcom-Correct-UTMI-clock-frequency-table.patch @@ -11,11 +11,9 @@ Signed-off-by: Andy Gross <agross@codeaurora.org> drivers/clk/qcom/gcc-ipq806x.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/drivers/clk/qcom/gcc-ipq806x.c b/drivers/clk/qcom/gcc-ipq806x.c -index f7916be..d80dc69 100644 --- a/drivers/clk/qcom/gcc-ipq806x.c +++ b/drivers/clk/qcom/gcc-ipq806x.c -@@ -1992,7 +1992,7 @@ static struct clk_branch usb30_1_branch_clk = { +@@ -1992,7 +1992,7 @@ static struct clk_branch usb30_1_branch_ }; static const struct freq_tbl clk_tbl_usb30_utmi[] = { @@ -24,6 +22,3 @@ index f7916be..d80dc69 100644 { } }; --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0155-clk-qcom-Fix-incorrect-UTMI-DT-include-values.patch b/target/linux/ipq806x/patches/0155-clk-qcom-Fix-incorrect-UTMI-DT-include-values.patch index 7bfbbcb8f1..a05fc2c331 100644 --- a/target/linux/ipq806x/patches/0155-clk-qcom-Fix-incorrect-UTMI-DT-include-values.patch +++ b/target/linux/ipq806x/patches/0155-clk-qcom-Fix-incorrect-UTMI-DT-include-values.patch @@ -10,8 +10,6 @@ Signed-off-by: Andy Gross <agross@codeaurora.org> include/dt-bindings/clock/qcom,gcc-ipq806x.h | 38 +++++++++++++------------- 1 file changed, 19 insertions(+), 19 deletions(-) -diff --git a/include/dt-bindings/clock/qcom,gcc-ipq806x.h b/include/dt-bindings/clock/qcom,gcc-ipq806x.h -index 0fd3e8a..163ba85 100644 --- a/include/dt-bindings/clock/qcom,gcc-ipq806x.h +++ b/include/dt-bindings/clock/qcom,gcc-ipq806x.h @@ -273,24 +273,24 @@ @@ -58,6 +56,3 @@ index 0fd3e8a..163ba85 100644 +#define NSS_CORE_CLK 283 /* Virtual */ #endif --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0156-usb-dwc3-Add-Qualcomm-DWC3-glue-layer-driver.patch b/target/linux/ipq806x/patches/0156-usb-dwc3-Add-Qualcomm-DWC3-glue-layer-driver.patch index f8ad3cdbcb..a69a5bd3a5 100644 --- a/target/linux/ipq806x/patches/0156-usb-dwc3-Add-Qualcomm-DWC3-glue-layer-driver.patch +++ b/target/linux/ipq806x/patches/0156-usb-dwc3-Add-Qualcomm-DWC3-glue-layer-driver.patch @@ -15,8 +15,6 @@ Signed-off-by: Ivan T. Ivanov <iivanov@mm-sol.com> 3 files changed, 165 insertions(+) create mode 100644 drivers/usb/dwc3/dwc3-qcom.c -diff --git a/drivers/usb/dwc3/Kconfig b/drivers/usb/dwc3/Kconfig -index e2c730f..2d01983 100644 --- a/drivers/usb/dwc3/Kconfig +++ b/drivers/usb/dwc3/Kconfig @@ -59,6 +59,14 @@ config USB_DWC3_EXYNOS @@ -34,8 +32,6 @@ index e2c730f..2d01983 100644 config USB_DWC3_PCI tristate "PCIe-based Platforms" depends on PCI -diff --git a/drivers/usb/dwc3/Makefile b/drivers/usb/dwc3/Makefile -index 10ac3e7..4066e4e 100644 --- a/drivers/usb/dwc3/Makefile +++ b/drivers/usb/dwc3/Makefile @@ -31,5 +31,6 @@ endif @@ -45,9 +41,6 @@ index 10ac3e7..4066e4e 100644 +obj-$(CONFIG_USB_DWC3_QCOM) += dwc3-qcom.o obj-$(CONFIG_USB_DWC3_PCI) += dwc3-pci.o obj-$(CONFIG_USB_DWC3_KEYSTONE) += dwc3-keystone.o -diff --git a/drivers/usb/dwc3/dwc3-qcom.c b/drivers/usb/dwc3/dwc3-qcom.c -new file mode 100644 -index 0000000..8d17360 --- /dev/null +++ b/drivers/usb/dwc3/dwc3-qcom.c @@ -0,0 +1,156 @@ @@ -207,6 +200,3 @@ index 0000000..8d17360 +MODULE_ALIAS("platform:qcom-dwc3"); +MODULE_LICENSE("GPL v2"); +MODULE_DESCRIPTION("DesignWare USB3 QCOM Glue Layer"); --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0157-usb-phy-Add-Qualcomm-DWC3-HS-SS-PHY-drivers.patch b/target/linux/ipq806x/patches/0157-usb-phy-Add-Qualcomm-DWC3-HS-SS-PHY-drivers.patch index 332a32c910..d7fafed5ce 100644 --- a/target/linux/ipq806x/patches/0157-usb-phy-Add-Qualcomm-DWC3-HS-SS-PHY-drivers.patch +++ b/target/linux/ipq806x/patches/0157-usb-phy-Add-Qualcomm-DWC3-HS-SS-PHY-drivers.patch @@ -18,8 +18,6 @@ Signed-off-by: Ivan T. Ivanov <iivanov@mm-sol.com> create mode 100644 drivers/usb/phy/phy-qcom-hsusb.c create mode 100644 drivers/usb/phy/phy-qcom-ssusb.c -diff --git a/drivers/usb/phy/Kconfig b/drivers/usb/phy/Kconfig -index 7d1451d..ddb65be 100644 --- a/drivers/usb/phy/Kconfig +++ b/drivers/usb/phy/Kconfig @@ -193,7 +193,7 @@ config USB_ISP1301 @@ -49,11 +47,9 @@ index 7d1451d..ddb65be 100644 config USB_ULPI bool "Generic ULPI Transceiver Driver" depends on ARM -diff --git a/drivers/usb/phy/Makefile b/drivers/usb/phy/Makefile -index be58ada..857f04e 100644 --- a/drivers/usb/phy/Makefile +++ b/drivers/usb/phy/Makefile -@@ -26,6 +26,8 @@ obj-$(CONFIG_USB_EHCI_TEGRA) += phy-tegra-usb.o +@@ -26,6 +26,8 @@ obj-$(CONFIG_USB_EHCI_TEGRA) += phy-teg obj-$(CONFIG_USB_GPIO_VBUS) += phy-gpio-vbus-usb.o obj-$(CONFIG_USB_ISP1301) += phy-isp1301.o obj-$(CONFIG_USB_MSM_OTG) += phy-msm-usb.o @@ -62,9 +58,6 @@ index be58ada..857f04e 100644 obj-$(CONFIG_USB_MV_OTG) += phy-mv-usb.o obj-$(CONFIG_USB_MXS_PHY) += phy-mxs-usb.o obj-$(CONFIG_USB_RCAR_PHY) += phy-rcar-usb.o -diff --git a/drivers/usb/phy/phy-qcom-hsusb.c b/drivers/usb/phy/phy-qcom-hsusb.c -new file mode 100644 -index 0000000..f96b2b9 --- /dev/null +++ b/drivers/usb/phy/phy-qcom-hsusb.c @@ -0,0 +1,340 @@ @@ -408,9 +401,6 @@ index 0000000..f96b2b9 +MODULE_ALIAS("platform:qcom-dwc3-hsphy"); +MODULE_LICENSE("GPL v2"); +MODULE_DESCRIPTION("DesignWare USB3 QCOM HSPHY driver"); -diff --git a/drivers/usb/phy/phy-qcom-ssusb.c b/drivers/usb/phy/phy-qcom-ssusb.c -new file mode 100644 -index 0000000..3da778f --- /dev/null +++ b/drivers/usb/phy/phy-qcom-ssusb.c @@ -0,0 +1,455 @@ @@ -869,6 +859,3 @@ index 0000000..3da778f +MODULE_ALIAS("platform:qcom-dwc3-ssphy"); +MODULE_LICENSE("GPL v2"); +MODULE_DESCRIPTION("DesignWare USB3 QCOM SSPHY driver"); --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0158-usb-dwc3-qcom-Add-device-tree-binding.patch b/target/linux/ipq806x/patches/0158-usb-dwc3-qcom-Add-device-tree-binding.patch index cf1b300b50..ffe2a8d597 100644 --- a/target/linux/ipq806x/patches/0158-usb-dwc3-qcom-Add-device-tree-binding.patch +++ b/target/linux/ipq806x/patches/0158-usb-dwc3-qcom-Add-device-tree-binding.patch @@ -16,9 +16,6 @@ Acked-by: Stephen Warren <swarren@nvidia.com> 1 file changed, 104 insertions(+) create mode 100644 Documentation/devicetree/bindings/usb/qcom,dwc3.txt -diff --git a/Documentation/devicetree/bindings/usb/qcom,dwc3.txt b/Documentation/devicetree/bindings/usb/qcom,dwc3.txt -new file mode 100644 -index 0000000..105b6b7 --- /dev/null +++ b/Documentation/devicetree/bindings/usb/qcom,dwc3.txt @@ -0,0 +1,104 @@ @@ -126,6 +123,3 @@ index 0000000..105b6b7 + dr_mode = "host"; + }; + }; --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0159-arm-ipq8064-Add-USB3-DT-information.patch b/target/linux/ipq806x/patches/0159-arm-ipq8064-Add-USB3-DT-information.patch index 5a0d099af8..843e94f2ff 100644 --- a/target/linux/ipq806x/patches/0159-arm-ipq8064-Add-USB3-DT-information.patch +++ b/target/linux/ipq806x/patches/0159-arm-ipq8064-Add-USB3-DT-information.patch @@ -11,8 +11,6 @@ Signed-off-by: Andy Gross <agross@codeaurora.org> arch/arm/boot/dts/qcom-ipq8064.dtsi | 90 ++++++++++++++++++++++++++++++ 2 files changed, 119 insertions(+) -diff --git a/arch/arm/boot/dts/qcom-ipq8064-ap148.dts b/arch/arm/boot/dts/qcom-ipq8064-ap148.dts -index 4062eb6..2b2d63c 100644 --- a/arch/arm/boot/dts/qcom-ipq8064-ap148.dts +++ b/arch/arm/boot/dts/qcom-ipq8064-ap148.dts @@ -160,5 +160,34 @@ @@ -50,8 +48,6 @@ index 4062eb6..2b2d63c 100644 + }; }; }; -diff --git a/arch/arm/boot/dts/qcom-ipq8064.dtsi b/arch/arm/boot/dts/qcom-ipq8064.dtsi -index d9fce15..6be6ac9 100644 --- a/arch/arm/boot/dts/qcom-ipq8064.dtsi +++ b/arch/arm/boot/dts/qcom-ipq8064.dtsi @@ -4,6 +4,7 @@ @@ -157,6 +153,3 @@ index d9fce15..6be6ac9 100644 + }; }; }; --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0160-ARM-qcom-config-Add-TCSR-and-USB3-options.patch b/target/linux/ipq806x/patches/0160-ARM-qcom-config-Add-TCSR-and-USB3-options.patch index b74db3edbc..400c87e76b 100644 --- a/target/linux/ipq806x/patches/0160-ARM-qcom-config-Add-TCSR-and-USB3-options.patch +++ b/target/linux/ipq806x/patches/0160-ARM-qcom-config-Add-TCSR-and-USB3-options.patch @@ -10,8 +10,6 @@ Signed-off-by: Andy Gross <agross@codeaurora.org> arch/arm/configs/qcom_defconfig | 6 ++++++ 1 file changed, 6 insertions(+) -diff --git a/arch/arm/configs/qcom_defconfig b/arch/arm/configs/qcom_defconfig -index e3f9013..3d55d79 100644 --- a/arch/arm/configs/qcom_defconfig +++ b/arch/arm/configs/qcom_defconfig @@ -122,9 +122,14 @@ CONFIG_HID_BATTERY_STRENGTH=y @@ -37,6 +35,3 @@ index e3f9013..3d55d79 100644 CONFIG_COMMON_CLK_QCOM=y CONFIG_IPQ_GCC_806X=y CONFIG_MSM_GCC_8660=y --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0161-ARM-Remove-ARCH_HAS_CPUFREQ-config-option.patch b/target/linux/ipq806x/patches/0161-ARM-Remove-ARCH_HAS_CPUFREQ-config-option.patch index 41dae6e81b..32f2b5d8ea 100644 --- a/target/linux/ipq806x/patches/0161-ARM-Remove-ARCH_HAS_CPUFREQ-config-option.patch +++ b/target/linux/ipq806x/patches/0161-ARM-Remove-ARCH_HAS_CPUFREQ-config-option.patch @@ -28,11 +28,9 @@ Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> arch/arm/mach-vt8500/Kconfig | 1 - 11 files changed, 29 deletions(-) -diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig -index 4332e8d..1a61d4a 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig -@@ -180,13 +180,6 @@ config ARCH_HAS_ILOG2_U32 +@@ -181,13 +181,6 @@ config ARCH_HAS_ILOG2_U32 config ARCH_HAS_ILOG2_U64 bool @@ -46,7 +44,7 @@ index 4332e8d..1a61d4a 100644 config ARCH_HAS_BANDGAP bool -@@ -315,7 +308,6 @@ config ARCH_MULTIPLATFORM +@@ -316,7 +309,6 @@ config ARCH_MULTIPLATFORM config ARCH_INTEGRATOR bool "ARM Ltd. Integrator family" @@ -54,7 +52,7 @@ index 4332e8d..1a61d4a 100644 select ARM_AMBA select ARM_PATCH_PHYS_VIRT select AUTO_ZRELADDR -@@ -540,7 +532,6 @@ config ARCH_DOVE +@@ -541,7 +533,6 @@ config ARCH_DOVE config ARCH_KIRKWOOD bool "Marvell Kirkwood" @@ -62,7 +60,7 @@ index 4332e8d..1a61d4a 100644 select ARCH_REQUIRE_GPIOLIB select CPU_FEROCEON select GENERIC_CLOCKEVENTS -@@ -641,7 +632,6 @@ config ARCH_LPC32XX +@@ -642,7 +633,6 @@ config ARCH_LPC32XX config ARCH_PXA bool "PXA2xx/PXA3xx-based" depends on MMU @@ -70,7 +68,7 @@ index 4332e8d..1a61d4a 100644 select ARCH_MTD_XIP select ARCH_REQUIRE_GPIOLIB select ARM_CPU_SUSPEND if PM -@@ -710,7 +700,6 @@ config ARCH_RPC +@@ -711,7 +701,6 @@ config ARCH_RPC config ARCH_SA1100 bool "SA1100-based" @@ -78,7 +76,7 @@ index 4332e8d..1a61d4a 100644 select ARCH_MTD_XIP select ARCH_REQUIRE_GPIOLIB select ARCH_SPARSEMEM_ENABLE -@@ -728,7 +717,6 @@ config ARCH_SA1100 +@@ -729,7 +718,6 @@ config ARCH_SA1100 config ARCH_S3C24XX bool "Samsung S3C24XX SoCs" @@ -86,7 +84,7 @@ index 4332e8d..1a61d4a 100644 select ARCH_REQUIRE_GPIOLIB select CLKDEV_LOOKUP select CLKSRC_SAMSUNG_PWM -@@ -748,7 +736,6 @@ config ARCH_S3C24XX +@@ -749,7 +737,6 @@ config ARCH_S3C24XX config ARCH_S3C64XX bool "Samsung S3C64XX" @@ -94,7 +92,7 @@ index 4332e8d..1a61d4a 100644 select ARCH_REQUIRE_GPIOLIB select ARM_AMBA select ARM_VIC -@@ -809,7 +796,6 @@ config ARCH_S5PC100 +@@ -810,7 +797,6 @@ config ARCH_S5PC100 config ARCH_S5PV210 bool "Samsung S5PV210/S5PC110" @@ -102,7 +100,7 @@ index 4332e8d..1a61d4a 100644 select ARCH_HAS_HOLES_MEMORYMODEL select ARCH_SPARSEMEM_ENABLE select CLKDEV_LOOKUP -@@ -863,7 +849,6 @@ config ARCH_DAVINCI +@@ -864,7 +850,6 @@ config ARCH_DAVINCI config ARCH_OMAP1 bool "TI OMAP1" depends on MMU @@ -110,7 +108,7 @@ index 4332e8d..1a61d4a 100644 select ARCH_HAS_HOLES_MEMORYMODEL select ARCH_OMAP select ARCH_REQUIRE_GPIOLIB -@@ -2170,9 +2155,7 @@ endmenu +@@ -2171,9 +2156,7 @@ endmenu menu "CPU Power Management" @@ -120,8 +118,6 @@ index 4332e8d..1a61d4a 100644 source "drivers/cpuidle/Kconfig" -diff --git a/arch/arm/mach-davinci/Kconfig b/arch/arm/mach-davinci/Kconfig -index a075b3e..34cfecc 100644 --- a/arch/arm/mach-davinci/Kconfig +++ b/arch/arm/mach-davinci/Kconfig @@ -39,7 +39,6 @@ config ARCH_DAVINCI_DA830 @@ -132,8 +128,6 @@ index a075b3e..34cfecc 100644 select CP_INTC config ARCH_DAVINCI_DA8XX -diff --git a/arch/arm/mach-highbank/Kconfig b/arch/arm/mach-highbank/Kconfig -index 0aded64..9f74755 100644 --- a/arch/arm/mach-highbank/Kconfig +++ b/arch/arm/mach-highbank/Kconfig @@ -1,7 +1,6 @@ @@ -144,8 +138,6 @@ index 0aded64..9f74755 100644 select ARCH_HAS_HOLES_MEMORYMODEL select ARCH_HAS_OPP select ARCH_SUPPORTS_BIG_ENDIAN -diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig -index 33567aa..e7ae0ee 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig @@ -103,7 +103,6 @@ config SOC_IMX25 @@ -164,8 +156,6 @@ index 33567aa..e7ae0ee 100644 select ARCH_HAS_OPP select ARCH_MXC_IOMUX_V3 select CPU_V7 -diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig -index 0af7ca0..0674cb7 100644 --- a/arch/arm/mach-omap2/Kconfig +++ b/arch/arm/mach-omap2/Kconfig @@ -93,7 +93,6 @@ config SOC_DRA7XX @@ -176,8 +166,6 @@ index 0af7ca0..0674cb7 100644 select ARCH_HAS_HOLES_MEMORYMODEL select ARCH_OMAP select ARCH_REQUIRE_GPIOLIB -diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig -index 05fa505..61d4d31 100644 --- a/arch/arm/mach-shmobile/Kconfig +++ b/arch/arm/mach-shmobile/Kconfig @@ -85,7 +85,6 @@ config ARCH_R8A73A4 @@ -196,8 +184,6 @@ index 05fa505..61d4d31 100644 select ARCH_HAS_OPP select ARCH_REQUIRE_GPIOLIB select REGULATOR_FIXED_VOLTAGE if REGULATOR -diff --git a/arch/arm/mach-spear/Kconfig b/arch/arm/mach-spear/Kconfig -index ac1710e6..811ba13 100644 --- a/arch/arm/mach-spear/Kconfig +++ b/arch/arm/mach-spear/Kconfig @@ -16,7 +16,6 @@ if PLAT_SPEAR @@ -208,8 +194,6 @@ index ac1710e6..811ba13 100644 select ARM_GIC select CPU_V7 select GPIO_SPEAR_SPICS -diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig -index b1232d8..52bfc9e 100644 --- a/arch/arm/mach-tegra/Kconfig +++ b/arch/arm/mach-tegra/Kconfig @@ -1,6 +1,5 @@ @@ -219,8 +203,6 @@ index b1232d8..52bfc9e 100644 select ARCH_REQUIRE_GPIOLIB select ARCH_SUPPORTS_TRUSTED_FOUNDATIONS select ARM_GIC -diff --git a/arch/arm/mach-ux500/Kconfig b/arch/arm/mach-ux500/Kconfig -index 0034d2c..cb1176e 100644 --- a/arch/arm/mach-ux500/Kconfig +++ b/arch/arm/mach-ux500/Kconfig @@ -3,7 +3,6 @@ config ARCH_U8500 @@ -231,8 +213,6 @@ index 0034d2c..cb1176e 100644 select ARCH_REQUIRE_GPIOLIB select ARM_AMBA select ARM_ERRATA_754322 -diff --git a/arch/arm/mach-vexpress/Kconfig b/arch/arm/mach-vexpress/Kconfig -index 4a70be4..ca5b7e5 100644 --- a/arch/arm/mach-vexpress/Kconfig +++ b/arch/arm/mach-vexpress/Kconfig @@ -67,7 +67,6 @@ config ARCH_VEXPRESS_DCSCB @@ -243,8 +223,6 @@ index 4a70be4..ca5b7e5 100644 select ARCH_HAS_OPP select PM_OPP help -diff --git a/arch/arm/mach-vt8500/Kconfig b/arch/arm/mach-vt8500/Kconfig -index 927be93..788d0b4 100644 --- a/arch/arm/mach-vt8500/Kconfig +++ b/arch/arm/mach-vt8500/Kconfig @@ -1,6 +1,5 @@ @@ -254,6 +232,3 @@ index 927be93..788d0b4 100644 select ARCH_REQUIRE_GPIOLIB select CLKDEV_LOOKUP select CLKSRC_OF --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0162-PM-OPP-Remove-ARCH_HAS_OPP.patch b/target/linux/ipq806x/patches/0162-PM-OPP-Remove-ARCH_HAS_OPP.patch index 979212fe8f..d07b9e0c60 100644 --- a/target/linux/ipq806x/patches/0162-PM-OPP-Remove-ARCH_HAS_OPP.patch +++ b/target/linux/ipq806x/patches/0162-PM-OPP-Remove-ARCH_HAS_OPP.patch @@ -21,11 +21,9 @@ Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> kernel/power/Kconfig | 3 --- 8 files changed, 13 deletions(-) -diff --git a/Documentation/power/opp.txt b/Documentation/power/opp.txt -index b8a907d..7b6a021 100644 --- a/Documentation/power/opp.txt +++ b/Documentation/power/opp.txt -@@ -52,9 +52,6 @@ Typical usage of the OPP library is as follows: +@@ -52,9 +52,6 @@ Typical usage of the OPP library is as f SoC framework -> modifies on required cases certain OPPs -> OPP layer -> queries to search/retrieve information -> @@ -35,8 +33,6 @@ index b8a907d..7b6a021 100644 OPP layer expects each domain to be represented by a unique device pointer. SoC framework registers a set of initial OPPs per device with the OPP layer. This list is expected to be an optimally small number typically around 5 per device. -diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig -index 4c414af..67e69a8 100644 --- a/arch/arm/mach-exynos/Kconfig +++ b/arch/arm/mach-exynos/Kconfig @@ -107,7 +107,6 @@ config SOC_EXYNOS5440 @@ -47,8 +43,6 @@ index 4c414af..67e69a8 100644 select HAVE_ARM_ARCH_TIMER select AUTO_ZRELADDR select MIGHT_HAVE_PCI -diff --git a/arch/arm/mach-highbank/Kconfig b/arch/arm/mach-highbank/Kconfig -index 9f74755..43bd782 100644 --- a/arch/arm/mach-highbank/Kconfig +++ b/arch/arm/mach-highbank/Kconfig @@ -2,7 +2,6 @@ config ARCH_HIGHBANK @@ -59,8 +53,6 @@ index 9f74755..43bd782 100644 select ARCH_SUPPORTS_BIG_ENDIAN select ARCH_WANT_OPTIONAL_GPIOLIB select ARM_AMBA -diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig -index 0674cb7..3e6596c 100644 --- a/arch/arm/mach-omap2/Kconfig +++ b/arch/arm/mach-omap2/Kconfig @@ -13,7 +13,6 @@ config ARCH_OMAP3 @@ -71,8 +63,6 @@ index 0674cb7..3e6596c 100644 select ARM_CPU_SUSPEND if PM select CPU_V7 select MULTI_IRQ_HANDLER -diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig -index 61d4d31..9fc2dd2 100644 --- a/arch/arm/mach-shmobile/Kconfig +++ b/arch/arm/mach-shmobile/Kconfig @@ -85,7 +85,6 @@ config ARCH_R8A73A4 @@ -91,8 +81,6 @@ index 61d4d31..9fc2dd2 100644 select ARCH_REQUIRE_GPIOLIB select REGULATOR_FIXED_VOLTAGE if REGULATOR select SND_SOC_AK4642 if SND_SIMPLE_CARD -diff --git a/arch/arm/mach-vexpress/Kconfig b/arch/arm/mach-vexpress/Kconfig -index ca5b7e5..4ed6e97 100644 --- a/arch/arm/mach-vexpress/Kconfig +++ b/arch/arm/mach-vexpress/Kconfig @@ -67,7 +67,6 @@ config ARCH_VEXPRESS_DCSCB @@ -103,8 +91,6 @@ index ca5b7e5..4ed6e97 100644 select PM_OPP help The TC2 (A15x2 A7x3) versatile express core tile integrates a logic -diff --git a/drivers/devfreq/Kconfig b/drivers/devfreq/Kconfig -index 7d2f435..d416754 100644 --- a/drivers/devfreq/Kconfig +++ b/drivers/devfreq/Kconfig @@ -68,7 +68,6 @@ comment "DEVFREQ Drivers" @@ -115,8 +101,6 @@ index 7d2f435..d416754 100644 select DEVFREQ_GOV_SIMPLE_ONDEMAND help This adds the DEVFREQ driver for Exynos4210 memory bus (vdd_int) -diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig -index 2fac9cc..caa040c 100644 --- a/kernel/power/Kconfig +++ b/kernel/power/Kconfig @@ -253,9 +253,6 @@ config APM_EMULATION @@ -129,6 +113,3 @@ index 2fac9cc..caa040c 100644 config PM_OPP bool "Operating Performance Point (OPP) Layer library" depends on ARCH_HAS_OPP --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0163-clk-return-probe-defer-when-DT-clock-not-yet-ready.patch b/target/linux/ipq806x/patches/0163-clk-return-probe-defer-when-DT-clock-not-yet-ready.patch index 7ea69f331b..cde3d2a8dd 100644 --- a/target/linux/ipq806x/patches/0163-clk-return-probe-defer-when-DT-clock-not-yet-ready.patch +++ b/target/linux/ipq806x/patches/0163-clk-return-probe-defer-when-DT-clock-not-yet-ready.patch @@ -18,8 +18,6 @@ Signed-off-by: Mike Turquette <mturquette@linaro.org> drivers/clk/clkdev.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) -diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c -index 0582068..a3facad 100644 --- a/drivers/clk/clk.c +++ b/drivers/clk/clk.c @@ -2502,7 +2502,7 @@ EXPORT_SYMBOL_GPL(of_clk_del_provider); @@ -31,11 +29,9 @@ index 0582068..a3facad 100644 /* Check if we have such a provider in our array */ list_for_each_entry(provider, &of_clk_providers, link) { -diff --git a/drivers/clk/clkdev.c b/drivers/clk/clkdev.c -index 48f6721..a360b2e 100644 --- a/drivers/clk/clkdev.c +++ b/drivers/clk/clkdev.c -@@ -167,6 +167,8 @@ struct clk *clk_get(struct device *dev, const char *con_id) +@@ -167,6 +167,8 @@ struct clk *clk_get(struct device *dev, clk = of_clk_get_by_name(dev->of_node, con_id); if (!IS_ERR(clk)) return clk; @@ -44,6 +40,3 @@ index 48f6721..a360b2e 100644 } return clk_get_sys(dev_id, con_id); --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0164-ARM-Add-Krait-L2-register-accessor-functions.patch b/target/linux/ipq806x/patches/0164-ARM-Add-Krait-L2-register-accessor-functions.patch index 652590e984..1eb450e10d 100644 --- a/target/linux/ipq806x/patches/0164-ARM-Add-Krait-L2-register-accessor-functions.patch +++ b/target/linux/ipq806x/patches/0164-ARM-Add-Krait-L2-register-accessor-functions.patch @@ -25,8 +25,6 @@ Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> create mode 100644 arch/arm/common/krait-l2-accessors.c create mode 100644 arch/arm/include/asm/krait-l2-accessors.h -diff --git a/arch/arm/common/Kconfig b/arch/arm/common/Kconfig -index c3a4e9c..9da52dc 100644 --- a/arch/arm/common/Kconfig +++ b/arch/arm/common/Kconfig @@ -9,6 +9,9 @@ config DMABOUNCE @@ -39,8 +37,6 @@ index c3a4e9c..9da52dc 100644 config SHARP_LOCOMO bool -diff --git a/arch/arm/common/Makefile b/arch/arm/common/Makefile -index 4bdc4162..2836f99 100644 --- a/arch/arm/common/Makefile +++ b/arch/arm/common/Makefile @@ -7,6 +7,7 @@ obj-y += firmware.o @@ -51,9 +47,6 @@ index 4bdc4162..2836f99 100644 obj-$(CONFIG_SHARP_LOCOMO) += locomo.o obj-$(CONFIG_SHARP_PARAM) += sharpsl_param.o obj-$(CONFIG_SHARP_SCOOP) += scoop.o -diff --git a/arch/arm/common/krait-l2-accessors.c b/arch/arm/common/krait-l2-accessors.c -new file mode 100644 -index 0000000..5d514bb --- /dev/null +++ b/arch/arm/common/krait-l2-accessors.c @@ -0,0 +1,58 @@ @@ -115,9 +108,6 @@ index 0000000..5d514bb + return val; +} +EXPORT_SYMBOL(krait_get_l2_indirect_reg); -diff --git a/arch/arm/include/asm/krait-l2-accessors.h b/arch/arm/include/asm/krait-l2-accessors.h -new file mode 100644 -index 0000000..48fe552 --- /dev/null +++ b/arch/arm/include/asm/krait-l2-accessors.h @@ -0,0 +1,20 @@ @@ -141,6 +131,3 @@ index 0000000..48fe552 +extern u32 krait_get_l2_indirect_reg(u32 addr); + +#endif --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0165-clk-qcom-Add-support-for-muxes-dividers-and-mux-divi.patch b/target/linux/ipq806x/patches/0165-clk-qcom-Add-support-for-muxes-dividers-and-mux-divi.patch index 0964106770..fa7b4e9dde 100644 --- a/target/linux/ipq806x/patches/0165-clk-qcom-Add-support-for-muxes-dividers-and-mux-divi.patch +++ b/target/linux/ipq806x/patches/0165-clk-qcom-Add-support-for-muxes-dividers-and-mux-divi.patch @@ -21,8 +21,6 @@ Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> create mode 100644 drivers/clk/qcom/clk-generic.c create mode 100644 include/linux/clk/msm-clk-generic.h -diff --git a/drivers/clk/qcom/Makefile b/drivers/clk/qcom/Makefile -index df2a1b3..2cc6039 100644 --- a/drivers/clk/qcom/Makefile +++ b/drivers/clk/qcom/Makefile @@ -6,6 +6,7 @@ clk-qcom-y += clk-pll.o @@ -33,9 +31,6 @@ index df2a1b3..2cc6039 100644 clk-qcom-y += reset.o obj-$(CONFIG_IPQ_GCC_806X) += gcc-ipq806x.o -diff --git a/drivers/clk/qcom/clk-generic.c b/drivers/clk/qcom/clk-generic.c -new file mode 100644 -index 0000000..a0d778b --- /dev/null +++ b/drivers/clk/qcom/clk-generic.c @@ -0,0 +1,405 @@ @@ -444,9 +439,6 @@ index 0000000..a0d778b + .recalc_rate = mux_div_clk_recalc_rate, +}; +EXPORT_SYMBOL_GPL(clk_ops_mux_div_clk); -diff --git a/include/linux/clk/msm-clk-generic.h b/include/linux/clk/msm-clk-generic.h -new file mode 100644 -index 0000000..cee3863 --- /dev/null +++ b/include/linux/clk/msm-clk-generic.h @@ -0,0 +1,208 @@ @@ -658,6 +650,3 @@ index 0000000..cee3863 +extern const struct clk_ops clk_ops_mux_div_clk; + +#endif --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0166-clk-qcom-Add-support-for-High-Frequency-PLLs-HFPLLs.patch b/target/linux/ipq806x/patches/0166-clk-qcom-Add-support-for-High-Frequency-PLLs-HFPLLs.patch index 3ff1a95def..037c6c4770 100644 --- a/target/linux/ipq806x/patches/0166-clk-qcom-Add-support-for-High-Frequency-PLLs-HFPLLs.patch +++ b/target/linux/ipq806x/patches/0166-clk-qcom-Add-support-for-High-Frequency-PLLs-HFPLLs.patch @@ -16,8 +16,6 @@ Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> create mode 100644 drivers/clk/qcom/clk-hfpll.c create mode 100644 drivers/clk/qcom/clk-hfpll.h -diff --git a/drivers/clk/qcom/Makefile b/drivers/clk/qcom/Makefile -index 2cc6039..93fd03f 100644 --- a/drivers/clk/qcom/Makefile +++ b/drivers/clk/qcom/Makefile @@ -7,6 +7,7 @@ clk-qcom-y += clk-rcg.o @@ -28,9 +26,6 @@ index 2cc6039..93fd03f 100644 clk-qcom-y += reset.o obj-$(CONFIG_IPQ_GCC_806X) += gcc-ipq806x.o -diff --git a/drivers/clk/qcom/clk-hfpll.c b/drivers/clk/qcom/clk-hfpll.c -new file mode 100644 -index 0000000..f8a40a7 --- /dev/null +++ b/drivers/clk/qcom/clk-hfpll.c @@ -0,0 +1,260 @@ @@ -294,9 +289,6 @@ index 0000000..f8a40a7 + .init = clk_hfpll_init, +}; +EXPORT_SYMBOL_GPL(clk_ops_hfpll); -diff --git a/drivers/clk/qcom/clk-hfpll.h b/drivers/clk/qcom/clk-hfpll.h -new file mode 100644 -index 0000000..48c18d6 --- /dev/null +++ b/drivers/clk/qcom/clk-hfpll.h @@ -0,0 +1,54 @@ @@ -354,6 +346,3 @@ index 0000000..48c18d6 +extern const struct clk_ops clk_ops_hfpll; + +#endif --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0167-clk-qcom-Add-HFPLL-driver.patch b/target/linux/ipq806x/patches/0167-clk-qcom-Add-HFPLL-driver.patch index c2c1680ea2..1aedbda799 100644 --- a/target/linux/ipq806x/patches/0167-clk-qcom-Add-HFPLL-driver.patch +++ b/target/linux/ipq806x/patches/0167-clk-qcom-Add-HFPLL-driver.patch @@ -16,8 +16,6 @@ Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> 3 files changed, 119 insertions(+) create mode 100644 drivers/clk/qcom/hfpll.c -diff --git a/drivers/clk/qcom/Kconfig b/drivers/clk/qcom/Kconfig -index cfaa54c..de8ba31 100644 --- a/drivers/clk/qcom/Kconfig +++ b/drivers/clk/qcom/Kconfig @@ -53,3 +53,11 @@ config MSM_MMCC_8974 @@ -32,18 +30,13 @@ index cfaa54c..de8ba31 100644 + Support for the high-frequency PLLs present on Qualcomm devices. + Say Y if you want to support CPU frequency scaling on devices + such as MSM8974, APQ8084, etc. -diff --git a/drivers/clk/qcom/Makefile b/drivers/clk/qcom/Makefile -index 93fd03f..d0d8e3d 100644 --- a/drivers/clk/qcom/Makefile +++ b/drivers/clk/qcom/Makefile -@@ -16,3 +16,4 @@ obj-$(CONFIG_MSM_GCC_8960) += gcc-msm8960.o +@@ -16,3 +16,4 @@ obj-$(CONFIG_MSM_GCC_8960) += gcc-msm896 obj-$(CONFIG_MSM_GCC_8974) += gcc-msm8974.o obj-$(CONFIG_MSM_MMCC_8960) += mmcc-msm8960.o obj-$(CONFIG_MSM_MMCC_8974) += mmcc-msm8974.o +obj-$(CONFIG_QCOM_HFPLL) += hfpll.o -diff --git a/drivers/clk/qcom/hfpll.c b/drivers/clk/qcom/hfpll.c -new file mode 100644 -index 0000000..701a377 --- /dev/null +++ b/drivers/clk/qcom/hfpll.c @@ -0,0 +1,110 @@ @@ -157,6 +150,3 @@ index 0000000..701a377 +MODULE_DESCRIPTION("QCOM HFPLL Clock Driver"); +MODULE_LICENSE("GPL v2"); +MODULE_ALIAS("platform:qcom-hfpll"); --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0168-clk-qcom-Add-MSM8960-s-HFPLLs.patch b/target/linux/ipq806x/patches/0168-clk-qcom-Add-MSM8960-s-HFPLLs.patch index 68fda612eb..04ff3711fe 100644 --- a/target/linux/ipq806x/patches/0168-clk-qcom-Add-MSM8960-s-HFPLLs.patch +++ b/target/linux/ipq806x/patches/0168-clk-qcom-Add-MSM8960-s-HFPLLs.patch @@ -10,8 +10,6 @@ Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> drivers/clk/qcom/gcc-msm8960.c | 82 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) -diff --git a/drivers/clk/qcom/gcc-msm8960.c b/drivers/clk/qcom/gcc-msm8960.c -index f4ffd91..d04fc99 100644 --- a/drivers/clk/qcom/gcc-msm8960.c +++ b/drivers/clk/qcom/gcc-msm8960.c @@ -30,6 +30,7 @@ @@ -107,7 +105,7 @@ index f4ffd91..d04fc99 100644 static struct clk_pll pll14 = { .l_reg = 0x31c4, .m_reg = 0x31c8, -@@ -2763,6 +2842,9 @@ static struct clk_regmap *gcc_msm8960_clks[] = { +@@ -2763,6 +2842,9 @@ static struct clk_regmap *gcc_msm8960_cl [PMIC_ARB1_H_CLK] = &pmic_arb1_h_clk.clkr, [PMIC_SSBI2_CLK] = &pmic_ssbi2_clk.clkr, [RPM_MSG_RAM_H_CLK] = &rpm_msg_ram_h_clk.clkr, @@ -117,6 +115,3 @@ index f4ffd91..d04fc99 100644 }; static const struct qcom_reset_map gcc_msm8960_resets[] = { --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0169-clk-qcom-Add-support-for-Krait-clocks.patch b/target/linux/ipq806x/patches/0169-clk-qcom-Add-support-for-Krait-clocks.patch index 9b76f59508..6e17acdc4e 100644 --- a/target/linux/ipq806x/patches/0169-clk-qcom-Add-support-for-Krait-clocks.patch +++ b/target/linux/ipq806x/patches/0169-clk-qcom-Add-support-for-Krait-clocks.patch @@ -19,8 +19,6 @@ Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> create mode 100644 drivers/clk/qcom/clk-krait.c create mode 100644 drivers/clk/qcom/clk-krait.h -diff --git a/drivers/clk/qcom/Kconfig b/drivers/clk/qcom/Kconfig -index de8ba31..70b6a7c 100644 --- a/drivers/clk/qcom/Kconfig +++ b/drivers/clk/qcom/Kconfig @@ -61,3 +61,7 @@ config QCOM_HFPLL @@ -31,8 +29,6 @@ index de8ba31..70b6a7c 100644 +config KRAIT_CLOCKS + bool + select KRAIT_L2_ACCESSORS -diff --git a/drivers/clk/qcom/Makefile b/drivers/clk/qcom/Makefile -index d0d8e3d..6482165 100644 --- a/drivers/clk/qcom/Makefile +++ b/drivers/clk/qcom/Makefile @@ -7,6 +7,7 @@ clk-qcom-y += clk-rcg.o @@ -43,9 +39,6 @@ index d0d8e3d..6482165 100644 clk-qcom-y += clk-hfpll.o clk-qcom-y += reset.o -diff --git a/drivers/clk/qcom/clk-krait.c b/drivers/clk/qcom/clk-krait.c -new file mode 100644 -index 0000000..4283426 --- /dev/null +++ b/drivers/clk/qcom/clk-krait.c @@ -0,0 +1,121 @@ @@ -170,9 +163,6 @@ index 0000000..4283426 + .get_div = kpss_div2_get_div, +}; +EXPORT_SYMBOL_GPL(clk_div_ops_kpss_div2); -diff --git a/drivers/clk/qcom/clk-krait.h b/drivers/clk/qcom/clk-krait.h -new file mode 100644 -index 0000000..9c3eb38 --- /dev/null +++ b/drivers/clk/qcom/clk-krait.h @@ -0,0 +1,22 @@ @@ -198,6 +188,3 @@ index 0000000..9c3eb38 +extern const struct clk_div_ops clk_div_ops_kpss_div2; + +#endif --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0170-clk-qcom-Add-KPSS-ACC-GCC-driver.patch b/target/linux/ipq806x/patches/0170-clk-qcom-Add-KPSS-ACC-GCC-driver.patch index 8817bbbf49..b16108ed43 100644 --- a/target/linux/ipq806x/patches/0170-clk-qcom-Add-KPSS-ACC-GCC-driver.patch +++ b/target/linux/ipq806x/patches/0170-clk-qcom-Add-KPSS-ACC-GCC-driver.patch @@ -16,8 +16,6 @@ Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> 3 files changed, 124 insertions(+) create mode 100644 drivers/clk/qcom/kpss-xcc.c -diff --git a/drivers/clk/qcom/Kconfig b/drivers/clk/qcom/Kconfig -index 70b6a7c..e9e5360 100644 --- a/drivers/clk/qcom/Kconfig +++ b/drivers/clk/qcom/Kconfig @@ -62,6 +62,14 @@ config QCOM_HFPLL @@ -35,19 +33,14 @@ index 70b6a7c..e9e5360 100644 config KRAIT_CLOCKS bool select KRAIT_L2_ACCESSORS -diff --git a/drivers/clk/qcom/Makefile b/drivers/clk/qcom/Makefile -index 6482165..29b2a45 100644 --- a/drivers/clk/qcom/Makefile +++ b/drivers/clk/qcom/Makefile -@@ -17,4 +17,5 @@ obj-$(CONFIG_MSM_GCC_8960) += gcc-msm8960.o +@@ -17,4 +17,5 @@ obj-$(CONFIG_MSM_GCC_8960) += gcc-msm896 obj-$(CONFIG_MSM_GCC_8974) += gcc-msm8974.o obj-$(CONFIG_MSM_MMCC_8960) += mmcc-msm8960.o obj-$(CONFIG_MSM_MMCC_8974) += mmcc-msm8974.o +obj-$(CONFIG_KPSS_XCC) += kpss-xcc.o obj-$(CONFIG_QCOM_HFPLL) += hfpll.o -diff --git a/drivers/clk/qcom/kpss-xcc.c b/drivers/clk/qcom/kpss-xcc.c -new file mode 100644 -index 0000000..1061668 --- /dev/null +++ b/drivers/clk/qcom/kpss-xcc.c @@ -0,0 +1,115 @@ @@ -166,6 +159,3 @@ index 0000000..1061668 +module_platform_driver(kpss_xcc_driver); + +MODULE_LICENSE("GPL v2"); --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0171-clk-qcom-Add-Krait-clock-controller-driver.patch b/target/linux/ipq806x/patches/0171-clk-qcom-Add-Krait-clock-controller-driver.patch index 8fa83dfdc2..6d0619a8e1 100644 --- a/target/linux/ipq806x/patches/0171-clk-qcom-Add-Krait-clock-controller-driver.patch +++ b/target/linux/ipq806x/patches/0171-clk-qcom-Add-Krait-clock-controller-driver.patch @@ -17,8 +17,6 @@ Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> 3 files changed, 373 insertions(+) create mode 100644 drivers/clk/qcom/krait-cc.c -diff --git a/drivers/clk/qcom/Kconfig b/drivers/clk/qcom/Kconfig -index e9e5360..7418108 100644 --- a/drivers/clk/qcom/Kconfig +++ b/drivers/clk/qcom/Kconfig @@ -70,6 +70,14 @@ config KPSS_XCC @@ -36,18 +34,13 @@ index e9e5360..7418108 100644 config KRAIT_CLOCKS bool select KRAIT_L2_ACCESSORS -diff --git a/drivers/clk/qcom/Makefile b/drivers/clk/qcom/Makefile -index 29b2a45..1b88abe 100644 --- a/drivers/clk/qcom/Makefile +++ b/drivers/clk/qcom/Makefile -@@ -19,3 +19,4 @@ obj-$(CONFIG_MSM_MMCC_8960) += mmcc-msm8960.o +@@ -19,3 +19,4 @@ obj-$(CONFIG_MSM_MMCC_8960) += mmcc-msm8 obj-$(CONFIG_MSM_MMCC_8974) += mmcc-msm8974.o obj-$(CONFIG_KPSS_XCC) += kpss-xcc.o obj-$(CONFIG_QCOM_HFPLL) += hfpll.o +obj-$(CONFIG_KRAITCC) += krait-cc.o -diff --git a/drivers/clk/qcom/krait-cc.c b/drivers/clk/qcom/krait-cc.c -new file mode 100644 -index 0000000..90985ea --- /dev/null +++ b/drivers/clk/qcom/krait-cc.c @@ -0,0 +1,364 @@ @@ -415,6 +408,3 @@ index 0000000..90985ea + +MODULE_DESCRIPTION("Krait CPU Clock Driver"); +MODULE_LICENSE("GPL v2"); --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0172-cpufreq-Add-a-cpufreq-krait-based-on-cpufreq-cpu0.patch b/target/linux/ipq806x/patches/0172-cpufreq-Add-a-cpufreq-krait-based-on-cpufreq-cpu0.patch index 3150a4dfb8..ea07fc1d2f 100644 --- a/target/linux/ipq806x/patches/0172-cpufreq-Add-a-cpufreq-krait-based-on-cpufreq-cpu0.patch +++ b/target/linux/ipq806x/patches/0172-cpufreq-Add-a-cpufreq-krait-based-on-cpufreq-cpu0.patch @@ -18,8 +18,6 @@ Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> 3 files changed, 204 insertions(+) create mode 100644 drivers/cpufreq/cpufreq-krait.c -diff --git a/drivers/cpufreq/Kconfig b/drivers/cpufreq/Kconfig -index 4b029c0..4051528 100644 --- a/drivers/cpufreq/Kconfig +++ b/drivers/cpufreq/Kconfig @@ -194,6 +194,19 @@ config GENERIC_CPUFREQ_CPU0 @@ -42,11 +40,9 @@ index 4b029c0..4051528 100644 menu "x86 CPU frequency scaling drivers" depends on X86 source "drivers/cpufreq/Kconfig.x86" -diff --git a/drivers/cpufreq/Makefile b/drivers/cpufreq/Makefile -index 7494565..f6f4485 100644 --- a/drivers/cpufreq/Makefile +++ b/drivers/cpufreq/Makefile -@@ -12,6 +12,7 @@ obj-$(CONFIG_CPU_FREQ_GOV_CONSERVATIVE) += cpufreq_conservative.o +@@ -12,6 +12,7 @@ obj-$(CONFIG_CPU_FREQ_GOV_CONSERVATIVE) obj-$(CONFIG_CPU_FREQ_GOV_COMMON) += cpufreq_governor.o obj-$(CONFIG_GENERIC_CPUFREQ_CPU0) += cpufreq-cpu0.o @@ -54,9 +50,6 @@ index 7494565..f6f4485 100644 ################################################################################## # x86 drivers. -diff --git a/drivers/cpufreq/cpufreq-krait.c b/drivers/cpufreq/cpufreq-krait.c -new file mode 100644 -index 0000000..7b38b9c --- /dev/null +++ b/drivers/cpufreq/cpufreq-krait.c @@ -0,0 +1,190 @@ @@ -250,6 +243,3 @@ index 0000000..7b38b9c + +MODULE_DESCRIPTION("Krait CPUfreq driver"); +MODULE_LICENSE("GPL v2"); --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0173-cpufreq-Add-module-to-register-cpufreq-krait-device.patch b/target/linux/ipq806x/patches/0173-cpufreq-Add-module-to-register-cpufreq-krait-device.patch index c43221070c..373c402959 100644 --- a/target/linux/ipq806x/patches/0173-cpufreq-Add-module-to-register-cpufreq-krait-device.patch +++ b/target/linux/ipq806x/patches/0173-cpufreq-Add-module-to-register-cpufreq-krait-device.patch @@ -14,8 +14,6 @@ Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> 3 files changed, 57 insertions(+) create mode 100644 drivers/cpufreq/qcom-cpufreq.c -diff --git a/drivers/cpufreq/Kconfig.arm b/drivers/cpufreq/Kconfig.arm -index 3129749..6ae884d 100644 --- a/drivers/cpufreq/Kconfig.arm +++ b/drivers/cpufreq/Kconfig.arm @@ -123,6 +123,14 @@ config ARM_OMAP2PLUS_CPUFREQ @@ -33,11 +31,9 @@ index 3129749..6ae884d 100644 config ARM_S3C_CPUFREQ bool help -diff --git a/drivers/cpufreq/Makefile b/drivers/cpufreq/Makefile -index f6f4485..f5d18a3 100644 --- a/drivers/cpufreq/Makefile +++ b/drivers/cpufreq/Makefile -@@ -60,6 +60,7 @@ obj-$(CONFIG_ARM_IMX6Q_CPUFREQ) += imx6q-cpufreq.o +@@ -60,6 +60,7 @@ obj-$(CONFIG_ARM_IMX6Q_CPUFREQ) += imx6 obj-$(CONFIG_ARM_INTEGRATOR) += integrator-cpufreq.o obj-$(CONFIG_ARM_KIRKWOOD_CPUFREQ) += kirkwood-cpufreq.o obj-$(CONFIG_ARM_OMAP2PLUS_CPUFREQ) += omap-cpufreq.o @@ -45,9 +41,6 @@ index f6f4485..f5d18a3 100644 obj-$(CONFIG_PXA25x) += pxa2xx-cpufreq.o obj-$(CONFIG_PXA27x) += pxa2xx-cpufreq.o obj-$(CONFIG_PXA3xx) += pxa3xx-cpufreq.o -diff --git a/drivers/cpufreq/qcom-cpufreq.c b/drivers/cpufreq/qcom-cpufreq.c -new file mode 100644 -index 0000000..71f4387 --- /dev/null +++ b/drivers/cpufreq/qcom-cpufreq.c @@ -0,0 +1,48 @@ @@ -99,6 +92,3 @@ index 0000000..71f4387 + +MODULE_DESCRIPTION("Qualcomm CPUfreq driver"); +MODULE_LICENSE("GPL v2"); --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0174-clk-qcom-Add-HFPLLs-to-IPQ806X-driver.patch b/target/linux/ipq806x/patches/0174-clk-qcom-Add-HFPLLs-to-IPQ806X-driver.patch index 38dbd6526e..682a519d3e 100644 --- a/target/linux/ipq806x/patches/0174-clk-qcom-Add-HFPLLs-to-IPQ806X-driver.patch +++ b/target/linux/ipq806x/patches/0174-clk-qcom-Add-HFPLLs-to-IPQ806X-driver.patch @@ -8,8 +8,6 @@ Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> drivers/clk/qcom/gcc-ipq806x.c | 83 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) -diff --git a/drivers/clk/qcom/gcc-ipq806x.c b/drivers/clk/qcom/gcc-ipq806x.c -index d80dc69..83a73cb 100644 --- a/drivers/clk/qcom/gcc-ipq806x.c +++ b/drivers/clk/qcom/gcc-ipq806x.c @@ -30,6 +30,7 @@ @@ -106,7 +104,7 @@ index d80dc69..83a73cb 100644 static struct clk_pll pll14 = { .l_reg = 0x31c4, .m_reg = 0x31c8, -@@ -2878,6 +2958,9 @@ static struct clk_regmap *gcc_ipq806x_clks[] = { +@@ -2878,6 +2958,9 @@ static struct clk_regmap *gcc_ipq806x_cl [NSSTCM_CLK_SRC] = &nss_tcm_src.clkr, [NSSTCM_CLK] = &nss_tcm_clk.clkr, [NSS_CORE_CLK] = &nss_core_clk, @@ -116,6 +114,3 @@ index d80dc69..83a73cb 100644 }; static const struct qcom_reset_map gcc_ipq806x_resets[] = { --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0175-ARM-dts-ipq8064-Add-necessary-DT-data-for-Krait-cpuf.patch b/target/linux/ipq806x/patches/0175-ARM-dts-ipq8064-Add-necessary-DT-data-for-Krait-cpuf.patch index 6fea560286..3fddd61424 100644 --- a/target/linux/ipq806x/patches/0175-ARM-dts-ipq8064-Add-necessary-DT-data-for-Krait-cpuf.patch +++ b/target/linux/ipq806x/patches/0175-ARM-dts-ipq8064-Add-necessary-DT-data-for-Krait-cpuf.patch @@ -9,8 +9,6 @@ Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> arch/arm/boot/dts/qcom-ipq8064.dtsi | 45 +++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) -diff --git a/arch/arm/boot/dts/qcom-ipq8064.dtsi b/arch/arm/boot/dts/qcom-ipq8064.dtsi -index 6be6ac9..97e4c3d 100644 --- a/arch/arm/boot/dts/qcom-ipq8064.dtsi +++ b/arch/arm/boot/dts/qcom-ipq8064.dtsi @@ -23,6 +23,22 @@ @@ -91,6 +89,3 @@ index 6be6ac9..97e4c3d 100644 }; saw0: regulator@2089000 { --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0176-ARM-qcom_defconfig-Enable-CPUfreq-options.patch b/target/linux/ipq806x/patches/0176-ARM-qcom_defconfig-Enable-CPUfreq-options.patch index e5656020b7..188580a33e 100644 --- a/target/linux/ipq806x/patches/0176-ARM-qcom_defconfig-Enable-CPUfreq-options.patch +++ b/target/linux/ipq806x/patches/0176-ARM-qcom_defconfig-Enable-CPUfreq-options.patch @@ -11,8 +11,6 @@ Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> arch/arm/configs/qcom_defconfig | 10 ++++++++++ 1 file changed, 10 insertions(+) -diff --git a/arch/arm/configs/qcom_defconfig b/arch/arm/configs/qcom_defconfig -index 3d55d79..3bc72eb 100644 --- a/arch/arm/configs/qcom_defconfig +++ b/arch/arm/configs/qcom_defconfig @@ -31,6 +31,13 @@ CONFIG_HIGHPTE=y @@ -39,6 +37,3 @@ index 3d55d79..3bc72eb 100644 CONFIG_MSM_IOMMU=y CONFIG_PHY_QCOM_IPQ806X_SATA=y CONFIG_EXT2_FS=y --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0177-dmaengine-Add-QCOM-ADM-DMA-driver.patch b/target/linux/ipq806x/patches/0177-dmaengine-Add-QCOM-ADM-DMA-driver.patch index d7d301dede..05c67060c0 100644 --- a/target/linux/ipq806x/patches/0177-dmaengine-Add-QCOM-ADM-DMA-driver.patch +++ b/target/linux/ipq806x/patches/0177-dmaengine-Add-QCOM-ADM-DMA-driver.patch @@ -21,8 +21,6 @@ Signed-off-by: Andy Gross <agross@codeaurora.org> 3 files changed, 882 insertions(+) create mode 100644 drivers/dma/qcom_adm.c -diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig -index f87cef9..79155fa 100644 --- a/drivers/dma/Kconfig +++ b/drivers/dma/Kconfig @@ -410,4 +410,14 @@ config QCOM_BAM_DMA @@ -40,8 +38,6 @@ index f87cef9..79155fa 100644 + peripheral devices. + endif -diff --git a/drivers/dma/Makefile b/drivers/dma/Makefile -index 5150c82..4a4f521 100644 --- a/drivers/dma/Makefile +++ b/drivers/dma/Makefile @@ -46,3 +46,4 @@ obj-$(CONFIG_K3_DMA) += k3dma.o @@ -49,9 +45,6 @@ index 5150c82..4a4f521 100644 obj-$(CONFIG_FSL_EDMA) += fsl-edma.o obj-$(CONFIG_QCOM_BAM_DMA) += qcom_bam_dma.o +obj-$(CONFIG_QCOM_ADM) += qcom_adm.o -diff --git a/drivers/dma/qcom_adm.c b/drivers/dma/qcom_adm.c -new file mode 100644 -index 0000000..035f606 --- /dev/null +++ b/drivers/dma/qcom_adm.c @@ -0,0 +1,871 @@ @@ -926,6 +919,3 @@ index 0000000..035f606 +MODULE_AUTHOR("Andy Gross <agross@codeaurora.org>"); +MODULE_DESCRIPTION("QCOM ADM DMA engine driver"); +MODULE_LICENSE("GPL v2"); --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0178-dmaengine-qcom_adm-Add-device-tree-binding.patch b/target/linux/ipq806x/patches/0178-dmaengine-qcom_adm-Add-device-tree-binding.patch index a80fcfa7f5..1c72a2f7b2 100644 --- a/target/linux/ipq806x/patches/0178-dmaengine-qcom_adm-Add-device-tree-binding.patch +++ b/target/linux/ipq806x/patches/0178-dmaengine-qcom_adm-Add-device-tree-binding.patch @@ -11,9 +11,6 @@ Signed-off-by: Andy Gross <agross@codeaurora.org> 1 file changed, 60 insertions(+) create mode 100644 Documentation/devicetree/bindings/dma/qcom_adm.txt -diff --git a/Documentation/devicetree/bindings/dma/qcom_adm.txt b/Documentation/devicetree/bindings/dma/qcom_adm.txt -new file mode 100644 -index 0000000..7f05cb5 --- /dev/null +++ b/Documentation/devicetree/bindings/dma/qcom_adm.txt @@ -0,0 +1,60 @@ @@ -77,6 +74,3 @@ index 0000000..7f05cb5 + <&adm_dma 5 10>; + dma-names = "rx", "tx"; + }; --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0179-spi-qup-Add-DMA-capabilities.patch b/target/linux/ipq806x/patches/0179-spi-qup-Add-DMA-capabilities.patch index c35aeb17b3..2f7d318aab 100644 --- a/target/linux/ipq806x/patches/0179-spi-qup-Add-DMA-capabilities.patch +++ b/target/linux/ipq806x/patches/0179-spi-qup-Add-DMA-capabilities.patch @@ -12,8 +12,6 @@ Signed-off-by: Andy Gross <agross@codeaurora.org> drivers/spi/spi-qup.c | 361 ++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 340 insertions(+), 21 deletions(-) -diff --git a/drivers/spi/spi-qup.c b/drivers/spi/spi-qup.c -index c137226..28754ae 100644 --- a/drivers/spi/spi-qup.c +++ b/drivers/spi/spi-qup.c @@ -22,6 +22,8 @@ @@ -49,7 +47,7 @@ index c137226..28754ae 100644 }; -@@ -266,6 +278,221 @@ static void spi_qup_fifo_write(struct spi_qup *controller, +@@ -266,6 +278,221 @@ static void spi_qup_fifo_write(struct sp } } @@ -271,7 +269,7 @@ index c137226..28754ae 100644 static irqreturn_t spi_qup_qup_irq(int irq, void *dev_id) { struct spi_qup *controller = dev_id; -@@ -315,11 +542,13 @@ static irqreturn_t spi_qup_qup_irq(int irq, void *dev_id) +@@ -315,11 +542,13 @@ static irqreturn_t spi_qup_qup_irq(int i error = -EIO; } @@ -289,7 +287,7 @@ index c137226..28754ae 100644 spin_lock_irqsave(&controller->lock, flags); controller->error = error; -@@ -339,6 +568,8 @@ static int spi_qup_io_config(struct spi_device *spi, struct spi_transfer *xfer) +@@ -339,6 +568,8 @@ static int spi_qup_io_config(struct spi_ struct spi_qup *controller = spi_master_get_devdata(spi->master); u32 config, iomode, mode; int ret, n_words, w_size; @@ -298,7 +296,7 @@ index c137226..28754ae 100644 if (spi->mode & SPI_LOOP && xfer->len > controller->in_fifo_sz) { dev_err(controller->dev, "too big size for loopback %d > %d\n", -@@ -367,6 +598,13 @@ static int spi_qup_io_config(struct spi_device *spi, struct spi_transfer *xfer) +@@ -367,6 +598,13 @@ static int spi_qup_io_config(struct spi_ n_words = xfer->len / w_size; controller->w_size = w_size; @@ -312,7 +310,7 @@ index c137226..28754ae 100644 if (n_words <= (controller->in_fifo_sz / sizeof(u32))) { mode = QUP_IO_M_MODE_FIFO; writel_relaxed(n_words, controller->base + QUP_MX_READ_CNT); -@@ -374,19 +612,30 @@ static int spi_qup_io_config(struct spi_device *spi, struct spi_transfer *xfer) +@@ -374,19 +612,30 @@ static int spi_qup_io_config(struct spi_ /* must be zero for FIFO */ writel_relaxed(0, controller->base + QUP_MX_INPUT_CNT); writel_relaxed(0, controller->base + QUP_MX_OUTPUT_CNT); @@ -345,7 +343,7 @@ index c137226..28754ae 100644 iomode |= (mode << QUP_IO_M_OUTPUT_MODE_MASK_SHIFT); iomode |= (mode << QUP_IO_M_INPUT_MODE_MASK_SHIFT); -@@ -419,11 +668,20 @@ static int spi_qup_io_config(struct spi_device *spi, struct spi_transfer *xfer) +@@ -419,11 +668,20 @@ static int spi_qup_io_config(struct spi_ config &= ~(QUP_CONFIG_NO_INPUT | QUP_CONFIG_NO_OUTPUT | QUP_CONFIG_N); config |= xfer->bits_per_word - 1; config |= QUP_CONFIG_SPI_MODE; @@ -366,7 +364,7 @@ index c137226..28754ae 100644 return 0; } -@@ -452,26 +710,32 @@ static int spi_qup_transfer_one(struct spi_master *master, +@@ -452,26 +710,32 @@ static int spi_qup_transfer_one(struct s controller->tx_bytes = 0; spin_unlock_irqrestore(&controller->lock, flags); @@ -414,7 +412,7 @@ index c137226..28754ae 100644 spi_qup_set_state(controller, QUP_STATE_RESET); spin_lock_irqsave(&controller->lock, flags); controller->xfer = NULL; -@@ -553,6 +817,7 @@ static int spi_qup_probe(struct platform_device *pdev) +@@ -553,6 +817,7 @@ static int spi_qup_probe(struct platform master->transfer_one = spi_qup_transfer_one; master->dev.of_node = pdev->dev.of_node; master->auto_runtime_pm = true; @@ -422,7 +420,7 @@ index c137226..28754ae 100644 platform_set_drvdata(pdev, master); -@@ -612,6 +877,55 @@ static int spi_qup_probe(struct platform_device *pdev) +@@ -612,6 +877,55 @@ static int spi_qup_probe(struct platform writel_relaxed(SPI_ERROR_CLK_UNDER_RUN | SPI_ERROR_CLK_OVER_RUN, base + SPI_ERROR_FLAGS_EN); @@ -478,7 +476,7 @@ index c137226..28754ae 100644 /* if earlier version of the QUP, disable INPUT_OVERRUN */ if (controller->qup_v1) writel_relaxed(QUP_ERROR_OUTPUT_OVER_RUN | -@@ -730,6 +1044,11 @@ static int spi_qup_remove(struct platform_device *pdev) +@@ -730,6 +1044,11 @@ static int spi_qup_remove(struct platfor if (ret) return ret; @@ -490,6 +488,3 @@ index c137226..28754ae 100644 clk_disable_unprepare(controller->cclk); clk_disable_unprepare(controller->iclk); --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0180-ARM-dts-Add-ADM-DMA-nodes-and-SPI-linkage.patch b/target/linux/ipq806x/patches/0180-ARM-dts-Add-ADM-DMA-nodes-and-SPI-linkage.patch index 5fed04123e..05279de594 100644 --- a/target/linux/ipq806x/patches/0180-ARM-dts-Add-ADM-DMA-nodes-and-SPI-linkage.patch +++ b/target/linux/ipq806x/patches/0180-ARM-dts-Add-ADM-DMA-nodes-and-SPI-linkage.patch @@ -12,8 +12,6 @@ Signed-off-by: Andy Gross <agross@codeaurora.org> arch/arm/boot/dts/qcom-ipq8064.dtsi | 8 +++++--- 2 files changed, 16 insertions(+), 3 deletions(-) -diff --git a/arch/arm/boot/dts/qcom-ipq8064-ap148.dts b/arch/arm/boot/dts/qcom-ipq8064-ap148.dts -index 2b2d63c..c54a3ee 100644 --- a/arch/arm/boot/dts/qcom-ipq8064-ap148.dts +++ b/arch/arm/boot/dts/qcom-ipq8064-ap148.dts @@ -44,6 +44,10 @@ @@ -56,8 +54,6 @@ index 2b2d63c..c54a3ee 100644 sata-phy@1b400000 { status = "ok"; }; -diff --git a/arch/arm/boot/dts/qcom-ipq8064.dtsi b/arch/arm/boot/dts/qcom-ipq8064.dtsi -index 97e4c3d..f74e923 100644 --- a/arch/arm/boot/dts/qcom-ipq8064.dtsi +++ b/arch/arm/boot/dts/qcom-ipq8064.dtsi @@ -421,19 +421,21 @@ @@ -85,6 +81,3 @@ index 97e4c3d..f74e923 100644 }; nand@0x1ac00000 { --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0181-mtd-nand-qcom-Align-clk-and-reset-names.patch b/target/linux/ipq806x/patches/0181-mtd-nand-qcom-Align-clk-and-reset-names.patch index 763a2455c5..e2e313ca65 100644 --- a/target/linux/ipq806x/patches/0181-mtd-nand-qcom-Align-clk-and-reset-names.patch +++ b/target/linux/ipq806x/patches/0181-mtd-nand-qcom-Align-clk-and-reset-names.patch @@ -11,11 +11,9 @@ Signed-off-by: Andy Gross <agross@codeaurora.org> drivers/mtd/nand/qcom_adm_dma.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -diff --git a/drivers/mtd/nand/qcom_adm_dma.c b/drivers/mtd/nand/qcom_adm_dma.c -index 46d8473..542f901 100644 --- a/drivers/mtd/nand/qcom_adm_dma.c +++ b/drivers/mtd/nand/qcom_adm_dma.c -@@ -568,14 +568,14 @@ static int msm_dmov_init_clocks(struct platform_device *pdev) +@@ -568,14 +568,14 @@ static int msm_dmov_init_clocks(struct p int adm = (pdev->id >= 0) ? pdev->id : 0; int ret; @@ -32,7 +30,7 @@ index 46d8473..542f901 100644 if (IS_ERR(dmov_conf[adm].pclk)) { dmov_conf[adm].pclk = NULL; /* pclk not present on all SoCs, don't bail on failure */ -@@ -690,7 +690,7 @@ static int msm_dmov_probe(struct platform_device *pdev) +@@ -690,7 +690,7 @@ static int msm_dmov_probe(struct platfor } /* get resets */ @@ -41,6 +39,3 @@ index 46d8473..542f901 100644 if (IS_ERR(dmov_conf[adm].adm_reset)) { dev_err(&pdev->dev, "failed to get adm reset\n"); ret = PTR_ERR(dmov_conf[adm].adm_reset); --- -1.7.10.4 - diff --git a/target/linux/ipq806x/patches/0182-qcom-Kconfig-Make-drivers-mutually-exclusive.patch b/target/linux/ipq806x/patches/0182-qcom-Kconfig-Make-drivers-mutually-exclusive.patch index 87e2fad612..f4b551bac6 100644 --- a/target/linux/ipq806x/patches/0182-qcom-Kconfig-Make-drivers-mutually-exclusive.patch +++ b/target/linux/ipq806x/patches/0182-qcom-Kconfig-Make-drivers-mutually-exclusive.patch @@ -13,8 +13,6 @@ Signed-off-by: Andy Gross <agross@codeaurora.org> drivers/mtd/nand/Kconfig | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) -diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig -index 79155fa..ed7a5f6 100644 --- a/drivers/dma/Kconfig +++ b/drivers/dma/Kconfig @@ -412,7 +412,7 @@ config QCOM_BAM_DMA @@ -26,8 +24,6 @@ index 79155fa..ed7a5f6 100644 select DMA_ENGINE select DMA_VIRTUAL_CHANNELS ---help--- -diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig -index 6e3842f..4a84264 100644 --- a/drivers/mtd/nand/Kconfig +++ b/drivers/mtd/nand/Kconfig @@ -511,15 +511,15 @@ config MTD_NAND_XWAY @@ -49,6 +45,3 @@ index 6e3842f..4a84264 100644 select CRC16 select BITREVERSE select MTD_NAND_IDS --- -1.7.10.4 - |