Commit c62af12c authored by Biju Das's avatar Biju Das Committed by Geert Uytterhoeven
Browse files

arm64: dts: renesas: rzg2l-smarc: Move ssi0 and cpu sound_dai nodes from common dtsi 



On RZ/G2{L,LC} SoM module, the wm8978 audio codec is connected to ssi0,
whereas on RZ/G2UL it is connected to ssi1. So move ssi0 and cpu
sound_dai nodes from common dtsi to board specific dtsi.

Signed-off-by: default avatarBiju Das <biju.das.jz@bp.renesas.com>
Link: https://lore.kernel.org/r/20220429072400.23729-2-biju.das.jz@bp.renesas.com


Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
parent e4d755cf

arch/arm64/boot/dts/renesas/r9a07g043u11-smarc.dts

+0 −6
Original line number Diff line number Diff line
@@ -54,12 +54,6 @@ &spi1 { 
	status = "disabled";

};



&ssi0 {

	/delete-property/ pinctrl-0;

	/delete-property/ pinctrl-names;

	status = "disabled";

};



&usb2_phy0 {

	/delete-property/ pinctrl-0;

	/delete-property/ pinctrl-names;

arch/arm64/boot/dts/renesas/rz-smarc-common.dtsi

+0 −8
Original line number Diff line number Diff line
@@ -52,7 +52,6 @@ snd_rzg2l: sound { 
			    "Mic Bias", "Microphone Jack";



		cpu_dai: simple-audio-card,cpu {

			sound-dai = <&ssi0>;

		};



		codec_dai: simple-audio-card,codec {
@@ -168,13 +167,6 @@ &spi1 { 
	status = "okay";

};



&ssi0 {

	pinctrl-0 = <&ssi0_pins>;

	pinctrl-names = "default";



	status = "okay";

};



&usb2_phy0 {

	pinctrl-0 = <&usb0_pins>;

	pinctrl-names = "default";

arch/arm64/boot/dts/renesas/rzg2l-smarc.dtsi

+11 −0
Original line number Diff line number Diff line
@@ -18,6 +18,10 @@ aliases { 
	};

};



&cpu_dai {

	sound-dai = <&ssi0>;

};



&i2c3 {

	pinctrl-0 = <&i2c3_pins>;

	pinctrl-names = "default";
@@ -49,6 +53,13 @@ &scif2 { 
};

#endif



&ssi0 {

	pinctrl-0 = <&ssi0_pins>;

	pinctrl-names = "default";



	status = "okay";

};



&vccq_sdhi1 {

	gpios = <&pinctrl RZG2L_GPIO(39, 1) GPIO_ACTIVE_HIGH>;

};

arch/arm64/boot/dts/renesas/rzg2lc-smarc.dtsi

+11 −0
Original line number Diff line number Diff line
@@ -60,6 +60,10 @@ &canfd { 
};

#endif



&cpu_dai {

	sound-dai = <&ssi0>;

};



&i2c2 {

	pinctrl-0 = <&i2c2_pins>;

	pinctrl-names = "default";
@@ -91,6 +95,13 @@ &scif1 { 
};

#endif



&ssi0 {

	pinctrl-0 = <&ssi0_pins>;

	pinctrl-names = "default";



	status = "okay";

};



#if (SW_RSPI_CAN)

&spi1 {

	/delete-property/ pinctrl-0;