| Message ID | 7ff1bfb73a6d6fc71f3d751dbb7133b045853f64.1727438777.git.geert+renesas@glider.be |
|---|---|
| State | New |
| Headers | show |
| Series | ASoC: Clean up {hp,mic}-det-gpio handling | expand |
On 27/09/2024 14:42, Geert Uytterhoeven wrote: > 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> > --- > This has a run-time dependency on "ASoC: fsl-asoc-card: Add missing > handling of {hp,mic}-dt-gpios". Therefore this should wait a cycle. Patch is good, although maybe we should keep both properties for backwards compatibility? Subject: drop "nxp" prefix. > --- > arch/arm/boot/dts/nxp/imx/imx6qdl-sabresd.dtsi | 4 ++-- > arch/arm/boot/dts/nxp/imx/imx6sl-evk.dts | 2 +- > arch/arm/boot/dts/nxp/imx/imx6sll-evk.dts | 2 +- > arch/arm/boot/dts/nxp/imx/imx6sx-sdb.dtsi | 2 +- > arch/arm/boot/dts/nxp/imx/imx6ul-14x14-evk.dtsi | 2 +- > arch/arm/boot/dts/nxp/imx/imx7d-sdb.dts | 2 +- Best regards, Krzysztof
On Fri, Sep 27, 2024 at 8:00 AM Krzysztof Kozlowski <krzk@kernel.org> wrote: > > On 27/09/2024 14:42, Geert Uytterhoeven wrote: > > 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> > > --- > > This has a run-time dependency on "ASoC: fsl-asoc-card: Add missing > > handling of {hp,mic}-dt-gpios". > > Therefore this should wait a cycle. Patch is good, although maybe we > should keep both properties for backwards compatibility? I also wonder what the point of the customer fsl-asoc-card is when used in conjunction with a standard audio codec because the simple audio card works just fine. I think they have some special drivers that need it like their ARC/eARC and HDMI drivers, but I have tested several NXP boards using a simple sound card and it works fine. adam > > Subject: drop "nxp" prefix. > > > --- > > arch/arm/boot/dts/nxp/imx/imx6qdl-sabresd.dtsi | 4 ++-- > > arch/arm/boot/dts/nxp/imx/imx6sl-evk.dts | 2 +- > > arch/arm/boot/dts/nxp/imx/imx6sll-evk.dts | 2 +- > > arch/arm/boot/dts/nxp/imx/imx6sx-sdb.dtsi | 2 +- > > arch/arm/boot/dts/nxp/imx/imx6ul-14x14-evk.dtsi | 2 +- > > arch/arm/boot/dts/nxp/imx/imx7d-sdb.dts | 2 +- > > > Best regards, > Krzysztof >
On Fri, Sep 27, 2024 at 02:42:25PM +0200, Geert Uytterhoeven wrote: > 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> Applied, thanks!
diff --git a/arch/arm/boot/dts/nxp/imx/imx6qdl-sabresd.dtsi b/arch/arm/boot/dts/nxp/imx/imx6qdl-sabresd.dtsi index 8f4f5fba68cc5f4f..86a86dc370c4a9fb 100644 --- a/arch/arm/boot/dts/nxp/imx/imx6qdl-sabresd.dtsi +++ b/arch/arm/boot/dts/nxp/imx/imx6qdl-sabresd.dtsi @@ -113,8 +113,8 @@ sound { "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 7c899291ab0dada4..542d633651f24575 100644 --- a/arch/arm/boot/dts/nxp/imx/imx6sl-evk.dts +++ b/arch/arm/boot/dts/nxp/imx/imx6sl-evk.dts @@ -108,7 +108,7 @@ sound { "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 febc2dd9967de69e..c5383158e25c959b 100644 --- a/arch/arm/boot/dts/nxp/imx/imx6sll-evk.dts +++ b/arch/arm/boot/dts/nxp/imx/imx6sll-evk.dts @@ -157,7 +157,7 @@ sound { "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 277a6e039045b575..ddd01b6dee5a9976 100644 --- a/arch/arm/boot/dts/nxp/imx/imx6sx-sdb.dtsi +++ b/arch/arm/boot/dts/nxp/imx/imx6sx-sdb.dtsi @@ -167,7 +167,7 @@ sound { "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 b74ee8948a781762..0e839bbfea082140 100644 --- 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 @@ sound-wm8960 { 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 f712537fca161ab9..6cde84636900bb00 100644 --- a/arch/arm/boot/dts/nxp/imx/imx7d-sdb.dts +++ b/arch/arm/boot/dts/nxp/imx/imx7d-sdb.dts @@ -169,7 +169,7 @@ sound { 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",
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> --- This has a run-time dependency on "ASoC: fsl-asoc-card: Add missing handling of {hp,mic}-dt-gpios". --- arch/arm/boot/dts/nxp/imx/imx6qdl-sabresd.dtsi | 4 ++-- arch/arm/boot/dts/nxp/imx/imx6sl-evk.dts | 2 +- arch/arm/boot/dts/nxp/imx/imx6sll-evk.dts | 2 +- arch/arm/boot/dts/nxp/imx/imx6sx-sdb.dtsi | 2 +- arch/arm/boot/dts/nxp/imx/imx6ul-14x14-evk.dtsi | 2 +- arch/arm/boot/dts/nxp/imx/imx7d-sdb.dts | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-)