drop i2c-omap-enable-for-arch_k3.patch from 4.14, 4.9, 4.4, and 3.18

diff --git a/queue-3.18/i2c-omap-enable-for-arch_k3.patch b/queue-3.18/i2c-omap-enable-for-arch_k3.patch
deleted file mode 100644 (file)
index 990aa6e..0000000
--- a/queue-3.18/i2c-omap-enable-for-arch_k3.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From c418a966ecbf65f23bafe411de2dd649ff801a8f Mon Sep 17 00:00:00 2001
-From: Vignesh R <vigneshr@ti.com>
-Date: Fri, 9 Nov 2018 16:44:11 +0530
-Subject: i2c: omap: Enable for ARCH_K3
-
-[ Upstream commit 5b277402deac0691226a947df71c581686bd4020 ]
-
-Allow I2C_OMAP to be built for K3 platforms.
-
-Signed-off-by: Vignesh R <vigneshr@ti.com>
-Reviewed-by: Grygorii Strashko <grygorii.strashko@ti.com>
-Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/i2c/busses/Kconfig | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
-index 06e99eb64295..6ced9382bf02 100644
---- a/drivers/i2c/busses/Kconfig
-+++ b/drivers/i2c/busses/Kconfig
-@@ -607,7 +607,7 @@ config I2C_OCORES
- 
- config I2C_OMAP
-       tristate "OMAP I2C adapter"
--      depends on ARCH_OMAP
-+      depends on ARCH_OMAP || ARCH_K3
-       default y if MACH_OMAP_H3 || MACH_OMAP_OSK
-       help
-         If you say yes to this option, support will be included for the
--- 
-2.17.1
-

diff --git a/queue-3.18/series b/queue-3.18/series
index 8b0f545f68c633f186c9530a82a441f8da99d0f2..1e1ff51291ee2a063cf4d89fa097c06d9732f1c5 100644 (file)
--- a/queue-3.18/series
+++ b/queue-3.18/series
@@ -7,7 +7,6 @@ fs-exofs-fix-potential-memory-leak-in-mount-option-p.patch
 clk-samsung-exynos5420-enable-peris-clocks-for-suspe.patch
 s390-vdso-add-missing-force-to-build-targets.patch
 lib-raid6-fix-arm64-test-build.patch
-i2c-omap-enable-for-arch_k3.patch
 zram-close-udev-startup-race-condition-as-default-gr.patch
 revert-revert-drm-i915-fix-mutex-owner-inspection-ra.patch
 sunrpc-drop-pointless-static-qualifier-in-xdr_get_ne.patch

diff --git a/queue-4.14/i2c-omap-enable-for-arch_k3.patch b/queue-4.14/i2c-omap-enable-for-arch_k3.patch
deleted file mode 100644 (file)
index 5ed8a3f..0000000
--- a/queue-4.14/i2c-omap-enable-for-arch_k3.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From f71b62d9c51e4ba2ccf32e7d1cb3eaafc4173a16 Mon Sep 17 00:00:00 2001
-From: Vignesh R <vigneshr@ti.com>
-Date: Fri, 9 Nov 2018 16:44:11 +0530
-Subject: i2c: omap: Enable for ARCH_K3
-
-[ Upstream commit 5b277402deac0691226a947df71c581686bd4020 ]
-
-Allow I2C_OMAP to be built for K3 platforms.
-
-Signed-off-by: Vignesh R <vigneshr@ti.com>
-Reviewed-by: Grygorii Strashko <grygorii.strashko@ti.com>
-Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/i2c/busses/Kconfig | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
-index 45a3f3ca29b3..75ea367ffd83 100644
---- a/drivers/i2c/busses/Kconfig
-+++ b/drivers/i2c/busses/Kconfig
-@@ -759,7 +759,7 @@ config I2C_OCORES
- 
- config I2C_OMAP
-       tristate "OMAP I2C adapter"
--      depends on ARCH_OMAP
-+      depends on ARCH_OMAP || ARCH_K3
-       default y if MACH_OMAP_H3 || MACH_OMAP_OSK
-       help
-         If you say yes to this option, support will be included for the
--- 
-2.17.1
-

diff --git a/queue-4.14/series b/queue-4.14/series
index 0c922846c2b1fc31a6f1754cfe42a2cc81afb7a0..e95e8986b0690376d4cb6217751874f986dde4fd 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -29,7 +29,6 @@ revert-drm-exynos-decon5433-implement-frame-counter.patch
 clk-fixed-factor-fix-of_node_get-put-imbalance.patch
 lib-raid6-fix-arm64-test-build.patch
 s390-perf-change-cpum_cf-return-code-in-event-init-f.patch
