Patchwork ARM: dts: imx51-zii-rdu1: Do not specify "power-gpio" for hpa1

login
register
mail settings
Submitter Fabio Estevam
Date Dec. 6, 2018, 11:41 p.m.
Message ID <1544139677-16904-1-git-send-email-festevam@gmail.com>
Download mbox | patch
Permalink /patch/674837/
State New
Headers show

Comments

Fabio Estevam - Dec. 6, 2018, 11:41 p.m.
From: Andrey Smirnov <andrew.smirnov@gmail.com>

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>
---
 arch/arm/boot/dts/imx51-zii-rdu1.dts | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)
Chris Healy - Dec. 7, 2018, 3:32 a.m.
> From: Andrey Smirnov <andrew.smirnov@gmail.com>
>
> 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>
> ---
>  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 28e9dca..a8220f0 100644
> --- a/arch/arm/boot/dts/imx51-zii-rdu1.dts
> +++ b/arch/arm/boot/dts/imx51-zii-rdu1.dts
> @@ -478,6 +478,15 @@
>  };
>
>  &gpio1 {
> +       gpio-line-names = "", "", "", "",
> +                         "", "", "", "",

Tested-by: Chris Healy <cphealy@gmail.com>
Shawn Guo - Dec. 9, 2018, 12:57 p.m.
On Thu, Dec 06, 2018 at 09:41:17PM -0200, Fabio Estevam wrote:
> From: Andrey Smirnov <andrew.smirnov@gmail.com>
> 
> 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>

Applied, thanks.

Patch

diff --git a/arch/arm/boot/dts/imx51-zii-rdu1.dts b/arch/arm/boot/dts/imx51-zii-rdu1.dts
index 28e9dca..a8220f0 100644
--- a/arch/arm/boot/dts/imx51-zii-rdu1.dts
+++ b/arch/arm/boot/dts/imx51-zii-rdu1.dts
@@ -478,6 +478,15 @@ 
 };
 
 &gpio1 {
+	gpio-line-names = "", "", "", "",
+			  "", "", "", "",
+			  "", "hp-amp-shutdown-b", "", "",
+			  "", "", "", "",
+			  "", "", "", "",
+			  "", "", "", "",
+			  "", "", "", "",
+			  "", "", "", "";
+
 	unused-sd3-wp-gpio {
 		/*
 		 * See pinctrl_esdhc1 below for more details on this
@@ -496,9 +505,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>;
 	};
 
@@ -672,7 +678,10 @@ 
 };
 
 &iomuxc {
-	pinctrl_ampgpio: ampgpiogrp {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_hog>;
+
+	pinctrl_hog: hoggrp {
 		fsl,pins = <
 			MX51_PAD_GPIO1_9__GPIO1_9		0x5e
 		>;