drop arm-dts-imx6dl-colibri-eval-v3-fix-sram-compatible-properties.patch from everywhere

diff --git a/queue-4.14/arm-dts-imx6dl-colibri-eval-v3-fix-sram-compatible-properties.patch b/queue-4.14/arm-dts-imx6dl-colibri-eval-v3-fix-sram-compatible-properties.patch
deleted file mode 100644 (file)
index cdea65a..0000000
--- a/queue-4.14/arm-dts-imx6dl-colibri-eval-v3-fix-sram-compatible-properties.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From bcbf53a0dab50980867476994f6079c1ec5bb3a3 Mon Sep 17 00:00:00 2001
-From: Johan Hovold <johan@kernel.org>
-Date: Wed, 12 Feb 2020 11:46:29 +0100
-Subject: ARM: dts: imx6dl-colibri-eval-v3: fix sram compatible properties
-
-From: Johan Hovold <johan@kernel.org>
-
-commit bcbf53a0dab50980867476994f6079c1ec5bb3a3 upstream.
-
-The sram-node compatible properties have mistakingly combined the
-model-specific string with the generic "mtd-ram" string.
-
-Note that neither "cy7c1019dv33-10zsxi, mtd-ram" or
-"cy7c1019dv33-10zsxi" are used by any in-kernel driver and they are
-not present in any binding.
-
-The physmap driver will however bind to platform devices that specify
-"mtd-ram".
-
-Fixes: fc48e76489fd ("ARM: dts: imx6: Add support for Toradex Colibri iMX6 module")
-Cc: Sanchayan Maity <maitysanchayan@gmail.com>
-Cc: Marcel Ziswiler <marcel.ziswiler@toradex.com>
-Cc: Shawn Guo <shawnguo@kernel.org>
-Signed-off-by: Johan Hovold <johan@kernel.org>
-Reviewed-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
-Signed-off-by: Shawn Guo <shawnguo@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts
-+++ b/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts
-@@ -231,7 +231,7 @@
- 
-       /* SRAM on Colibri nEXT_CS0 */
-       sram@0,0 {
--              compatible = "cypress,cy7c1019dv33-10zsxi, mtd-ram";
-+              compatible = "cypress,cy7c1019dv33-10zsxi", "mtd-ram";
-               reg = <0 0 0x00010000>;
-               #address-cells = <1>;
-               #size-cells = <1>;
-@@ -242,7 +242,7 @@
- 
-       /* SRAM on Colibri nEXT_CS1 */
-       sram@1,0 {
--              compatible = "cypress,cy7c1019dv33-10zsxi, mtd-ram";
-+              compatible = "cypress,cy7c1019dv33-10zsxi", "mtd-ram";
-               reg = <1 0 0x00010000>;
-               #address-cells = <1>;
-               #size-cells = <1>;

diff --git a/queue-4.14/series b/queue-4.14/series
index f2f159216d79388b46c76ce43a4598c6c30be830..9441d7402261b4e1dff9be56eab905090a42d820 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -118,7 +118,6 @@ rdma-iwcm-fix-iwcm-work-deallocation.patch
 rmda-cm-fix-missing-ib_cm_destroy_id-in-ib_cm_insert_listen.patch
 ib-hfi1-qib-ensure-rcu-is-locked-when-accessing-list.patch
 arm-imx-build-v7_cpu_resume-unconditionally.patch
-arm-dts-imx6dl-colibri-eval-v3-fix-sram-compatible-properties.patch
 hwmon-adt7462-fix-an-error-return-in-adt7462_reg_volt.patch
 dmaengine-coh901318-fix-a-double-lock-bug-in-dma_tc_handle.patch
 powerpc-fix-hardware-pmu-exception-bug-on-powervm-compatibility-mode-systems.patch

diff --git a/queue-4.19/arm-dts-imx6dl-colibri-eval-v3-fix-sram-compatible-properties.patch b/queue-4.19/arm-dts-imx6dl-colibri-eval-v3-fix-sram-compatible-properties.patch
deleted file mode 100644 (file)
index 10a9b23..0000000
--- a/queue-4.19/arm-dts-imx6dl-colibri-eval-v3-fix-sram-compatible-properties.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From bcbf53a0dab50980867476994f6079c1ec5bb3a3 Mon Sep 17 00:00:00 2001
-From: Johan Hovold <johan@kernel.org>
-Date: Wed, 12 Feb 2020 11:46:29 +0100
-Subject: ARM: dts: imx6dl-colibri-eval-v3: fix sram compatible properties
-
-From: Johan Hovold <johan@kernel.org>
-
-commit bcbf53a0dab50980867476994f6079c1ec5bb3a3 upstream.
-
-The sram-node compatible properties have mistakingly combined the
-model-specific string with the generic "mtd-ram" string.
-
-Note that neither "cy7c1019dv33-10zsxi, mtd-ram" or
-"cy7c1019dv33-10zsxi" are used by any in-kernel driver and they are
-not present in any binding.
-
-The physmap driver will however bind to platform devices that specify
-"mtd-ram".
-
-Fixes: fc48e76489fd ("ARM: dts: imx6: Add support for Toradex Colibri iMX6 module")
-Cc: Sanchayan Maity <maitysanchayan@gmail.com>
-Cc: Marcel Ziswiler <marcel.ziswiler@toradex.com>
-Cc: Shawn Guo <shawnguo@kernel.org>
-Signed-off-by: Johan Hovold <johan@kernel.org>
-Reviewed-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
-Signed-off-by: Shawn Guo <shawnguo@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts
-+++ b/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts
-@@ -234,7 +234,7 @@
- 
-       /* SRAM on Colibri nEXT_CS0 */
-       sram@0,0 {
--              compatible = "cypress,cy7c1019dv33-10zsxi, mtd-ram";
-+              compatible = "cypress,cy7c1019dv33-10zsxi", "mtd-ram";
-               reg = <0 0 0x00010000>;
-               #address-cells = <1>;
-               #size-cells = <1>;
-@@ -245,7 +245,7 @@
- 
-       /* SRAM on Colibri nEXT_CS1 */
-       sram@1,0 {
--              compatible = "cypress,cy7c1019dv33-10zsxi, mtd-ram";
-+              compatible = "cypress,cy7c1019dv33-10zsxi", "mtd-ram";
-               reg = <1 0 0x00010000>;
-               #address-cells = <1>;
-               #size-cells = <1>;

diff --git a/queue-4.19/series b/queue-4.19/series
index 21b7f3a2e79c550139999a24a54bf8a263163086..75ff2389f89dea0ecf1a99bc31fa4734442d43e1 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -75,7 +75,6 @@ rmda-cm-fix-missing-ib_cm_destroy_id-in-ib_cm_insert_listen.patch
 ib-hfi1-qib-ensure-rcu-is-locked-when-accessing-list.patch
 arm-imx-build-v7_cpu_resume-unconditionally.patch
 arm-dts-am437x-idk-evm-fix-incorrect-opp-node-names.patch
-arm-dts-imx6dl-colibri-eval-v3-fix-sram-compatible-properties.patch
 arm-dts-imx7-colibri-fix-frequency-for-sd-mmc.patch
 hwmon-adt7462-fix-an-error-return-in-adt7462_reg_volt.patch
 dmaengine-coh901318-fix-a-double-lock-bug-in-dma_tc_handle.patch

diff --git a/queue-5.4/arm-dts-imx6dl-colibri-eval-v3-fix-sram-compatible-properties.patch b/queue-5.4/arm-dts-imx6dl-colibri-eval-v3-fix-sram-compatible-properties.patch
deleted file mode 100644 (file)
index d276b83..0000000
--- a/queue-5.4/arm-dts-imx6dl-colibri-eval-v3-fix-sram-compatible-properties.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From bcbf53a0dab50980867476994f6079c1ec5bb3a3 Mon Sep 17 00:00:00 2001
-From: Johan Hovold <johan@kernel.org>
-Date: Wed, 12 Feb 2020 11:46:29 +0100
-Subject: ARM: dts: imx6dl-colibri-eval-v3: fix sram compatible properties
-
-From: Johan Hovold <johan@kernel.org>
-
-commit bcbf53a0dab50980867476994f6079c1ec5bb3a3 upstream.
-
-The sram-node compatible properties have mistakingly combined the
-model-specific string with the generic "mtd-ram" string.
-
-Note that neither "cy7c1019dv33-10zsxi, mtd-ram" or
-"cy7c1019dv33-10zsxi" are used by any in-kernel driver and they are
-not present in any binding.
-
-The physmap driver will however bind to platform devices that specify
-"mtd-ram".
-
-Fixes: fc48e76489fd ("ARM: dts: imx6: Add support for Toradex Colibri iMX6 module")
-Cc: Sanchayan Maity <maitysanchayan@gmail.com>
-Cc: Marcel Ziswiler <marcel.ziswiler@toradex.com>
-Cc: Shawn Guo <shawnguo@kernel.org>
-Signed-off-by: Johan Hovold <johan@kernel.org>
-Reviewed-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
-Signed-off-by: Shawn Guo <shawnguo@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts
-+++ b/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts
-@@ -236,7 +236,7 @@
- 
-       /* SRAM on Colibri nEXT_CS0 */
-       sram@0,0 {
--              compatible = "cypress,cy7c1019dv33-10zsxi, mtd-ram";
-+              compatible = "cypress,cy7c1019dv33-10zsxi", "mtd-ram";
-               reg = <0 0 0x00010000>;
-               #address-cells = <1>;
-               #size-cells = <1>;
-@@ -247,7 +247,7 @@
- 
-       /* SRAM on Colibri nEXT_CS1 */
-       sram@1,0 {
--              compatible = "cypress,cy7c1019dv33-10zsxi, mtd-ram";
-+              compatible = "cypress,cy7c1019dv33-10zsxi", "mtd-ram";
-               reg = <1 0 0x00010000>;
-               #address-cells = <1>;
-               #size-cells = <1>;

diff --git a/queue-5.4/series b/queue-5.4/series
index 27291fc0a994d824e9013813c32f5f387fb32015..cb4ce9a0f8c3b1b80c8f5e70fbad8d99b7c03f53 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -153,7 +153,6 @@ ib-hfi1-qib-ensure-rcu-is-locked-when-accessing-list.patch
 arm-imx-build-v7_cpu_resume-unconditionally.patch
 arm-dts-am437x-idk-evm-fix-incorrect-opp-node-names.patch
 arm-dts-dra7xx-clocks-fixup-ipu1-mux-clock-parent-source.patch
-arm-dts-imx6dl-colibri-eval-v3-fix-sram-compatible-properties.patch
 arm-dts-imx7-colibri-fix-frequency-for-sd-mmc.patch
 hwmon-adt7462-fix-an-error-return-in-adt7462_reg_volt.patch
 dma-buf-free-dmabuf-name-in-dma_buf_release.patch

diff --git a/queue-5.5/arm-dts-imx6dl-colibri-eval-v3-fix-sram-compatible-properties.patch b/queue-5.5/arm-dts-imx6dl-colibri-eval-v3-fix-sram-compatible-properties.patch
deleted file mode 100644 (file)
index 7f650df..0000000
--- a/queue-5.5/arm-dts-imx6dl-colibri-eval-v3-fix-sram-compatible-properties.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From bcbf53a0dab50980867476994f6079c1ec5bb3a3 Mon Sep 17 00:00:00 2001
-From: Johan Hovold <johan@kernel.org>
-Date: Wed, 12 Feb 2020 11:46:29 +0100
-Subject: ARM: dts: imx6dl-colibri-eval-v3: fix sram compatible properties
-
-From: Johan Hovold <johan@kernel.org>
-
-commit bcbf53a0dab50980867476994f6079c1ec5bb3a3 upstream.
-
-The sram-node compatible properties have mistakingly combined the
-model-specific string with the generic "mtd-ram" string.
-
-Note that neither "cy7c1019dv33-10zsxi, mtd-ram" or
-"cy7c1019dv33-10zsxi" are used by any in-kernel driver and they are
-not present in any binding.
-
-The physmap driver will however bind to platform devices that specify
-"mtd-ram".
-
-Fixes: fc48e76489fd ("ARM: dts: imx6: Add support for Toradex Colibri iMX6 module")
-Cc: Sanchayan Maity <maitysanchayan@gmail.com>
-Cc: Marcel Ziswiler <marcel.ziswiler@toradex.com>
-Cc: Shawn Guo <shawnguo@kernel.org>
-Signed-off-by: Johan Hovold <johan@kernel.org>
-Reviewed-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com>
-Signed-off-by: Shawn Guo <shawnguo@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts
-+++ b/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts
-@@ -275,7 +275,7 @@
- 
-       /* SRAM on Colibri nEXT_CS0 */
-       sram@0,0 {
--              compatible = "cypress,cy7c1019dv33-10zsxi, mtd-ram";
-+              compatible = "cypress,cy7c1019dv33-10zsxi", "mtd-ram";
-               reg = <0 0 0x00010000>;
-               #address-cells = <1>;
-               #size-cells = <1>;
-@@ -286,7 +286,7 @@
- 
-       /* SRAM on Colibri nEXT_CS1 */
-       sram@1,0 {
--              compatible = "cypress,cy7c1019dv33-10zsxi, mtd-ram";
-+              compatible = "cypress,cy7c1019dv33-10zsxi", "mtd-ram";
-               reg = <1 0 0x00010000>;
-               #address-cells = <1>;
-               #size-cells = <1>;

diff --git a/queue-5.5/series b/queue-5.5/series
index 58a59b92c34600c29a6773a7eacf384efdb957be..d0be9772dfe608adcf38d0c28d92108387222ccd 100644 (file)
--- a/queue-5.5/series
+++ b/queue-5.5/series
@@ -172,7 +172,6 @@ arm-imx-build-v7_cpu_resume-unconditionally.patch
 arm-dts-imx7d-fix-opp-supported-hw.patch
 arm-dts-am437x-idk-evm-fix-incorrect-opp-node-names.patch
 arm-dts-dra7xx-clocks-fixup-ipu1-mux-clock-parent-source.patch
-arm-dts-imx6dl-colibri-eval-v3-fix-sram-compatible-properties.patch
 arm-dts-imx7-colibri-fix-frequency-for-sd-mmc.patch
 hwmon-adt7462-fix-an-error-return-in-adt7462_reg_volt.patch
 dma-buf-free-dmabuf-name-in-dma_buf_release.patch