-i2c-omap-enable-for-arch_k3.patch
 sched-core-take-the-hotplug-lock-in-sched_init_smp.patch
 perf-tools-fix-undefined-symbol-scnprintf-in-libperf.patch
 i40e-restore-netif_f_gso_ipxip-46-to-netdev-features.patch

diff --git a/queue-4.4/i2c-omap-enable-for-arch_k3.patch b/queue-4.4/i2c-omap-enable-for-arch_k3.patch
deleted file mode 100644 (file)
index bb73ae7..0000000
--- a/queue-4.4/i2c-omap-enable-for-arch_k3.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 3c8340c198153b513fff67ac4a410b3cae8bc083 Mon Sep 17 00:00:00 2001
-From: Vignesh R <vigneshr@ti.com>
-Date: Fri, 9 Nov 2018 16:44:11 +0530
-Subject: i2c: omap: Enable for ARCH_K3
-
-[ Upstream commit 5b277402deac0691226a947df71c581686bd4020 ]
-
-Allow I2C_OMAP to be built for K3 platforms.
-
-Signed-off-by: Vignesh R <vigneshr@ti.com>
-Reviewed-by: Grygorii Strashko <grygorii.strashko@ti.com>
-Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/i2c/busses/Kconfig | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
-index 7b0aa82ea38b..b6a692677eea 100644
---- a/drivers/i2c/busses/Kconfig
-+++ b/drivers/i2c/busses/Kconfig
-@@ -702,7 +702,7 @@ config I2C_OCORES
- 
- config I2C_OMAP
-       tristate "OMAP I2C adapter"
--      depends on ARCH_OMAP
-+      depends on ARCH_OMAP || ARCH_K3
-       default y if MACH_OMAP_H3 || MACH_OMAP_OSK
-       help
-         If you say yes to this option, support will be included for the
--- 
-2.17.1
-

diff --git a/queue-4.4/series b/queue-4.4/series
index a4989087f43a9f873b8075379303ba07763f0031..99e6092735b944e184ddd97a6209cf699234b2f4 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -50,7 +50,6 @@ netfilter-ipset-correct-rcu_dereference-call-in-ip_s.patch
 netfilter-xt_idletimer-add-sysfs-filename-checking-r.patch
 hwmon-ibmpowernv-remove-bogus-__init-annotations.patch
 lib-raid6-fix-arm64-test-build.patch
-i2c-omap-enable-for-arch_k3.patch
 zram-close-udev-startup-race-condition-as-default-gr.patch
 sunrpc-drop-pointless-static-qualifier-in-xdr_get_ne.patch
 gfs2-put-bitmap-buffers-in-put_super.patch

diff --git a/queue-4.9/i2c-omap-enable-for-arch_k3.patch b/queue-4.9/i2c-omap-enable-for-arch_k3.patch
deleted file mode 100644 (file)
index 5a78862..0000000
--- a/queue-4.9/i2c-omap-enable-for-arch_k3.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From c4f2ce8eb5f4a53c3088e4e70ab16902cc29b3d1 Mon Sep 17 00:00:00 2001
-From: Vignesh R <vigneshr@ti.com>
-Date: Fri, 9 Nov 2018 16:44:11 +0530
-Subject: i2c: omap: Enable for ARCH_K3
-
-[ Upstream commit 5b277402deac0691226a947df71c581686bd4020 ]
-
-Allow I2C_OMAP to be built for K3 platforms.
-
-Signed-off-by: Vignesh R <vigneshr@ti.com>
-Reviewed-by: Grygorii Strashko <grygorii.strashko@ti.com>
-Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/i2c/busses/Kconfig | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
-index d252276feadf..94669d96bd19 100644
---- a/drivers/i2c/busses/Kconfig
-+++ b/drivers/i2c/busses/Kconfig
-@@ -706,7 +706,7 @@ config I2C_OCORES
- 
- config I2C_OMAP
-       tristate "OMAP I2C adapter"
--      depends on ARCH_OMAP
-+      depends on ARCH_OMAP || ARCH_K3
-       default y if MACH_OMAP_H3 || MACH_OMAP_OSK
-       help
-         If you say yes to this option, support will be included for the
--- 
-2.17.1
-

diff --git a/queue-4.9/series b/queue-4.9/series
index 71113fb546dea1333c2a329debe8b355f30d811d..006f69e7263a9342ea3227673d56ebaa39bb693b 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -19,7 +19,6 @@ s390-qeth-fix-hipersockets-sniffer.patch
 hwmon-ibmpowernv-remove-bogus-__init-annotations.patch
 clk-fixed-factor-fix-of_node_get-put-imbalance.patch
 lib-raid6-fix-arm64-test-build.patch
-i2c-omap-enable-for-arch_k3.patch
 qed-fix-memory-entry-leak-in-qed_init_sp_request.patch
 qed-fix-blocking-unlimited-spq-entries-leak.patch
 zram-close-udev-startup-race-condition-as-default-gr.patch