diff options
author | Andrey Smirnov <andrew.smirnov@gmail.com> | 2018-12-06 21:41:17 -0200 |
---|---|---|
committer | Shawn Guo <shawnguo@kernel.org> | 2018-12-10 10:03:19 +0800 |
commit | 79da07dec740a42c70963ebacbd2bf8866af9e20 (patch) | |
tree | 8059daf96a0fc722a59ce6102a6a89421cf1fcbb | |
parent | 81c0039b13c11bf77bbca700350d4f25d5cb2ec8 (diff) | |
download | lwn-79da07dec740a42c70963ebacbd2bf8866af9e20.tar.gz lwn-79da07dec740a42c70963ebacbd2bf8866af9e20.zip |
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>
-rw-r--r-- | arch/arm/boot/dts/imx51-zii-rdu1.dts | 17 |
1 files 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 3ca4f9b750b0..9235fd45a824 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 @@ -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 = <®_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 >; |