ARM: dts: imx: Switch to {hp,mic}-det-gpios

Replace the deprecated "hp-det-gpio" and "mic-det-gpio" properties by
"hp-det-gpios" resp. "mic-det-gpios" in Freescale Generic ASoC Sound
Card device nodes.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

diff --git a/arch/arm/boot/dts/nxp/imx/imx6qdl-sabresd.dtsi b/arch/arm/boot/dts/nxp/imx/imx6qdl-sabresd.dtsi
index dc8298f6db34bd819152e5d2b8cace4138c779d1..7fac1d2aa199a7191ea72afe62d04c81e424d100 100644 (file)
--- a/arch/arm/boot/dts/nxp/imx/imx6qdl-sabresd.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx6qdl-sabresd.dtsi
@@ -113,8 +113,8 @@
                        "DMICDAT", "DMIC";
                mux-int-port = <2>;
                mux-ext-port = <3>;
-               hp-det-gpio = <&gpio7 8 GPIO_ACTIVE_LOW>;
-               mic-det-gpio = <&gpio1 9 GPIO_ACTIVE_LOW>;
+               hp-det-gpios = <&gpio7 8 GPIO_ACTIVE_LOW>;
+               mic-det-gpios = <&gpio1 9 GPIO_ACTIVE_LOW>;
        };
 
        backlight_lvds: backlight-lvds {

diff --git a/arch/arm/boot/dts/nxp/imx/imx6sl-evk.dts b/arch/arm/boot/dts/nxp/imx/imx6sl-evk.dts
index 55cdfa7ea20675a4747fb9d279c99ad904549581..036705b783f487c6269de404ef53aa865d490a38 100644 (file)
--- a/arch/arm/boot/dts/nxp/imx/imx6sl-evk.dts
+++ b/arch/arm/boot/dts/nxp/imx/imx6sl-evk.dts
@@ -108,7 +108,7 @@
                        "IN3R", "AMIC";
                mux-int-port = <2>;
                mux-ext-port = <3>;
-               hp-det-gpio = <&gpio4 19 GPIO_ACTIVE_LOW>;
+               hp-det-gpios = <&gpio4 19 GPIO_ACTIVE_LOW>;
        };
 
        panel {

diff --git a/arch/arm/boot/dts/nxp/imx/imx6sll-evk.dts b/arch/arm/boot/dts/nxp/imx/imx6sll-evk.dts
index 05d6827ea2af3fe62035d5aeedbc79432df02184..814401486792ca136e97bc91ac69675c774d46d5 100644 (file)
--- a/arch/arm/boot/dts/nxp/imx/imx6sll-evk.dts
+++ b/arch/arm/boot/dts/nxp/imx/imx6sll-evk.dts
@@ -157,7 +157,7 @@
                        "IN3R", "AMIC";
                mux-int-port = <2>;
                mux-ext-port = <3>;
-               hp-det-gpio = <&gpio4 24 GPIO_ACTIVE_LOW>;
+               hp-det-gpios = <&gpio4 24 GPIO_ACTIVE_LOW>;
        };
 };
 

diff --git a/arch/arm/boot/dts/nxp/imx/imx6sx-sdb.dtsi b/arch/arm/boot/dts/nxp/imx/imx6sx-sdb.dtsi
index 1beac42c1a2736d0dbaef493f4740388fa1828cd..67cf09e63a638f6383ccdd659b2634670cb8f601 100644 (file)
--- a/arch/arm/boot/dts/nxp/imx/imx6sx-sdb.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx6sx-sdb.dtsi
@@ -167,7 +167,7 @@
                        "IN3R", "AMIC";
                mux-int-port = <2>;
                mux-ext-port = <6>;
-               hp-det-gpio = <&gpio1 17 GPIO_ACTIVE_LOW>;
+               hp-det-gpios = <&gpio1 17 GPIO_ACTIVE_LOW>;
        };
 
        panel {

diff --git a/arch/arm/boot/dts/nxp/imx/imx6ul-14x14-evk.dtsi b/arch/arm/boot/dts/nxp/imx/imx6ul-14x14-evk.dtsi
index b74ee8948a781762bd798316ceac0c33258610f0..0e839bbfea082140dd5ac4744751368969fc67c0 100644 (file)
--- a/arch/arm/boot/dts/nxp/imx/imx6ul-14x14-evk.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx6ul-14x14-evk.dtsi
@@ -68,7 +68,7 @@
                audio-cpu = <&sai2>;
                audio-codec = <&codec>;
                audio-asrc = <&asrc>;
-               hp-det-gpio = <&gpio5 4 0>;
+               hp-det-gpios = <&gpio5 4 0>;
                audio-routing =
                        "Headphone Jack", "HP_L",
                        "Headphone Jack", "HP_R",

diff --git a/arch/arm/boot/dts/nxp/imx/imx7d-sdb.dts b/arch/arm/boot/dts/nxp/imx/imx7d-sdb.dts
index f712537fca161ab95cdd4ec2eb4d59e12b80ecda..6cde84636900bb0065083fe8cf4bf90fa13d57f6 100644 (file)
--- a/arch/arm/boot/dts/nxp/imx/imx7d-sdb.dts
+++ b/arch/arm/boot/dts/nxp/imx/imx7d-sdb.dts
@@ -169,7 +169,7 @@
                model = "wm8960-audio";
                audio-cpu = <&sai1>;
                audio-codec = <&codec>;
-               hp-det-gpio = <&gpio2 28 GPIO_ACTIVE_HIGH>;
+               hp-det-gpios = <&gpio2 28 GPIO_ACTIVE_HIGH>;
                audio-routing =
                        "Headphone Jack", "HP_L",
                        "Headphone Jack", "HP_R",