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

Commit a01a35e0 authored by Gabriel FERNANDEZ's avatar Gabriel FERNANDEZ Committed by Maxime Coquelin
Browse files

ARM: DT: STiH407: Add DRM dt nodes 



This patch adds the DRM/KMS dt nodes.
This node can't be in stih407-family.dtsi file because in the future we
will integrate a new stih418-b2199 board. It's a stih407 family board
with different drm/kms dt nodes.
That is why i created the stih407.dtsi file.

Signed-off-by: default avatarGabriel Fernandez <gabriel.fernandez@linaro.org>
Acked-by: default avatarPeter Griffin <peter.griffin@linaro.org>
Signed-off-by: default avatarMaxime Coquelin <maxime.coquelin@st.com>
parent a59a4d96

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

+1 −2
Original line number Diff line number Diff line
@@ -7,9 +7,8 @@ 
 * published by the Free Software Foundation.

 */

/dts-v1/;

#include "stih407-clock.dtsi"

#include "stih407-family.dtsi"

#include "stihxxx-b2120.dtsi"

#include "stih407.dtsi"

/ {

	model = "STiH407 B2120";

	compatible = "st,stih407-b2120", "st,stih407";

arch/arm/boot/dts/stih407.dtsi

0 → 100644
+151 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2015 STMicroelectronics Limited.

 * Author: Gabriel Fernandez <gabriel.fernandez@linaro.org>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * publishhed by the Free Software Foundation.

 */

#include "stih407-clock.dtsi"

#include "stih407-family.dtsi"

/ {

	soc {

		/* Display */

		vtg_main: sti-vtg-main@8d02800 {

			compatible = "st,vtg";

			reg = <0x8d02800 0x200>;

			interrupts = <GIC_SPI 108 IRQ_TYPE_NONE>;

		};



		vtg_aux: sti-vtg-aux@8d00200 {

			compatible = "st,vtg";

			reg = <0x8d00200 0x100>;

			interrupts = <GIC_SPI 109 IRQ_TYPE_NONE>;

		};



		sti-display-subsystem {

			compatible = "st,sti-display-subsystem";

			#address-cells = <1>;

			#size-cells = <1>;



			assigned-clocks	= <&clk_s_d2_quadfs 0>,

					  <&clk_s_d2_quadfs 0>,

					  <&clk_s_d2_flexgen CLK_PIX_MAIN_DISP>,

					  <&clk_s_d2_flexgen CLK_PIX_AUX_DISP>,

					  <&clk_s_d2_flexgen CLK_PIX_GDP1>,

					  <&clk_s_d2_flexgen CLK_PIX_GDP2>,

					  <&clk_s_d2_flexgen CLK_PIX_GDP3>,

					  <&clk_s_d2_flexgen CLK_PIX_GDP4>;



			assigned-clock-parents = <0>,

						 <0>,

						 <&clk_s_d2_quadfs 0>,

						 <&clk_s_d2_quadfs 0>,

						 <&clk_s_d2_quadfs 0>,

						 <&clk_s_d2_quadfs 0>,

						 <&clk_s_d2_quadfs 0>,

						 <&clk_s_d2_quadfs 0>;



			assigned-clock-rates = <297000000>, <297000000>;



			ranges;



			sti-compositor@9d11000 {

				compatible = "st,stih407-compositor";

				reg = <0x9d11000 0x1000>;



				clock-names = "compo_main",

					      "compo_aux",

					      "pix_main",

					      "pix_aux",

					      "pix_gdp1",

					      "pix_gdp2",

					      "pix_gdp3",

					      "pix_gdp4",

					      "main_parent",

					      "aux_parent";



				clocks = <&clk_s_c0_flexgen CLK_COMPO_DVP>,

					 <&clk_s_c0_flexgen CLK_COMPO_DVP>,

					 <&clk_s_d2_flexgen CLK_PIX_MAIN_DISP>,

					 <&clk_s_d2_flexgen CLK_PIX_AUX_DISP>,

					 <&clk_s_d2_flexgen CLK_PIX_GDP1>,

					 <&clk_s_d2_flexgen CLK_PIX_GDP2>,

					 <&clk_s_d2_flexgen CLK_PIX_GDP3>,

					 <&clk_s_d2_flexgen CLK_PIX_GDP4>,

					 <&clk_s_d2_quadfs 0>,

					 <&clk_s_d2_quadfs 1>;



				reset-names = "compo-main", "compo-aux";

				resets = <&softreset STIH407_COMPO_SOFTRESET>,

					 <&softreset STIH407_COMPO_SOFTRESET>;

				st,vtg = <&vtg_main>, <&vtg_aux>;

			};



			sti-tvout@8d08000 {

				compatible = "st,stih407-tvout";

				reg = <0x8d08000 0x1000>;

				reg-names = "tvout-reg";

				reset-names = "tvout";

				resets = <&softreset STIH407_HDTVOUT_SOFTRESET>;

				#address-cells = <1>;

				#size-cells = <1>;

				assigned-clocks = <&clk_s_d2_flexgen CLK_PIX_HDMI>,

						  <&clk_s_d2_flexgen CLK_TMDS_HDMI>,

						  <&clk_s_d2_flexgen CLK_REF_HDMIPHY>,

						  <&clk_s_d0_flexgen CLK_PCM_0>,

						  <&clk_s_d2_flexgen CLK_PIX_HDDAC>,

						  <&clk_s_d2_flexgen CLK_HDDAC>;



				assigned-clock-parents = <&clk_s_d2_quadfs 0>,

							 <&clk_tmdsout_hdmi>,

							 <&clk_s_d2_quadfs 0>,

							 <&clk_s_d0_quadfs 0>,

							 <&clk_s_d2_quadfs 0>,

							 <&clk_s_d2_quadfs 0>;

				ranges;



				sti-hdmi@8d04000 {

					compatible = "st,stih407-hdmi";

					reg = <0x8d04000 0x1000>;

					reg-names = "hdmi-reg";

					interrupts = <GIC_SPI 106 IRQ_TYPE_NONE>;

					interrupt-names	= "irq";

					clock-names = "pix",

						      "tmds",

						      "phy",

						      "audio",

						      "main_parent",

						      "aux_parent";



					clocks = <&clk_s_d2_flexgen CLK_PIX_HDMI>,

						 <&clk_s_d2_flexgen CLK_TMDS_HDMI>,

						 <&clk_s_d2_flexgen CLK_REF_HDMIPHY>,

						 <&clk_s_d0_flexgen CLK_PCM_0>,

						 <&clk_s_d2_quadfs 0>,

						 <&clk_s_d2_quadfs 1>;



					hdmi,hpd-gpio = <&pio5 3>;

					reset-names = "hdmi";

					resets = <&softreset STIH407_HDMI_TX_PHY_SOFTRESET>;

					ddc = <&hdmiddc>;



				};



				sti-hda@8d02000 {

					compatible = "st,stih407-hda";

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

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

					clock-names = "pix",

						      "hddac",

						      "main_parent",

						      "aux_parent";

					clocks = <&clk_s_d2_flexgen CLK_PIX_HDDAC>,

						 <&clk_s_d2_flexgen CLK_HDDAC>,

						 <&clk_s_d2_quadfs 0>,

						 <&clk_s_d2_quadfs 1>;

				};

			};

		};

	};

};

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

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ 
		};



		/* SSC11 to HDMI */

		i2c@9541000 {

		hdmiddc: i2c@9541000 {

			status = "okay";

			/* HDMI V1.3a supports Standard mode only */

			clock-frequency = <100000>;