From: Greg Kroah-Hartman Date: Fri, 22 Nov 2019 13:39:46 +0000 (+0100) Subject: drop arm-dts-exynos-disable-pull-control-for-s5m8767-pmic.patch from 4.4 X-Git-Tag: v5.3.13~2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fb3f428a545c4a88b91d6aa31003bcfa9e8b5593;p=thirdparty%2Fkernel%2Fstable-queue.git drop arm-dts-exynos-disable-pull-control-for-s5m8767-pmic.patch from 4.4 --- diff --git a/queue-4.4/arm-dts-exynos-disable-pull-control-for-s5m8767-pmic.patch b/queue-4.4/arm-dts-exynos-disable-pull-control-for-s5m8767-pmic.patch deleted file mode 100644 index 3b544d64baf..00000000000 --- a/queue-4.4/arm-dts-exynos-disable-pull-control-for-s5m8767-pmic.patch +++ /dev/null @@ -1,51 +0,0 @@ -From c978d1b174151b6270a3d2c6e9502377b4c8108b Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 6 Sep 2018 17:41:35 +0200 -Subject: ARM: dts: exynos: Disable pull control for S5M8767 PMIC - -From: Marek Szyprowski - -[ Upstream commit ef2ecab9af5feae97c47b7f61cdd96f7f49b2c23 ] - -S5M8767 PMIC interrupt line on Exynos5250-based Arndale board has -external pull-up resistors, so disable any pull control for it in -in controller node. This fixes support for S5M8767 interrupts and -enables operation of wakeup from S5M8767 RTC alarm. - -Signed-off-by: Marek Szyprowski -Signed-off-by: Krzysztof Kozlowski -Signed-off-by: Sasha Levin ---- - arch/arm/boot/dts/exynos5250-arndale.dts | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/arch/arm/boot/dts/exynos5250-arndale.dts b/arch/arm/boot/dts/exynos5250-arndale.dts -index c000532c14446..b425b77f8fb65 100644 ---- a/arch/arm/boot/dts/exynos5250-arndale.dts -+++ b/arch/arm/boot/dts/exynos5250-arndale.dts -@@ -170,6 +170,8 @@ - reg = <0x66>; - interrupt-parent = <&gpx3>; - interrupts = <2 IRQ_TYPE_LEVEL_LOW>; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&s5m8767_irq>; - - vinb1-supply = <&main_dc_reg>; - vinb2-supply = <&main_dc_reg>; -@@ -552,6 +554,13 @@ - cap-sd-highspeed; - }; - -+&pinctrl_0 { -+ s5m8767_irq: s5m8767-irq { -+ samsung,pins = "gpx3-2"; -+ samsung,pin-pud = ; -+ }; -+}; -+ - &rtc { - status = "okay"; - }; --- -2.20.1 - diff --git a/queue-4.4/series b/queue-4.4/series index 865e3756db3..a54c003aeb0 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -24,7 +24,6 @@ arm-dts-pxa-fix-power-i2c-base-address.patch rtl8187-fix-warning-generated-when-strncpy-destinati.patch net-lan78xx-bail-out-if-lan78xx_get_endpoints-fails.patch asoc-sgtl5000-avoid-division-by-zero-if-lo_vag-is-ze.patch -arm-dts-exynos-disable-pull-control-for-s5m8767-pmic.patch ath10k-wmi-disable-softirq-s-while-calling-ieee80211.patch mips-txx9-fix-iounmap-related-issue.patch of-make-powermac-cache-node-search-conditional-on-co.patch