diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-07-03 22:56:54 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-07-03 22:56:54 -0400 |
| commit | 1783b96329a94e6985c40621a6b2dc58f1ae156c (patch) | |
| tree | 77eb8f13cc3e0755455709bb9d9def24ac8250d5 | |
| parent | 5c36a96b758250d11a62e8397854df17dfb0369f (diff) | |
| download | longterm-queue-4.12-1783b96329a94e6985c40621a6b2dc58f1ae156c.tar.gz | |
arm: drop dts patch for 4.14
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/Revert-ARM-dts-imx53-add-srtc-node.patch | 41 | ||||
| -rw-r--r-- | queue/series | 1 |
2 files changed, 0 insertions, 42 deletions
diff --git a/queue/Revert-ARM-dts-imx53-add-srtc-node.patch b/queue/Revert-ARM-dts-imx53-add-srtc-node.patch deleted file mode 100644 index 099c7e8..0000000 --- a/queue/Revert-ARM-dts-imx53-add-srtc-node.patch +++ /dev/null @@ -1,41 +0,0 @@ -From e501506d3ea00eefa64463ebd9e5c13ee70990bd Mon Sep 17 00:00:00 2001 -From: Fabio Estevam <fabio.estevam@nxp.com> -Date: Wed, 15 Nov 2017 10:03:53 -0200 -Subject: [PATCH] Revert "ARM: dts: imx53: add srtc node" - -commit e501506d3ea00eefa64463ebd9e5c13ee70990bd upstream. - -This reverts commit 5b725054147deaf966b3919e10a86c6bfe946a18. - -The rtc block on i.MX53 is a completely different hardware than the -one found on i.MX25. - -Cc: <stable@vger.kernel.org> #4.14 -Reported-by: Noel Vellemans <Noel.Vellemans@visionbms.com> -Suggested-by: Juergen Borleis <jbe@pengutronix.de> -Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com> -Signed-off-by: Shawn Guo <shawnguo@kernel.org> - -diff --git a/arch/arm/boot/dts/imx53.dtsi b/arch/arm/boot/dts/imx53.dtsi -index 589a67c5f796..84f17f7abb71 100644 ---- a/arch/arm/boot/dts/imx53.dtsi -+++ b/arch/arm/boot/dts/imx53.dtsi -@@ -433,15 +433,6 @@ - clock-names = "ipg", "per"; - }; - -- srtc: srtc@53fa4000 { -- compatible = "fsl,imx53-rtc", "fsl,imx25-rtc"; -- reg = <0x53fa4000 0x4000>; -- interrupts = <24>; -- interrupt-parent = <&tzic>; -- clocks = <&clks IMX5_CLK_SRTC_GATE>; -- clock-names = "ipg"; -- }; -- - iomuxc: iomuxc@53fa8000 { - compatible = "fsl,imx53-iomuxc"; - reg = <0x53fa8000 0x4000>; --- -2.15.0 - diff --git a/queue/series b/queue/series index c1147c9..0413f18 100644 --- a/queue/series +++ b/queue/series @@ -51,7 +51,6 @@ kdb-Fix-handling-of-kallsyms_symbol_next-return-valu.patch drm-bridge-analogix-dp-Fix-runtime-PM-state-in-get_m.patch drm-exynos-gem-Drop-NONCONTIG-flag-for-buffers-alloc.patch media-dvb-i2c-transfers-over-usb-cannot-be-done-from.patch -Revert-ARM-dts-imx53-add-srtc-node.patch bus-arm-cci-Fix-use-of-smp_processor_id-in-preemptib.patch bus-arm-ccn-Check-memory-allocation-failure.patch bus-arm-ccn-Fix-use-of-smp_processor_id-in-preemptib.patch |