From: Greg Kroah-Hartman Date: Thu, 12 Dec 2019 14:02:27 +0000 (+0100) Subject: drop queue-4.19/arm-dts-sun8i-a23-a33-fix-up-rtc-device-node.patch X-Git-Tag: v5.4.3~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a6476a8427802259145bb51f920ef95027970b72;p=thirdparty%2Fkernel%2Fstable-queue.git drop queue-4.19/arm-dts-sun8i-a23-a33-fix-up-rtc-device-node.patch --- diff --git a/queue-4.19/arm-dts-sun8i-a23-a33-fix-up-rtc-device-node.patch b/queue-4.19/arm-dts-sun8i-a23-a33-fix-up-rtc-device-node.patch deleted file mode 100644 index 2b1558fa001..00000000000 --- a/queue-4.19/arm-dts-sun8i-a23-a33-fix-up-rtc-device-node.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 83e9ee5b5a78469b8941c308e7316eb5f1ae75c1 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 3 Dec 2018 22:58:20 +0800 -Subject: ARM: dts: sun8i: a23/a33: Fix up RTC device node - -From: Chen-Yu Tsai - -[ Upstream commit f6f4422532ad9ec9380a9936ed16b30922066a50 ] - -The RTC module on the A23 was claimed to be the same as on the A31, when -in fact it is not. The A31 does not have an RTC external clock output, -and its internal RC oscillator's average clock rate is not in the same -range. The A33's RTC is the same as the A23. - -This patch fixes the compatible string and clock properties to conform -to the updated bindings. The register range is also fixed. - -Acked-by: Maxime Ripard -Signed-off-by: Chen-Yu Tsai -Signed-off-by: Sasha Levin ---- - arch/arm/boot/dts/sun8i-a23-a33.dtsi | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/arch/arm/boot/dts/sun8i-a23-a33.dtsi b/arch/arm/boot/dts/sun8i-a23-a33.dtsi -index c16ffcc4db7da..5616333c0e0e3 100644 ---- a/arch/arm/boot/dts/sun8i-a23-a33.dtsi -+++ b/arch/arm/boot/dts/sun8i-a23-a33.dtsi -@@ -565,11 +565,11 @@ - }; - - rtc: rtc@1f00000 { -- compatible = "allwinner,sun6i-a31-rtc"; -- reg = <0x01f00000 0x54>; -+ compatible = "allwinner,sun8i-a23-rtc"; -+ reg = <0x01f00000 0x400>; - interrupts = , - ; -- clock-output-names = "osc32k"; -+ clock-output-names = "osc32k", "osc32k-out"; - clocks = <&ext_osc32k>; - #clock-cells = <1>; - }; --- -2.20.1 - diff --git a/queue-4.19/series b/queue-4.19/series index 13997b2c686..75cc31afc93 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -181,7 +181,6 @@ clk-qcom-gcc-msm8998-disable-halt-check-of-ufs-clock.patch sctp-frag_point-sanity-check.patch soc-renesas-r8a77990-sysc-fix-initialization-order-o.patch mlxsw-spectrum_router-relax-gre-decap-matching-check.patch -arm-dts-sun8i-a23-a33-fix-up-rtc-device-node.patch ib-hfi1-ignore-lni-errors-before-dc8051-transitions-.patch ib-hfi1-close-vnic-sdma_progress-sleep-window.patch mlx4-use-snprintf-instead-of-complicated-strcpy.patch