arm64: dts: rockchip: Switch to hp-det-gpios

Replace the deprecated "hp-det-gpio" property by "hp-det-gpios" in Audio
Graph Card and Realtek RT5651 Audio Codec device nodes.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Krzysztof Kozlowski <krzk@kernel.org>
Link: https://lore.kernel.org/r/717e7c9527139c3a3e5246dd367a3ad98c5c81b6.1727438777.git.geert+renesas@glider.be
Signed-off-by: Heiko Stuebner <heiko@sntech.de>

diff --git a/arch/arm64/boot/dts/rockchip/rk3368-lba3368.dts b/arch/arm64/boot/dts/rockchip/rk3368-lba3368.dts
index e0cc4da7f392daf92cdce7fe4d99163382cba58b..c08687df326ddc21804efa3fb9692ed50c68df36 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3368-lba3368.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3368-lba3368.dts
@@ -47,7 +47,7 @@
        analog-sound {
                compatible = "audio-graph-card";
                dais = <&i2s_8ch_p0>;
-               hp-det-gpio = <&gpio0 RK_PC7 GPIO_ACTIVE_HIGH>;
+               hp-det-gpios = <&gpio0 RK_PC7 GPIO_ACTIVE_HIGH>;
                label = "alc5640";
                routing = "Mic Jack", "MICBIAS1",
                          "IN1P", "Mic Jack",

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-eaidk-610.dts b/arch/arm64/boot/dts/rockchip/rk3399-eaidk-610.dts
index 1489eb32e266a748daed4a2eef5d6462ba2514d6..80150ff25e02c708899d0e905ba052ad38947407 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-eaidk-610.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-eaidk-610.dts
@@ -545,7 +545,7 @@
                reg = <0x1a>;
                clocks = <&cru SCLK_I2S_8CH_OUT>;
                clock-names = "mclk";
-               hp-det-gpio = <&gpio4 RK_PD4 GPIO_ACTIVE_LOW>;
+               hp-det-gpios = <&gpio4 RK_PD4 GPIO_ACTIVE_LOW>;
                spk-con-gpio = <&gpio0 RK_PB3 GPIO_ACTIVE_HIGH>;
                #sound-dai-cells = <0>;
        };

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4a-plus.dts b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4a-plus.dts
index 725ac3c1f6f6501d3b02f96b436adaba74266e7f..4fc9c13dbec123903dfb80313b6c153d43c13d27 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4a-plus.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4a-plus.dts
@@ -21,5 +21,5 @@
 };
 
 &sound {
-       hp-det-gpio = <&gpio1 RK_PA0 GPIO_ACTIVE_HIGH>;
+       hp-det-gpios = <&gpio1 RK_PA0 GPIO_ACTIVE_HIGH>;
 };

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4b-plus.dts b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4b-plus.dts
index 682e8b7297c180b61bb88696f106e4ad96573ea3..9c741d1a3047e758ea9b96cd6e758d46b956bf27 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4b-plus.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4b-plus.dts
@@ -39,7 +39,7 @@
 };
 
 &sound {
-       hp-det-gpio = <&gpio1 RK_PA0 GPIO_ACTIVE_HIGH>;
+       hp-det-gpios = <&gpio1 RK_PA0 GPIO_ACTIVE_HIGH>;
 };
 
 &uart0 {

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4c.dts b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4c.dts
index 82ad2ca6b5c2fc92ecba428522c110fd4fa5b84b..5dc5505b58e2ee10371adf1d3c25d602c7e8fb66 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4c.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4c.dts
@@ -40,7 +40,7 @@
 };
 
 &sound {
-       hp-det-gpio = <&gpio1 RK_PA0 GPIO_ACTIVE_HIGH>;
+       hp-det-gpios = <&gpio1 RK_PA0 GPIO_ACTIVE_HIGH>;
 };
 
 &spi1 {

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator.dts b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator.dts
index dbec2b7173a0b677a032fa71b5d6e65e33a1ab24..9ef17ac961d3c45156183df33d282d05b71e86e0 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator.dts
@@ -167,7 +167,7 @@
                reg = <0x1a>;
                clocks = <&cru SCLK_I2S_8CH_OUT>;
                clock-names = "mclk";
-               hp-det-gpio = <&gpio4 RK_PC4 GPIO_ACTIVE_LOW>;
+               hp-det-gpios = <&gpio4 RK_PC4 GPIO_ACTIVE_LOW>;
                spk-con-gpio = <&gpio0 RK_PB3 GPIO_ACTIVE_HIGH>;
                #sound-dai-cells = <0>;
        };

diff --git a/arch/arm64/boot/dts/rockchip/rk3588-armsom-sige7.dts b/arch/arm64/boot/dts/rockchip/rk3588-armsom-sige7.dts
index c667704ba985e463567e77be64d6e35164f91763..aefa0d376dd8af20f09a25237f044b9addc7cc0a 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3588-armsom-sige7.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-armsom-sige7.dts
@@ -23,7 +23,7 @@
                compatible = "audio-graph-card";
                dais = <&i2s0_8ch_p0>;
                label = "rk3588-es8316";
-               hp-det-gpio = <&gpio1 RK_PD5 GPIO_ACTIVE_HIGH>;
+               hp-det-gpios = <&gpio1 RK_PD5 GPIO_ACTIVE_HIGH>;
                pinctrl-names = "default";
                pinctrl-0 = <&hp_detect>;
                routing = "MIC2", "Mic Jack",

diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5-itx.dts b/arch/arm64/boot/dts/rockchip/rk3588-rock-5-itx.dts
index d0b922b8d67e85a0f22ea3a1aa3af0fdaa8bd029..e4e6c23c66845066b610329030c018c76d3b37a1 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5-itx.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5-itx.dts
@@ -46,7 +46,7 @@
                compatible = "audio-graph-card";
                label = "rk3588-es8316";
                dais = <&i2s0_8ch_p0>;
-               hp-det-gpio = <&gpio1 RK_PD5 GPIO_ACTIVE_HIGH>;
+               hp-det-gpios = <&gpio1 RK_PD5 GPIO_ACTIVE_HIGH>;
                pinctrl-names = "default";
                pinctrl-0 = <&hp_detect>;
                routing = "MIC2", "Mic Jack",

diff --git a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
index 966bbc582d89b89c0c4847132ce789d6af1cb847..8d3bbfd996560289330687e08f02f8a1e6c6525a 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts
@@ -32,7 +32,7 @@
                          "Headphones", "HPOR";
 
                dais = <&i2s0_8ch_p0>;
-               hp-det-gpio = <&gpio1 RK_PD5 GPIO_ACTIVE_HIGH>;
+               hp-det-gpios = <&gpio1 RK_PD5 GPIO_ACTIVE_HIGH>;
                pinctrl-names = "default";
                pinctrl-0 = <&hp_detect>;
        };