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

Commit a6f1c53a authored by Arnaud Pouliquen's avatar Arnaud Pouliquen Committed by Patrice Chotard
Browse files

ARM: dts: STiH407-family: sti sound card field cleaning 



Cleaning of some uni-players and uni-reader fields.
Associated configurations are now handled in driver based
on compatible string.

Signed-off-by: default avatarArnaud Pouliquen <arnaud.pouliquen@st.com>
Acked-by: default avatarPatrice Chotard <patrice.chotard@st.com>
parent 11079647

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

+6 −26
Original line number Original line Diff line number Diff line
@@ -900,7 +900,7 @@ 
		};

		};





		sti_uni_player0: sti-uni-player@8d80000 {

		sti_uni_player0: sti-uni-player@8d80000 {

			compatible = "st,sti-uni-player";

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

			#sound-dai-cells = <0>;

			#sound-dai-cells = <0>;

			st,syscfg = <&syscfg_core>;

			st,syscfg = <&syscfg_core>;

			clocks = <&clk_s_d0_flexgen CLK_PCM_0>;

			clocks = <&clk_s_d0_flexgen CLK_PCM_0>;
@@ -910,17 +910,13 @@ 
			reg = <0x8d80000 0x158>;

			reg = <0x8d80000 0x158>;

			interrupts = <GIC_SPI 84 IRQ_TYPE_NONE>;

			interrupts = <GIC_SPI 84 IRQ_TYPE_NONE>;

			dmas = <&fdma0 2 0 1>;

			dmas = <&fdma0 2 0 1>;

			dai-name = "Uni Player #0 (HDMI)";

			dma-names = "tx";

			dma-names = "tx";

			st,uniperiph-id = <0>;

			st,version = <5>;

			st,mode = "HDMI";





			status		= "disabled";

			status		= "disabled";

		};

		};





		sti_uni_player1: sti-uni-player@8d81000 {

		sti_uni_player1: sti-uni-player@8d81000 {

			compatible = "st,sti-uni-player";

			compatible = "st,stih407-uni-player-pcm-out";

			#sound-dai-cells = <0>;

			#sound-dai-cells = <0>;

			st,syscfg = <&syscfg_core>;

			st,syscfg = <&syscfg_core>;

			clocks = <&clk_s_d0_flexgen CLK_PCM_1>;

			clocks = <&clk_s_d0_flexgen CLK_PCM_1>;
@@ -930,17 +926,13 @@ 
			reg = <0x8d81000 0x158>;

			reg = <0x8d81000 0x158>;

			interrupts = <GIC_SPI 85 IRQ_TYPE_NONE>;

			interrupts = <GIC_SPI 85 IRQ_TYPE_NONE>;

			dmas = <&fdma0 3 0 1>;

			dmas = <&fdma0 3 0 1>;

			dai-name = "Uni Player #1 (PIO)";

			dma-names = "tx";

			dma-names = "tx";

			st,uniperiph-id = <1>;

			st,version = <5>;

			st,mode = "PCM";





			status = "disabled";

			status = "disabled";

		};

		};





		sti_uni_player2: sti-uni-player@8d82000 {

		sti_uni_player2: sti-uni-player@8d82000 {

			compatible = "st,sti-uni-player";

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

			#sound-dai-cells = <0>;

			#sound-dai-cells = <0>;

			st,syscfg = <&syscfg_core>;

			st,syscfg = <&syscfg_core>;

			clocks = <&clk_s_d0_flexgen CLK_PCM_2>;

			clocks = <&clk_s_d0_flexgen CLK_PCM_2>;
@@ -950,17 +942,13 @@ 
			reg = <0x8d82000 0x158>;

			reg = <0x8d82000 0x158>;

			interrupts = <GIC_SPI 86 IRQ_TYPE_NONE>;

			interrupts = <GIC_SPI 86 IRQ_TYPE_NONE>;

			dmas = <&fdma0 4 0 1>;

			dmas = <&fdma0 4 0 1>;

			dai-name = "Uni Player #1 (DAC)";

			dma-names = "tx";

			dma-names = "tx";

			st,uniperiph-id = <2>;

			st,version = <5>;

			st,mode = "PCM";





			status = "disabled";

			status = "disabled";

		};

		};





		sti_uni_player3: sti-uni-player@8d85000 {

		sti_uni_player3: sti-uni-player@8d85000 {

			compatible = "st,sti-uni-player";

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

			#sound-dai-cells = <0>;

			#sound-dai-cells = <0>;

			st,syscfg = <&syscfg_core>;

			st,syscfg = <&syscfg_core>;

			clocks = <&clk_s_d0_flexgen CLK_SPDIFF>;

			clocks = <&clk_s_d0_flexgen CLK_SPDIFF>;
@@ -971,38 +959,30 @@ 
			interrupts = <GIC_SPI 89 IRQ_TYPE_NONE>;

			interrupts = <GIC_SPI 89 IRQ_TYPE_NONE>;

			dmas = <&fdma0 7 0 1>;

			dmas = <&fdma0 7 0 1>;

			dma-names = "tx";

			dma-names = "tx";

			dai-name = "Uni Player #1 (PIO)";

			st,uniperiph-id = <3>;

			st,version = <5>;

			st,mode = "SPDIF";





			status = "disabled";

			status = "disabled";

		};

		};





		sti_uni_reader0: sti-uni-reader@8d83000 {

		sti_uni_reader0: sti-uni-reader@8d83000 {

			compatible = "st,sti-uni-reader";

			compatible = "st,stih407-uni-reader-pcm_in";

			#sound-dai-cells = <0>;

			#sound-dai-cells = <0>;

			st,syscfg = <&syscfg_core>;

			st,syscfg = <&syscfg_core>;

			reg = <0x8d83000 0x158>;

			reg = <0x8d83000 0x158>;

			interrupts = <GIC_SPI 87 IRQ_TYPE_NONE>;

			interrupts = <GIC_SPI 87 IRQ_TYPE_NONE>;

			dmas = <&fdma0 5 0 1>;

			dmas = <&fdma0 5 0 1>;

			dma-names = "rx";

			dma-names = "rx";

			dai-name = "Uni Reader #0 (PCM IN)";

			st,version = <3>;





			status = "disabled";

			status = "disabled";

		};

		};





		sti_uni_reader1: sti-uni-reader@8d84000 {

		sti_uni_reader1: sti-uni-reader@8d84000 {

			compatible = "st,sti-uni-reader";

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

			#sound-dai-cells = <0>;

			#sound-dai-cells = <0>;

			st,syscfg = <&syscfg_core>;

			st,syscfg = <&syscfg_core>;

			reg = <0x8d84000 0x158>;

			reg = <0x8d84000 0x158>;

			interrupts = <GIC_SPI 88 IRQ_TYPE_NONE>;

			interrupts = <GIC_SPI 88 IRQ_TYPE_NONE>;

			dmas = <&fdma0 6 0 1>;

			dmas = <&fdma0 6 0 1>;

			dma-names = "rx";

			dma-names = "rx";

			dai-name = "Uni Reader #1 (HDMI RX)";

			st,version = <3>;





			status = "disabled";

			status = "disabled";

		};

		};