drop 4.14 and 4.19 patch that broke the build

diff --git a/queue-4.14/arm64-dts-rockchip-enable-display-nodes-on-rk3328-ro.patch b/queue-4.14/arm64-dts-rockchip-enable-display-nodes-on-rk3328-ro.patch
deleted file mode 100644 (file)
index 3b9c6f4..0000000
--- a/queue-4.14/arm64-dts-rockchip-enable-display-nodes-on-rk3328-ro.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 6e641a2767c349964a22f19ff9acea87cfac71aa Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Sun, 10 Dec 2017 00:11:45 +0100
-Subject: arm64: dts: rockchip: enable display nodes on rk3328-rock64
-
-From: Heiko Stuebner <heiko@sntech.de>
-
-[ Upstream commit e78d53c7b2873e0724eb765a88ccde42560b0e05 ]
-
-Enable necessary nodes to get output on the hdmi port of the board.
-
-Signed-off-by: Heiko Stuebner <heiko@sntech.de>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm64/boot/dts/rockchip/rk3328-rock64.dts | 16 ++++++++++++++++
- 1 file changed, 16 insertions(+)
-
-diff --git a/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts b/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts
-index 3f8f528099a80..19c086f1bf6db 100644
---- a/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts
-+++ b/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts
-@@ -146,6 +146,14 @@
-       status = "okay";
- };
- 
-+&hdmi {
-+      status = "okay";
-+};
-+
-+&hdmiphy {
-+      status = "okay";
-+};
-+
- &i2c1 {
-       status = "okay";
- 
-@@ -333,3 +341,11 @@
- &usb_host0_ohci {
-       status = "okay";
- };
-+
-+&vop {
-+      status = "okay";
-+};
-+
-+&vop_mmu {
-+      status = "okay";
-+};
--- 
-2.20.1
-

diff --git a/queue-4.14/series b/queue-4.14/series
index 0a90c4485a94737cb6c08da808993d22de3a5b7b..19fbc7d2ac1de3ce81e297680e57aeb87fb86ad0 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -228,7 +228,6 @@ scsi-ncr5380-check-for-bus-reset.patch
 arm64-dts-amd-fix-spi-bus-warnings.patch
 arm64-dts-lg-fix-spi-controller-node-names.patch
 arm-dts-lpc32xx-fix-spi-controller-node-names.patch
-arm64-dts-rockchip-enable-display-nodes-on-rk3328-ro.patch
 rtc-armada38x-fix-possible-race-condition.patch
 netfilter-masquerade-don-t-flush-all-conntracks-if-o.patch
 usb-xhci-mtk-fix-isoc-error-when-interval-is-zero.patch

diff --git a/queue-4.19/arm-dts-meson8b-odroidc1-enable-the-sar-adc.patch b/queue-4.19/arm-dts-meson8b-odroidc1-enable-the-sar-adc.patch
deleted file mode 100644 (file)
index 7d8b943..0000000
--- a/queue-4.19/arm-dts-meson8b-odroidc1-enable-the-sar-adc.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 2705114c0f9f992ec8f98296e279de856f793996 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Thu, 13 Sep 2018 22:29:18 +0200
-Subject: ARM: dts: meson8b: odroidc1: enable the SAR ADC
-
-From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
-
-[ Upstream commit fd6643142a0c5ab4d423ed7173a0be414d509214 ]
-
-Odroid-C1 exposes ADC channels 0 and 1 on the GPIO headers. NOTE: Due
-to the SoC design these are limited to 1.8V (instead of 3.3V like all
-other pins).
-Enable the SAR ADC to enable voltage measurements on these pins.
-
-Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
-Signed-off-by: Kevin Hilman <khilman@baylibre.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm/boot/dts/meson8b-odroidc1.dts | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/arch/arm/boot/dts/meson8b-odroidc1.dts b/arch/arm/boot/dts/meson8b-odroidc1.dts
-index 8fdeeffecbdbc..8a09071d712a5 100644
---- a/arch/arm/boot/dts/meson8b-odroidc1.dts
-+++ b/arch/arm/boot/dts/meson8b-odroidc1.dts
-@@ -153,6 +153,11 @@
-       pinctrl-names = "default";
- };
- 
-+&saradc {
-+      status = "okay";
-+      vref-supply = <&vcc_1v8>;
-+};
-+
- &sdio {
-       status = "okay";
- 
--- 
-2.20.1
-

diff --git a/queue-4.19/series b/queue-4.19/series
index 7bea4e6d0ca3d2114ec9cc98d4965084291f4d8b..50fd935a821f2dc6c7fe6f739e60e466ca09f14f 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -360,7 +360,6 @@ iw_cxgb4-use-proper-enumerated-type-in-c4iw_bar2_add.patch
 scsi-libsas-always-unregister-the-old-device-if-goin.patch
 f2fs-fix-remount-problem-of-option-io_bits.patch
 phy-lantiq-fix-compile-warning.patch
-arm-dts-meson8b-odroidc1-enable-the-sar-adc.patch
 arm64-dts-fsl-fix-i2c-and-spi-bus-warnings.patch
 arm-dts-imx51-zii-rdu1-fix-the-rtc-compatible-string.patch
 arm64-tegra-i2c-on-tegra194-is-not-compatible-with-t.patch