These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / arch / arm / boot / dts / stih416.dtsi

diff --git a/kernel/arch/arm/boot/dts/stih416.dtsi b/kernel/arch/arm/boot/dts/stih416.dtsi
index eeb7afe..9e3170c 100644 (file)
--- a/kernel/arch/arm/boot/dts/stih416.dtsi
+++ b/kernel/arch/arm/boot/dts/stih416.dtsi
@@ -12,7 +12,8 @@
 
 #include <dt-bindings/phy/phy.h>
 #include <dt-bindings/interrupt-controller/arm-gic.h>
-#include <dt-bindings/reset-controller/stih416-resets.h>
+#include <dt-bindings/reset/stih416-resets.h>
+#include <dt-bindings/interrupt-controller/irq-st.h>
 / {
        L2: cache-controller {
                compatible = "arm,pl310-cache";
@@ -23,6 +24,12 @@
                cache-level = <2>;
        };
 
+       arm-pmu {
+               compatible = "arm,cortex-a9-pmu";
+               interrupt-parent = <&intc>;
+               interrupts = <GIC_PPI 15 IRQ_TYPE_LEVEL_HIGH>;
+       };
+
        soc {
                #address-cells = <1>;
                #size-cells = <1>;
@@ -30,6 +37,12 @@
                ranges;
                compatible      = "simple-bus";
 
+               restart {
+                       compatible = "st,stih416-restart";
+                       st,syscfg = <&syscfg_sbc>;
+                       status = "okay";
+               };
+
                powerdown: powerdown-controller {
                        #reset-cells = <1>;
                        compatible = "st,stih416-powerdown";
@@ -86,6 +99,15 @@
                        reg             = <0xfe4b5100 0x8>;
                };
 
+               irq-syscfg {
+                       compatible    = "st,stih416-irq-syscfg";
+                       st,syscfg     = <&syscfg_cpu>;
+                       st,irq-device = <ST_IRQ_SYSCFG_PMU_0>,
+                                       <ST_IRQ_SYSCFG_PMU_1>;
+                       st,fiq-device = <ST_IRQ_SYSCFG_DISABLED>,
+                                       <ST_IRQ_SYSCFG_DISABLED>;
+               };
+
                serial2: serial@fed32000{
                        compatible      = "st,asc";
                        status          = "disabled";
@@ -104,7 +126,7 @@
                        interrupts      = <0 210 0>;
                        pinctrl-names   = "default";
                        pinctrl-0       = <&pinctrl_sbc_serial1>;
-                       clocks          = <&clk_sysin>;
+                       clocks          = <&clk_sysin>;
                };
 
                i2c@fed40000 {
@@ -445,5 +467,47 @@
                                 <&softreset STIH416_USB3_SOFTRESET>;
                        reset-names = "power", "softreset";
                };
+
+               /* SAS PWM Module */
+               pwm0: pwm@fed10000 {
+                       compatible      = "st,sti-pwm";
+                       status          = "disabled";
+                       #pwm-cells      = <2>;
+                       reg             = <0xfed10000 0x68>;
+
+                       pinctrl-names   = "default";
+                       pinctrl-0 =     <&pinctrl_pwm0_chan0_default
+                                       &pinctrl_pwm0_chan1_default
+                                       &pinctrl_pwm0_chan2_default
+                                       &pinctrl_pwm0_chan3_default>;
+
+                       clock-names     = "pwm";
+                       clocks          = <&clk_sysin>;
+                       st,pwm-num-chan = <4>;
+               };
+
+               /* SBC PWM Module */
+               pwm1: pwm@fe510000 {
+                       compatible      = "st,sti-pwm";
+                       status          = "disabled";
+                       #pwm-cells      = <2>;
+                       reg             = <0xfe510000 0x68>;
+
+                       pinctrl-names   = "default";
+                       pinctrl-0       = <&pinctrl_pwm1_chan0_default
+                                       /*
+                                        * Shared with SBC_OBS_NOTRST.  Don't
+                                        * enable unless you really know what
+                                        * you're doing.
+                                        *
+                                        * &pinctrl_pwm1_chan1_default
+                                        */
+                                       &pinctrl_pwm1_chan2_default
+                                       &pinctrl_pwm1_chan3_default>;
+
+                       clock-names     = "pwm";
+                       clocks          = <&clk_sysin>;
+                       st,pwm-num-chan = <3>;
+               };
        };
 };