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

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>

diff --git a/arch/arm/boot/dts/imx51-zii-rdu1.dts b/arch/arm/boot/dts/imx51-zii-rdu1.dts
index 3ca4f9b..9235fd4 100644 (file)
--- 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
@@ -502,9 +511,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>;
        };
 
@@ -678,7 +684,10 @@
 };
 
 &iomuxc {
-       pinctrl_ampgpio: ampgpiogrp {
+       pinctrl-names = "default";
+       pinctrl-0 = <&pinctrl_hog>;
+
+       pinctrl_hog: hoggrp {
                fsl,pins = <
                        MX51_PAD_GPIO1_9__GPIO1_9               0x5e
                >;