aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts
diff options
context:
space:
mode:
authorTobias Schramm <t.schramm@manjaro.org>2020-04-14 18:39:51 +0200
committerHeiko Stuebner <heiko@sntech.de>2020-04-19 12:38:20 +0200
commit40df91a894e9298d0f052acb6960f12ace5bee24 (patch)
tree721871511f16e1895f7611f779c1d129fd1de3b9 /arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts
parentarm64: dts: rockchip: Correct PMU compatibles for PX30 and RK3308 (diff)
downloadwireguard-linux-40df91a894e9298d0f052acb6960f12ace5bee24.tar.xz
wireguard-linux-40df91a894e9298d0f052acb6960f12ace5bee24.zip
arm64: dts: rockchip: fix inverted headphone detection on Pinebook Pro
On the Pinebook Pro the headphone jack is dual use. It can be used either as a normal headphone jack or as a debug serial connection. This functionality is controlled via a small hardware switch on the mainboard. Unfortunately flipping this switch biases the headphone detection switch inside the headphone jack at 3.3 V if in `debug UART` position but to GND when in `headphone out` position. This results in an inversion of the headphone detection logic depending on the switch position. Since the headphone jack can only be used for audio when in `headphone out` position this commit changes the headphone detect GPIO logic to be correct for that case rather than for the debug UART. Fixes: 5a65505a6988 ("arm64: dts: rockchip: Add initial support for Pinebook Pro") Signed-off-by: Tobias Schramm <t.schramm@manjaro.org> Link: https://lore.kernel.org/r/20200414163952.1093784-2-t.schramm@manjaro.org Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Diffstat (limited to 'arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts')
-rw-r--r--arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts4
1 files changed, 2 insertions, 2 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..c3f15f5bd550 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 @@
"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";
@@ -794,7 +794,7 @@
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>;
};
};