Merge tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[cascardo/linux.git] / arch / arm / boot / dts / stih410.dtsi

diff --git a/arch/arm/boot/dts/stih410.dtsi b/arch/arm/boot/dts/stih410.dtsi
index 4031886..a3ef734 100644 (file)
--- a/arch/arm/boot/dts/stih410.dtsi
+++ b/arch/arm/boot/dts/stih410.dtsi
@@ -107,7 +107,10 @@
                        #size-cells = <1>;
 
                        assigned-clocks = <&clk_s_d2_quadfs 0>,
-                                         <&clk_s_d2_quadfs 0>,
+                                         <&clk_s_d2_quadfs 1>,
+                                         <&clk_s_c0_pll1 0>,
+                                         <&clk_s_c0_flexgen CLK_COMPO_DVP>,
+                                         <&clk_s_c0_flexgen CLK_MAIN_DISP>,
                                          <&clk_s_d2_flexgen CLK_PIX_MAIN_DISP>,
                                          <&clk_s_d2_flexgen CLK_PIX_AUX_DISP>,
                                          <&clk_s_d2_flexgen CLK_PIX_GDP1>,
@@ -117,14 +120,21 @@
 
                        assigned-clock-parents = <0>,
                                                 <0>,
+                                                <0>,
+                                                <&clk_s_c0_pll1 0>,
+                                                <&clk_s_c0_pll1 0>,
                                                 <&clk_s_d2_quadfs 0>,
-                                                <&clk_s_d2_quadfs 0>,
+                                                <&clk_s_d2_quadfs 1>,
                                                 <&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>;
+                       assigned-clock-rates = <297000000>,
+                                              <108000000>,
+                                              <0>,
+                                              <400000000>,
+                                              <400000000>;
 
                        ranges;
 
@@ -231,5 +241,23 @@
                        clock-names = "bdisp";
                        clocks = <&clk_s_c0_flexgen CLK_IC_BDISP_0>;
                };
+
+               hva@8c85000 {
+                       compatible = "st,st-hva";
+                       reg = <0x8c85000 0x400>, <0x6000000 0x40000>;
+                       reg-names = "hva_registers", "hva_esram";
+                       interrupts = <GIC_SPI 58 IRQ_TYPE_NONE>,
+                                    <GIC_SPI 59 IRQ_TYPE_NONE>;
+                       clock-names = "clk_hva";
+                       clocks = <&clk_s_c0_flexgen CLK_HVA>;
+               };
+
+               thermal@91a0000 {
+                       compatible = "st,stih407-thermal";
+                       reg = <0x91a0000 0x28>;
+                       clock-names = "thermal";
+                       clocks = <&clk_sysin>;
+                       interrupts = <GIC_SPI 205 IRQ_TYPE_EDGE_RISING>;
+               };
        };
 };