bf944e6c06
This switches from 6.1 LTS to 6.6 LTS. Unfortunately, this version has regressions related to SPI (breaks keyboard) and DRM (breaks display). Thus adding patches to revert these regressions. Hopefully, these will be properly fixed until the next LTS release. This also makes it pass community kconfig check again. [ci:skip-build]: already built successfully in CI
58 lines
2.1 KiB
Diff
58 lines
2.1 KiB
Diff
From a1387014c94ff6fffd0b67e05f2a8f907e9daa02 Mon Sep 17 00:00:00 2001
|
|
From: Anton Bambura <jenneron@protonmail.com>
|
|
Date: Sun, 19 Jun 2022 09:18:56 +0300
|
|
Subject: [PATCH] ARM: tegra: nyan: fix mic jack detection
|
|
|
|
Configure this pin properly.
|
|
|
|
Signed-off-by: Anton Bambura <jenneron@protonmail.com>
|
|
Tested-by: Alexander Warnecke <awarnecke002@hotmail.com>
|
|
---
|
|
arch/arm/boot/dts/nvidia/tegra124-nyan-big.dts | 2 +-
|
|
arch/arm/boot/dts/nvidia/tegra124-nyan-blaze.dts | 2 +-
|
|
arch/arm/boot/dts/nvidia/tegra124-nyan.dtsi | 3 +--
|
|
3 files changed, 3 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/arch/arm/boot/dts/nvidia/tegra124-nyan-big.dts b/arch/arm/boot/dts/nvidia/tegra124-nyan-big.dts
|
|
index 1d2aac2cb..320e1da3f 100644
|
|
--- a/arch/arm/boot/dts/nvidia/tegra124-nyan-big.dts
|
|
+++ b/arch/arm/boot/dts/nvidia/tegra124-nyan-big.dts
|
|
@@ -677,7 +677,7 @@ kb_row6_pr6 {
|
|
};
|
|
kb_row7_pr7 {
|
|
nvidia,pins = "kb_row7_pr7";
|
|
- nvidia,pull = <TEGRA_PIN_PULL_NONE>;
|
|
+ nvidia,pull = <TEGRA_PIN_PULL_UP>;
|
|
nvidia,tristate = <TEGRA_PIN_DISABLE>;
|
|
nvidia,enable-input = <TEGRA_PIN_ENABLE>;
|
|
};
|
|
diff --git a/arch/arm/boot/dts/nvidia/tegra124-nyan-blaze.dts b/arch/arm/boot/dts/nvidia/tegra124-nyan-blaze.dts
|
|
index 677babde6..06b27fb6c 100644
|
|
--- a/arch/arm/boot/dts/nvidia/tegra124-nyan-blaze.dts
|
|
+++ b/arch/arm/boot/dts/nvidia/tegra124-nyan-blaze.dts
|
|
@@ -675,7 +675,7 @@ kb_row6_pr6 {
|
|
};
|
|
kb_row7_pr7 {
|
|
nvidia,pins = "kb_row7_pr7";
|
|
- nvidia,pull = <TEGRA_PIN_PULL_NONE>;
|
|
+ nvidia,pull = <TEGRA_PIN_PULL_UP>;
|
|
nvidia,tristate = <TEGRA_PIN_DISABLE>;
|
|
nvidia,enable-input = <TEGRA_PIN_ENABLE>;
|
|
};
|
|
diff --git a/arch/arm/boot/dts/nvidia/tegra124-nyan.dtsi b/arch/arm/boot/dts/nvidia/tegra124-nyan.dtsi
|
|
index 84a97e32d..11655575b 100644
|
|
--- a/arch/arm/boot/dts/nvidia/tegra124-nyan.dtsi
|
|
+++ b/arch/arm/boot/dts/nvidia/tegra124-nyan.dtsi
|
|
@@ -778,8 +778,7 @@ sound {
|
|
<&tegra_car TEGRA124_CLK_EXTERN1>;
|
|
|
|
nvidia,hp-det-gpios = <&gpio TEGRA_GPIO(I, 7) GPIO_ACTIVE_HIGH>;
|
|
- nvidia,mic-det-gpios =
|
|
- <&gpio TEGRA_GPIO(R, 7) GPIO_ACTIVE_HIGH>;
|
|
+ nvidia,mic-det-gpios = <&gpio TEGRA_GPIO(R, 7) GPIO_ACTIVE_LOW>;
|
|
};
|
|
|
|
gpio-restart {
|
|
--
|
|
2.36.1
|
|
|