lkml.org 
[lkml]   [2019]   [Feb]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.20 140/352] ARM: dts: imx51-zii-rdu1: Do not specify "power-gpio" for hpa1
    Date
    4.20-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    [ Upstream commit 79da07dec740a42c70963ebacbd2bf8866af9e20 ]

    TPA6130A2 SD pin on RDU1 is not really controlled by SoC and instead
    is only meant to notify the system that audio was "muted" by external
    actors. To accommodate that, drop "power-gpio" property of hpa1 node as
    well as specify a name for that GPIO so that userspace can access it.

    Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
    Signed-off-by: Fabio Estevam <festevam@gmail.com>
    Tested-by: Chris Healy <cphealy@gmail.com>
    Signed-off-by: Shawn Guo <shawnguo@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/arm/boot/dts/imx51-zii-rdu1.dts | 17 +++++++++++++----
    1 file changed, 13 insertions(+), 4 deletions(-)

    diff --git a/arch/arm/boot/dts/imx51-zii-rdu1.dts b/arch/arm/boot/dts/imx51-zii-rdu1.dts
    index 69d753cac89a..44985f61c0ba 100644
    --- a/arch/arm/boot/dts/imx51-zii-rdu1.dts
    +++ b/arch/arm/boot/dts/imx51-zii-rdu1.dts
    @@ -477,6 +477,15 @@
    };

    &gpio1 {
    + gpio-line-names = "", "", "", "",
    + "", "", "", "",
    + "", "hp-amp-shutdown-b", "", "",
    + "", "", "", "",
    + "", "", "", "",
    + "", "", "", "",
    + "", "", "", "",
    + "", "", "", "";
    +
    unused-sd3-wp-gpio {
    /*
    * See pinctrl_esdhc1 below for more details on this
    @@ -495,9 +504,6 @@
    hpa1: amp@60 {
    compatible = "ti,tpa6130a2";
    reg = <0x60>;
    - pinctrl-names = "default";
    - pinctrl-0 = <&pinctrl_ampgpio>;
    - power-gpio = <&gpio1 9 GPIO_ACTIVE_HIGH>;
    Vdd-supply = <&reg_3p3v>;
    };

    @@ -671,7 +677,10 @@
    };

    &iomuxc {
    - pinctrl_ampgpio: ampgpiogrp {
    + pinctrl-names = "default";
    + pinctrl-0 = <&pinctrl_hog>;
    +
    + pinctrl_hog: hoggrp {
    fsl,pins = <
    MX51_PAD_GPIO1_9__GPIO1_9 0x5e
    >;
    --
    2.19.1


    \
     
     \ /
      Last update: 2019-02-11 17:07    [W:4.174 / U:0.164 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site