mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-05-07 16:17:41 -04:00
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: Biju 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: Geert Uytterhoeven <geert+renesas@glider.be>
This commit is contained in:
committed by
Geert Uytterhoeven
parent
e4d755cfec
commit
c62af12c70
@@ -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;
|
||||
|
||||
@@ -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";
|
||||
|
||||
@@ -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>;
|
||||
};
|
||||
|
||||
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user