Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5d16b9e3 authored by Patrice Chotard's avatar Patrice Chotard
Browse files

ARM: dts: STi: Update sound related nodes location 



Move sound node outside soc node and sti_sasg_codec node
as child of syscfg_core node.
This allows to fix the following warning when compiling
dtb with W=1 option:

arch/arm/boot/dts/stih407-b2120.dtb: Warning (unit_address_vs_reg):
Node /soc/sound/simple-audio-card,dai-link@0 has a unit name, but no reg property
arch/arm/boot/dts/stih407-b2120.dtb: Warning (unit_address_vs_reg):
Node /soc/sound/simple-audio-card,dai-link@1 has a unit name, but no reg property
arch/arm/boot/dts/stih407-b2120.dtb: Warning (unit_address_vs_reg):
Node /soc/sound/simple-audio-card,dai-link@2 has a unit name, but no reg property
arch/arm/boot/dts/stih410-b2120.dtb: Warning (simple_bus_reg):
Node /soc/sti-sasg-codec missing or empty reg/ranges property

arch/arm/boot/dts/stih410-b2120.dtb: Warning (unit_address_vs_reg):
Node /soc/sound/simple-audio-card,dai-link@0 has a unit name, but no reg property
arch/arm/boot/dts/stih410-b2120.dtb: Warning (unit_address_vs_reg):
Node /soc/sound/simple-audio-card,dai-link@1 has a unit name, but no reg property
arch/arm/boot/dts/stih410-b2120.dtb: Warning (unit_address_vs_reg):
Node /soc/sound/simple-audio-card,dai-link@2 has a unit name, but no reg property
arch/arm/boot/dts/stih407-b2120.dtb: Warning (simple_bus_reg):
Node /soc/sound missing or empty reg/ranges property
arch/arm/boot/dts/stih410-b2120.dtb: Warning (simple_bus_reg):
Node /soc/sti-sasg-codec missing or empty reg/ranges property

arch/arm/boot/dts/stih410-b2260.dtb: Warning (unit_address_vs_reg):
Node /soc/sound/simple-audio-card,dai-link@0 has a unit name, but no reg property
arch/arm/boot/dts/stih410-b2260.dtb: Warning (simple_bus_reg):
Node /soc/sti-sasg-codec missing or empty reg/ranges property
arch/arm/boot/dts/stih410-b2260.dtb: Warning (simple_bus_reg):
Node /soc/sound missing or empty reg/ranges property

arch/arm/boot/dts/stih418-b2199.dtb: Warning (simple_bus_reg):
Node /soc/sti-sasg-codec missing or empty reg/ranges property

Signed-off-by: default avatarPatrice Chotard <patrice.chotard@st.com>
parent 1d91958f

arch/arm/boot/dts/stih407-family.dtsi

+7 −7
Original line number Diff line number Diff line
@@ -178,6 +178,13 @@ 
		syscfg_core: core-syscfg@92b0000 {

			compatible = "st,stih407-core-syscfg", "syscon";

			reg = <0x92b0000 0x1000>;



			sti_sasg_codec: sti-sasg-codec {

				compatible = "st,stih407-sas-codec";

				#sound-dai-cells = <1>;

				status = "disabled";

				st,syscfg = <&syscfg_core>;

			};

		};



		syscfg_lpm: lpm-syscfg@94b5100 {
@@ -894,13 +901,6 @@ 
			status = "disabled";

		};



		sti_sasg_codec: sti-sasg-codec {

			compatible = "st,stih407-sas-codec";

			#sound-dai-cells = <1>;

			status = "disabled";

			st,syscfg = <&syscfg_core>;

		};



		sti_uni_player0: sti-uni-player@8d80000 {

			compatible = "st,stih407-uni-player-hdmi";

			#sound-dai-cells = <0>;

arch/arm/boot/dts/stih410-b2260.dts

+19 −19
Original line number Diff line number Diff line
@@ -57,6 +57,25 @@ 
		};

	};



	sound: sound {

		compatible = "simple-audio-card";

		simple-audio-card,name = "STI-B2260";

		status = "okay";



		simple-audio-card,dai-link0 {

			/* DAC */

			format = "i2s";

			mclk-fs = <128>;

			cpu {

				sound-dai = <&sti_uni_player0>;

			};



			codec {

				sound-dai = <&sti_hdmi>;

			};

		};

	};



	soc {

		/* Low speed expansion connector */

		uart0: serial@9830000 {
@@ -181,25 +200,6 @@ 
			status = "okay";

		};



		sound {

			compatible = "simple-audio-card";

			simple-audio-card,name = "STI-B2260";

			status = "okay";



			simple-audio-card,dai-link@0 {

				/* DAC */

				format = "i2s";

				mclk-fs = <128>;

				cpu {

					sound-dai = <&sti_uni_player0>;

				};



				codec {

					sound-dai = <&sti_hdmi>;

				};

			};

		};



		miphy28lp_phy: miphy28lp@0 {



			phy_port1: port@9b2a000 {

arch/arm/boot/dts/stihxxx-b2120.dtsi

+51 −47
Original line number Diff line number Diff line
@@ -23,6 +23,52 @@ 
		};

	};



	sound: sound {

		compatible = "simple-audio-card";

		simple-audio-card,name = "STI-B2120";

		status = "okay";



		simple-audio-card,dai-link0 {

			/* HDMI */

			format = "i2s";

			mclk-fs = <128>;

			cpu {

				sound-dai = <&sti_uni_player0>;

			};



			codec {

				sound-dai = <&sti_hdmi>;

			};

		};



		simple-audio-card,dai-link1 {

			/* DAC */

			format = "i2s";

			mclk-fs = <256>;

			frame-inversion = <1>;

			cpu {

				sound-dai = <&sti_uni_player2>;

			};



			codec {

				sound-dai = <&sti_sasg_codec 1>;

			};

		};



		simple-audio-card,dai-link2 {

			/* SPDIF */

			format = "left_j";

			mclk-fs = <128>;

			cpu {

				sound-dai = <&sti_uni_player3>;

			};



			codec {

				sound-dai = <&sti_sasg_codec 0>;

			};

		};

	};



	soc {

		sbc_serial0: serial@9530000 {

			status = "okay";
@@ -147,54 +193,12 @@ 
			status = "okay";

		};



		syscfg_core: core-syscfg@92b0000 {

			sti_sasg_codec: sti-sasg-codec {

				status = "okay";

				pinctrl-names = "default";

				pinctrl-0 = <&pinctrl_spdif_out>;

			};



		sound {

			compatible = "simple-audio-card";

			simple-audio-card,name = "STI-B2120";

			status = "okay";



			simple-audio-card,dai-link@0 {

				/* HDMI */

				format = "i2s";

				mclk-fs = <128>;

				cpu {

					sound-dai = <&sti_uni_player0>;

				};



				codec {

					sound-dai = <&sti_hdmi>;

				};

			};

			simple-audio-card,dai-link@1 {

				/* DAC */

				format = "i2s";

				mclk-fs = <256>;

				frame-inversion = <1>;

				cpu {

					sound-dai = <&sti_uni_player2>;

				};



				codec {

					sound-dai = <&sti_sasg_codec 1>;

				};

			};

			simple-audio-card,dai-link@2 {

				/* SPDIF */

				format = "left_j";

				mclk-fs = <128>;

				cpu {

					sound-dai = <&sti_uni_player3>;

				};



				codec {

					sound-dai = <&sti_sasg_codec 0>;

				};

			};

		};

	};

};