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

Commit 71c554ec authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'sti-dt-for-v4.11' of... 

Merge tag 'sti-dt-for-v4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/pchotard/sti into next/dt

STi dts update:

Enable High Quality Video Data Plane (HQVDP) DT entry
Add DELTA V4L2 video decoder DT entry
Disable unused fdma instances
Fix sti-display-subsystem wrong clock parent's value
Cleanup and update DT entries related to remoteproc

* tag 'sti-dt-for-v4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/pchotard/sti

:
  ARM: dts: STiH407-family: Supply Mailbox properties to delta RProc
  ARM: dts: STiH407-family: Supply mailbox properties to GP0 RProc
  ARM: dts: STiH407-family: update dmu remoteproc node
  ARM: dts: STiH407-family: remove gp1 remoteproc node
  ARM: dts: STiH407-family: remove audio remoteproc node
  ARM: dts: STiH407-family: update gp0_reserved memory region
  ARM: dts: STiH410-family: fix wrong parent clock frequency
  ARM: dts: STiH410: add DELTA dt node
  ARM: dts: STiH407-family: disable fdma1 and fdma2
  ARM: dts: STiH410: add hqvdp node
  ARM: dts: STiH410-B2120: enable sti-hda at board level

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 2d19d35c 2016ead4

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

+16 −42
Original line number Diff line number Diff line
@@ -20,30 +20,15 @@ 
		#size-cells = <1>;

		ranges;



		gp0_reserved: rproc@40000000 {

		gp0_reserved: rproc@45000000 {

			compatible = "shared-dma-pool";

			reg = <0x40000000 0x01000000>;

			reg = <0x45000000 0x00400000>;

			no-map;

			status = "disabled";

		};



		gp1_reserved: rproc@41000000 {

		delta_reserved: rproc@44000000 {

			compatible = "shared-dma-pool";

			reg = <0x41000000 0x01000000>;

			no-map;

			status = "disabled";

		};



		audio_reserved: rproc@42000000 {

			compatible = "shared-dma-pool";

			reg = <0x42000000 0x01000000>;

			no-map;

			status = "disabled";

		};



		dmu_reserved: rproc@43000000 {

			compatible = "shared-dma-pool";

			reg = <0x43000000 0x01000000>;

			reg = <0x44000000 0x01000000>;

			no-map;

		};

	};
@@ -823,37 +808,22 @@ 
			clocks		= <&clk_s_c0_flexgen CLK_ST231_GP_0>;

			clock-frequency	= <600000000>;

			st,syscfg	= <&syscfg_core 0x22c>;

			#mbox-cells = <1>;

			mbox-names = "vq0_rx", "vq0_tx", "vq1_rx", "vq1_tx";

			mboxes = <&mailbox0 0 2>, <&mailbox2 0 1>, <&mailbox0 0 3>, <&mailbox2 0 0>;

		};





		st231_gp1: remote-processor {

			compatible	= "st,st231-rproc";

			memory-region	= <&gp1_reserved>;

			resets		= <&softreset STIH407_ST231_GP1_SOFTRESET>;

			reset-names	= "sw_reset";

			clocks		= <&clk_s_c0_flexgen CLK_ST231_GP_1>;

			clock-frequency = <600000000>;

			st,syscfg	= <&syscfg_core 0x220>;

		};



		st231_audio: remote-processor {

		st231_delta: remote-processor {

			compatible	= "st,st231-rproc";

			memory-region	= <&audio_reserved>;

			resets		= <&softreset STIH407_ST231_AUD_SOFTRESET>;

			reset-names	= "sw_reset";

			clocks		= <&clk_s_c0_flexgen CLK_ST231_AUD_0>;

			clock-frequency	= <600000000>;

			st,syscfg	= <&syscfg_core 0x228>;

		};



		st231_dmu: remote-processor {

			compatible	= "st,st231-rproc";

			memory-region	= <&dmu_reserved>;

			memory-region	= <&delta_reserved>;

			resets		= <&softreset STIH407_ST231_DMU_SOFTRESET>;

			reset-names	= "sw_reset";

			clocks		= <&clk_s_c0_flexgen CLK_ST231_DMU>;

			clock-frequency	= <600000000>;

			st,syscfg	= <&syscfg_core 0x224>;

			#mbox-cells = <1>;

			mbox-names = "vq0_rx", "vq0_tx", "vq1_rx", "vq1_tx";

			mboxes = <&mailbox0 0 0>, <&mailbox3 0 1>, <&mailbox0 0 1>, <&mailbox3 0 0>;

		};



		/* fdma audio */
@@ -889,6 +859,8 @@ 
			interrupts = <GIC_SPI 7 IRQ_TYPE_NONE>;

			dma-channels = <16>;

			#dma-cells = <3>;



			status = "disabled";

		};



		/* fdma free running */
@@ -906,6 +878,8 @@ 
				<&clk_s_c0_flexgen CLK_EXT2F_A9>,

				<&clk_s_c0_flexgen CLK_TX_ICN_DISP_0>,

				<&clk_s_c0_flexgen CLK_EXT2F_A9>;



			status = "disabled";

		};



		sti_sasg_codec: sti-sasg-codec {

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

+6 −0
Original line number Diff line number Diff line
@@ -60,5 +60,11 @@ 
		ehci1: usb@9a83e00 {

			status = "okay";

		};



		sti-display-subsystem {

			sti-hda@8d02000 {

				status = "okay";

			};

		};

	};

};

arch/arm/boot/dts/stih410.dtsi

+23 −1
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ 
						 <&clk_s_d2_quadfs 0>;



			assigned-clock-rates = <297000000>,

					       <108000000>,

					       <297000000>,

					       <0>,

					       <400000000>,

					       <400000000>;
@@ -221,6 +221,7 @@ 


			sti-hda@8d02000 {

				compatible = "st,stih407-hda";

				status = "disabled";

				reg = <0x8d02000 0x400>, <0x92b0120 0x4>;

				reg-names = "hda-reg", "video-dacs-ctrl";

				clock-names = "pix",
@@ -232,6 +233,17 @@ 
					 <&clk_s_d2_quadfs 0>,

					 <&clk_s_d2_quadfs 1>;

			};



			sti-hqvdp@9c000000 {

				compatible = "st,stih407-hqvdp";

				reg = <0x9C00000 0x100000>;

				clock-names = "hqvdp", "pix_main";

				clocks = <&clk_s_c0_flexgen CLK_MAIN_DISP>,

					 <&clk_s_d2_flexgen CLK_PIX_MAIN_DISP>;

				reset-names = "hqvdp";

				resets = <&softreset STIH407_HDQVDP_SOFTRESET>;

				st,vtg = <&vtg_main>;

			};

		};



		bdisp0:bdisp@9f10000 {
@@ -259,5 +271,15 @@ 
			clocks = <&clk_sysin>;

			interrupts = <GIC_SPI 205 IRQ_TYPE_EDGE_RISING>;

		};



		delta0 {

			compatible = "st,st-delta";

			clock-names = "delta",

				      "delta-st231",

				      "delta-flash-promip";

			clocks = <&clk_s_c0_flexgen CLK_VID_DMU>,

				 <&clk_s_c0_flexgen CLK_ST231_DMU>,

				 <&clk_s_c0_flexgen CLK_FLASH_PROMIP>;

		};

	};

};