diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-29 17:27:55 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-29 17:28:50 +0200 |
commit | 01e1c5521b2c1c4074cd83cd4e4c4604309ce518 (patch) | |
tree | 785c395f42dcd8cb13db2a49263980b26e85ff8c /arm64-Fix-some-GPIO-setup-on-Pinebook-Pro.patch | |
parent | c1ca5fbfa21dd0253db964da7bd89733fcf2bfe3 (diff) | |
parent | 0a70f564a052c491b12770d1218a2d8dd8b71924 (diff) | |
download | kernel-01e1c5521b2c1c4074cd83cd4e4c4604309ce518.tar.gz kernel-01e1c5521b2c1c4074cd83cd4e4c4604309ce518.tar.xz kernel-01e1c5521b2c1c4074cd83cd4e4c4604309ce518.zip |
merge origin, 5.7 rebasekernel-5.7.6-251.vanilla.knurd.1.fc32
Diffstat (limited to 'arm64-Fix-some-GPIO-setup-on-Pinebook-Pro.patch')
-rw-r--r-- | arm64-Fix-some-GPIO-setup-on-Pinebook-Pro.patch | 50 |
1 files changed, 0 insertions, 50 deletions
diff --git a/arm64-Fix-some-GPIO-setup-on-Pinebook-Pro.patch b/arm64-Fix-some-GPIO-setup-on-Pinebook-Pro.patch deleted file mode 100644 index 7bfd204b5..000000000 --- a/arm64-Fix-some-GPIO-setup-on-Pinebook-Pro.patch +++ /dev/null @@ -1,50 +0,0 @@ -From c45fbddb2cd7ce6198e33ebe6dc4c1301d7875d4 Mon Sep 17 00:00:00 2001 -From: Peter Robinson <pbrobinson@gmail.com> -Date: Sun, 19 Apr 2020 20:50:08 +0100 -Subject: [PATCH] Fix some GPIO setup on Pinebook Pro - -This patchset contains two small fixes for the dts of the Pinebook Pro. -The first fixes inverted logic on the headphone detect GPIO. -The second patch fixes unreliable DC charger detection. - -Tobias Schramm (2): - arm64: dts: rockchip: fix inverted headphone detection - arm64: dts: rockchip: enable DC charger detection pullup - -Signed-off-by: Peter Robinson <pbrobinson@gmail.com> ---- - arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts b/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts -index 5ea281b55fe2..294d21bf45f5 100644 ---- a/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts -+++ b/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts -@@ -147,7 +147,7 @@ es8316-sound { - "Speaker", "Speaker Amplifier OUTL", - "Speaker", "Speaker Amplifier OUTR"; - -- simple-audio-card,hp-det-gpio = <&gpio0 RK_PB0 GPIO_ACTIVE_LOW>; -+ simple-audio-card,hp-det-gpio = <&gpio0 RK_PB0 GPIO_ACTIVE_HIGH>; - simple-audio-card,aux-devs = <&speaker_amp>; - simple-audio-card,pin-switches = "Speaker"; - -@@ -788,13 +788,13 @@ lidbtn_gpio: lidbtn-gpio { - - dc-charger { - dc_det_gpio: dc-det-gpio { -- rockchip,pins = <4 RK_PD0 RK_FUNC_GPIO &pcfg_pull_none>; -+ rockchip,pins = <4 RK_PD0 RK_FUNC_GPIO &pcfg_pull_up>; - }; - }; - - es8316 { - hp_det_gpio: hp-det-gpio { -- rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_down>; -+ rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_up>; - }; - }; - --- -2.26.1 - |