lkml.org 
[lkml]   [2021]   [Jul]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 036/125] ARM: tegra: wm8903: Fix polarity of headphones-detection GPIO in device-trees
    Date
    From: Dmitry Osipenko <digetx@gmail.com>

    [ Upstream commit 5f45da704de425d74abd75feaa928fc8a3df03ba ]

    All Tegra boards which use WM8903 audio codec are specifying a wrong
    polarity for the headphones detection GPIO. The kernel driver hardcodes
    the polarity to active-low, which is the correct polarity, so we can fix
    the device-trees safely.

    Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
    Signed-off-by: Thierry Reding <treding@nvidia.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/arm/boot/dts/tegra20-acer-a500-picasso.dts | 2 +-
    arch/arm/boot/dts/tegra20-harmony.dts | 2 +-
    arch/arm/boot/dts/tegra20-medcom-wide.dts | 2 +-
    arch/arm/boot/dts/tegra20-plutux.dts | 2 +-
    arch/arm/boot/dts/tegra20-seaboard.dts | 2 +-
    arch/arm/boot/dts/tegra20-tec.dts | 2 +-
    arch/arm/boot/dts/tegra20-ventana.dts | 2 +-
    arch/arm/boot/dts/tegra30-cardhu.dtsi | 2 +-
    8 files changed, 8 insertions(+), 8 deletions(-)

    diff --git a/arch/arm/boot/dts/tegra20-acer-a500-picasso.dts b/arch/arm/boot/dts/tegra20-acer-a500-picasso.dts
    index 068aabcffb13..5d0f0fbba1d2 100644
    --- a/arch/arm/boot/dts/tegra20-acer-a500-picasso.dts
    +++ b/arch/arm/boot/dts/tegra20-acer-a500-picasso.dts
    @@ -1009,7 +1009,7 @@
    nvidia,audio-codec = <&wm8903>;

    nvidia,spkr-en-gpios = <&wm8903 2 GPIO_ACTIVE_HIGH>;
    - nvidia,hp-det-gpios = <&gpio TEGRA_GPIO(W, 2) GPIO_ACTIVE_HIGH>;
    + nvidia,hp-det-gpios = <&gpio TEGRA_GPIO(W, 2) GPIO_ACTIVE_LOW>;
    nvidia,int-mic-en-gpios = <&wm8903 1 GPIO_ACTIVE_HIGH>;
    nvidia,headset;

    diff --git a/arch/arm/boot/dts/tegra20-harmony.dts b/arch/arm/boot/dts/tegra20-harmony.dts
    index 86494cb4d5a1..ae4312eedcbd 100644
    --- a/arch/arm/boot/dts/tegra20-harmony.dts
    +++ b/arch/arm/boot/dts/tegra20-harmony.dts
    @@ -748,7 +748,7 @@

    nvidia,spkr-en-gpios = <&wm8903 2 GPIO_ACTIVE_HIGH>;
    nvidia,hp-det-gpios = <&gpio TEGRA_GPIO(W, 2)
    - GPIO_ACTIVE_HIGH>;
    + GPIO_ACTIVE_LOW>;
    nvidia,int-mic-en-gpios = <&gpio TEGRA_GPIO(X, 0)
    GPIO_ACTIVE_HIGH>;
    nvidia,ext-mic-en-gpios = <&gpio TEGRA_GPIO(X, 1)
    diff --git a/arch/arm/boot/dts/tegra20-medcom-wide.dts b/arch/arm/boot/dts/tegra20-medcom-wide.dts
    index a348ca30e522..b31c9bca16e6 100644
    --- a/arch/arm/boot/dts/tegra20-medcom-wide.dts
    +++ b/arch/arm/boot/dts/tegra20-medcom-wide.dts
    @@ -84,7 +84,7 @@
    nvidia,audio-codec = <&wm8903>;

    nvidia,spkr-en-gpios = <&wm8903 2 GPIO_ACTIVE_HIGH>;
    - nvidia,hp-det-gpios = <&gpio TEGRA_GPIO(W, 2) GPIO_ACTIVE_HIGH>;
    + nvidia,hp-det-gpios = <&gpio TEGRA_GPIO(W, 2) GPIO_ACTIVE_LOW>;

    clocks = <&tegra_car TEGRA20_CLK_PLL_A>,
    <&tegra_car TEGRA20_CLK_PLL_A_OUT0>,
    diff --git a/arch/arm/boot/dts/tegra20-plutux.dts b/arch/arm/boot/dts/tegra20-plutux.dts
    index 378f23b2958b..5811b7006a9b 100644
    --- a/arch/arm/boot/dts/tegra20-plutux.dts
    +++ b/arch/arm/boot/dts/tegra20-plutux.dts
    @@ -52,7 +52,7 @@
    nvidia,audio-codec = <&wm8903>;

    nvidia,spkr-en-gpios = <&wm8903 2 GPIO_ACTIVE_HIGH>;
    - nvidia,hp-det-gpios = <&gpio TEGRA_GPIO(W, 2) GPIO_ACTIVE_HIGH>;
    + nvidia,hp-det-gpios = <&gpio TEGRA_GPIO(W, 2) GPIO_ACTIVE_LOW>;

    clocks = <&tegra_car TEGRA20_CLK_PLL_A>,
    <&tegra_car TEGRA20_CLK_PLL_A_OUT0>,
    diff --git a/arch/arm/boot/dts/tegra20-seaboard.dts b/arch/arm/boot/dts/tegra20-seaboard.dts
    index c24d4a37613e..92d494b8c3d2 100644
    --- a/arch/arm/boot/dts/tegra20-seaboard.dts
    +++ b/arch/arm/boot/dts/tegra20-seaboard.dts
    @@ -911,7 +911,7 @@
    nvidia,audio-codec = <&wm8903>;

    nvidia,spkr-en-gpios = <&wm8903 2 GPIO_ACTIVE_HIGH>;
    - nvidia,hp-det-gpios = <&gpio TEGRA_GPIO(X, 1) GPIO_ACTIVE_HIGH>;
    + nvidia,hp-det-gpios = <&gpio TEGRA_GPIO(X, 1) GPIO_ACTIVE_LOW>;

    clocks = <&tegra_car TEGRA20_CLK_PLL_A>,
    <&tegra_car TEGRA20_CLK_PLL_A_OUT0>,
    diff --git a/arch/arm/boot/dts/tegra20-tec.dts b/arch/arm/boot/dts/tegra20-tec.dts
    index 44ced60315de..10ff09d86efa 100644
    --- a/arch/arm/boot/dts/tegra20-tec.dts
    +++ b/arch/arm/boot/dts/tegra20-tec.dts
    @@ -61,7 +61,7 @@

    nvidia,spkr-en-gpios = <&wm8903 2 GPIO_ACTIVE_HIGH>;
    nvidia,hp-det-gpios = <&gpio TEGRA_GPIO(W, 2)
    - GPIO_ACTIVE_HIGH>;
    + GPIO_ACTIVE_LOW>;

    clocks = <&tegra_car TEGRA20_CLK_PLL_A>,
    <&tegra_car TEGRA20_CLK_PLL_A_OUT0>,
    diff --git a/arch/arm/boot/dts/tegra20-ventana.dts b/arch/arm/boot/dts/tegra20-ventana.dts
    index 055334ae3d28..fe400fb84f02 100644
    --- a/arch/arm/boot/dts/tegra20-ventana.dts
    +++ b/arch/arm/boot/dts/tegra20-ventana.dts
    @@ -686,7 +686,7 @@
    nvidia,audio-codec = <&wm8903>;

    nvidia,spkr-en-gpios = <&wm8903 2 GPIO_ACTIVE_HIGH>;
    - nvidia,hp-det-gpios = <&gpio TEGRA_GPIO(W, 2) GPIO_ACTIVE_HIGH>;
    + nvidia,hp-det-gpios = <&gpio TEGRA_GPIO(W, 2) GPIO_ACTIVE_LOW>;
    nvidia,int-mic-en-gpios = <&gpio TEGRA_GPIO(X, 0)
    GPIO_ACTIVE_HIGH>;
    nvidia,ext-mic-en-gpios = <&gpio TEGRA_GPIO(X, 1)
    diff --git a/arch/arm/boot/dts/tegra30-cardhu.dtsi b/arch/arm/boot/dts/tegra30-cardhu.dtsi
    index dab9989fa760..57aead7d8162 100644
    --- a/arch/arm/boot/dts/tegra30-cardhu.dtsi
    +++ b/arch/arm/boot/dts/tegra30-cardhu.dtsi
    @@ -589,7 +589,7 @@

    nvidia,spkr-en-gpios = <&wm8903 2 GPIO_ACTIVE_HIGH>;
    nvidia,hp-det-gpios = <&gpio TEGRA_GPIO(W, 2)
    - GPIO_ACTIVE_HIGH>;
    + GPIO_ACTIVE_LOW>;

    clocks = <&tegra_car TEGRA30_CLK_PLL_A>,
    <&tegra_car TEGRA30_CLK_PLL_A_OUT0>,
    --
    2.30.2


    \
     
     \ /
      Last update: 2021-07-22 19:35    [W:4.106 / U:0.300 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site