ARM: dts: OMAP: Move interrupt-parent to the root node to avoid duplication

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / arch / arm / boot / dts / am33xx.dtsi

diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
index bb31bff0199830e989ef39259a89b20b4eb5b4a5..470926946ed6e25c198e78c6afb8e560328dd47c 100644 (file)
--- a/arch/arm/boot/dts/am33xx.dtsi
+++ b/arch/arm/boot/dts/am33xx.dtsi
@@ -12,6 +12,7 @@
 
 / {
        compatible = "ti,am33xx";
+       interrupt-parent = <&intc>;
 
        aliases {
                serial0 = &uart1;
@@ -25,6 +26,21 @@
        cpus {
                cpu@0 {
                        compatible = "arm,cortex-a8";
+
+                       /*
+                        * To consider voltage drop between PMIC and SoC,
+                        * tolerance value is reduced to 2% from 4% and
+                        * voltage value is increased as a precaution.
+                        */
+                       operating-points = <
+                               /* kHz    uV */
+                               720000  1285000
+                               600000  1225000
+                               500000  1125000
+                               275000  1125000
+                       >;
+                       voltage-tolerance = <2>; /* 2 percentage */
+                       clock-latency = <300000>; /* From omap-cpufreq driver */
                };
        };
 
@@ -40,6 +56,15 @@
                };
        };
 
+       am33xx_pinmux: pinmux@44e10800 {
+               compatible = "pinctrl-single";
+               reg = <0x44e10800 0x0238>;
+               #address-cells = <1>;
+               #size-cells = <0>;
+               pinctrl-single,register-width = <32>;
+               pinctrl-single,function-mask = <0x7f>;
+       };
+
        /*
         * XXX: Use a flat representation of the AM33XX interconnect.
         * The real AM33XX interconnect network is quite complex.Since
@@ -70,7 +95,6 @@
                        interrupt-controller;
                        #interrupt-cells = <1>;
                        reg = <0x44e07000 0x1000>;
-                       interrupt-parent = <&intc>;
                        interrupts = <96>;
                };
 
@@ -82,7 +106,6 @@
                        interrupt-controller;
                        #interrupt-cells = <1>;
                        reg = <0x4804c000 0x1000>;
-                       interrupt-parent = <&intc>;
                        interrupts = <98>;
                };
 
@@ -94,7 +117,6 @@
                        interrupt-controller;
                        #interrupt-cells = <1>;
                        reg = <0x481ac000 0x1000>;
-                       interrupt-parent = <&intc>;
                        interrupts = <32>;
                };
 
@@ -106,7 +128,6 @@
                        interrupt-controller;
                        #interrupt-cells = <1>;
                        reg = <0x481ae000 0x1000>;
-                       interrupt-parent = <&intc>;
                        interrupts = <62>;
                };
 
@@ -115,7 +136,6 @@
                        ti,hwmods = "uart1";
                        clock-frequency = <48000000>;
                        reg = <0x44e09000 0x2000>;
-                       interrupt-parent = <&intc>;
                        interrupts = <72>;
                        status = "disabled";
                };
@@ -125,7 +145,6 @@
                        ti,hwmods = "uart2";
                        clock-frequency = <48000000>;
                        reg = <0x48022000 0x2000>;
-                       interrupt-parent = <&intc>;
                        interrupts = <73>;
                        status = "disabled";
                };
@@ -135,7 +154,6 @@
                        ti,hwmods = "uart3";
                        clock-frequency = <48000000>;
                        reg = <0x48024000 0x2000>;
-                       interrupt-parent = <&intc>;
                        interrupts = <74>;
                        status = "disabled";
                };
@@ -145,7 +163,6 @@
                        ti,hwmods = "uart4";
                        clock-frequency = <48000000>;
                        reg = <0x481a6000 0x2000>;
-                       interrupt-parent = <&intc>;
                        interrupts = <44>;
                        status = "disabled";
                };
@@ -155,7 +172,6 @@
                        ti,hwmods = "uart5";
                        clock-frequency = <48000000>;
                        reg = <0x481a8000 0x2000>;
-                       interrupt-parent = <&intc>;
                        interrupts = <45>;
                        status = "disabled";
                };
@@ -165,7 +181,6 @@
                        ti,hwmods = "uart6";
                        clock-frequency = <48000000>;
                        reg = <0x481aa000 0x2000>;
-                       interrupt-parent = <&intc>;
                        interrupts = <46>;
                        status = "disabled";
                };
@@ -176,7 +191,6 @@
                        #size-cells = <0>;
                        ti,hwmods = "i2c1";
                        reg = <0x44e0b000 0x1000>;
-                       interrupt-parent = <&intc>;
                        interrupts = <70>;
                        status = "disabled";
                };
@@ -187,7 +201,6 @@
                        #size-cells = <0>;
                        ti,hwmods = "i2c2";
                        reg = <0x4802a000 0x1000>;
-                       interrupt-parent = <&intc>;
                        interrupts = <71>;
                        status = "disabled";
                };
@@ -198,7 +211,6 @@
                        #size-cells = <0>;
                        ti,hwmods = "i2c3";
                        reg = <0x4819c000 0x1000>;
-                       interrupt-parent = <&intc>;
                        interrupts = <30>;
                        status = "disabled";
                };
@@ -207,8 +219,23 @@
                        compatible = "ti,omap3-wdt";
                        ti,hwmods = "wd_timer2";
                        reg = <0x44e35000 0x1000>;
-                       interrupt-parent = <&intc>;
                        interrupts = <91>;
                };
+
+               dcan0: d_can@481cc000 {
+                       compatible = "bosch,d_can";
+                       ti,hwmods = "d_can0";
+                       reg = <0x481cc000 0x2000>;
+                       interrupts = <52>;
+                       status = "disabled";
+               };
+
+               dcan1: d_can@481d0000 {
+                       compatible = "bosch,d_can";
+                       ti,hwmods = "d_can1";
+                       reg = <0x481d0000 0x2000>;
+                       interrupts = <55>;
+                       status = "disabled";
+               };
        };
 };