1 files changed, 114 insertions, 16 deletions

diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
index 1460d9b88adf..0d4df90477f7 100644
--- a/arch/arm/boot/dts/am33xx.dtsi
+++ b/arch/arm/boot/dts/am33xx.dtsi
@@ -8,26 +8,33 @@
  * kind, whether express or implied.
  */
 
-/include/ "skeleton.dtsi"
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/pinctrl/am33xx.h>
+
+#include "skeleton.dtsi"
 
 / {
         compatible = "ti,am33xx";
         interrupt-parent = <&intc>;
 
         aliases {
-                serial0 = &uart1;
-                serial1 = &uart2;
-                serial2 = &uart3;
-                serial3 = &uart4;
-                serial4 = &uart5;
-                serial5 = &uart6;
+                serial0 = &uart0;
+                serial1 = &uart1;
+                serial2 = &uart2;
+                serial3 = &uart3;
+                serial4 = &uart4;
+                serial5 = &uart5;
                 d_can0 = &dcan0;
                 d_can1 = &dcan1;
         };
 
         cpus {
+                #address-cells = <1>;
+                #size-cells = <0>;
                 cpu@0 {
                         compatible = "arm,cortex-a8";
+                        device_type = "cpu";
+                        reg = <0>;
 
                         /*
                          * To consider voltage drop between PMIC and SoC,
@@ -133,7 +140,7 @@
                         interrupts = <62>;
                 };
 
-                uart1: serial@44e09000 {
+                uart0: serial@44e09000 {
                         compatible = "ti,omap3-uart";
                         ti,hwmods = "uart1";
                         clock-frequency = <48000000>;
@@ -142,7 +149,7 @@
                         status = "disabled";
                 };
 
-                uart2: serial@48022000 {
+                uart1: serial@48022000 {
                         compatible = "ti,omap3-uart";
                         ti,hwmods = "uart2";
                         clock-frequency = <48000000>;
@@ -151,7 +158,7 @@
                         status = "disabled";
                 };
 
-                uart3: serial@48024000 {
+                uart2: serial@48024000 {
                         compatible = "ti,omap3-uart";
                         ti,hwmods = "uart3";
                         clock-frequency = <48000000>;
@@ -160,7 +167,7 @@
                         status = "disabled";
                 };
 
-                uart4: serial@481a6000 {
+                uart3: serial@481a6000 {
                         compatible = "ti,omap3-uart";
                         ti,hwmods = "uart4";
                         clock-frequency = <48000000>;
@@ -169,7 +176,7 @@
                         status = "disabled";
                 };
 
-                uart5: serial@481a8000 {
+                uart4: serial@481a8000 {
                         compatible = "ti,omap3-uart";
                         ti,hwmods = "uart5";
                         clock-frequency = <48000000>;
@@ -178,7 +185,7 @@
                         status = "disabled";
                 };
 
-                uart6: serial@481aa000 {
+                uart5: serial@481aa000 {
                         compatible = "ti,omap3-uart";
                         ti,hwmods = "uart6";
                         clock-frequency = <48000000>;
@@ -343,6 +350,90 @@
                         ti,hwmods = "usb_otg_hs";
                 };
 
+                epwmss0: epwmss@48300000 {
+                        compatible = "ti,am33xx-pwmss";
+                        reg = <0x48300000 0x10>;
+                        ti,hwmods = "epwmss0";
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        status = "disabled";
+                        ranges = <0x48300100 0x48300100 0x80   /* ECAP */
+                                  0x48300180 0x48300180 0x80   /* EQEP */
+                                  0x48300200 0x48300200 0x80>; /* EHRPWM */
+
+                        ecap0: ecap@48300100 {
+                                compatible = "ti,am33xx-ecap";
+                                #pwm-cells = <3>;
+                                reg = <0x48300100 0x80>;
+                                ti,hwmods = "ecap0";
+                                status = "disabled";
+                        };
+
+                        ehrpwm0: ehrpwm@48300200 {
+                                compatible = "ti,am33xx-ehrpwm";
+                                #pwm-cells = <3>;
+                                reg = <0x48300200 0x80>;
+                                ti,hwmods = "ehrpwm0";
+                                status = "disabled";
+                        };
+                };
+
+                epwmss1: epwmss@48302000 {
+                        compatible = "ti,am33xx-pwmss";
+                        reg = <0x48302000 0x10>;
+                        ti,hwmods = "epwmss1";
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        status = "disabled";
+                        ranges = <0x48302100 0x48302100 0x80   /* ECAP */
+                                  0x48302180 0x48302180 0x80   /* EQEP */
+                                  0x48302200 0x48302200 0x80>; /* EHRPWM */
+
+                        ecap1: ecap@48302100 {
+                                compatible = "ti,am33xx-ecap";
+                                #pwm-cells = <3>;
+                                reg = <0x48302100 0x80>;
+                                ti,hwmods = "ecap1";
+                                status = "disabled";
+                        };
+
+                        ehrpwm1: ehrpwm@48302200 {
+                                compatible = "ti,am33xx-ehrpwm";
+                                #pwm-cells = <3>;
+                                reg = <0x48302200 0x80>;
+                                ti,hwmods = "ehrpwm1";
+                                status = "disabled";
+                        };
+                };
+
+                epwmss2: epwmss@48304000 {
+                        compatible = "ti,am33xx-pwmss";
+                        reg = <0x48304000 0x10>;
+                        ti,hwmods = "epwmss2";
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        status = "disabled";
+                        ranges = <0x48304100 0x48304100 0x80   /* ECAP */
+                                  0x48304180 0x48304180 0x80   /* EQEP */
+                                  0x48304200 0x48304200 0x80>; /* EHRPWM */
+
+                        ecap2: ecap@48304100 {
+                                compatible = "ti,am33xx-ecap";
+                                #pwm-cells = <3>;
+                                reg = <0x48304100 0x80>;
+                                ti,hwmods = "ecap2";
+                                status = "disabled";
+                        };
+
+                        ehrpwm2: ehrpwm@48304200 {
+                                compatible = "ti,am33xx-ehrpwm";
+                                #pwm-cells = <3>;
+                                reg = <0x48304200 0x80>;
+                                ti,hwmods = "ehrpwm2";
+                                status = "disabled";
+                        };
+                };
+
                 mac: ethernet@4a100000 {
                         compatible = "ti,cpsw";
                         ti,hwmods = "cpgmac0";
@@ -394,7 +485,6 @@
                         compatible = "ti,am3352-ocmcram";
                         reg = <0x40300000 0x10000>;
                         ti,hwmods = "ocmcram";
-                        ti,no_idle_on_suspend;
                 };
 
                 wkup_m3: wkup_m3@44d00000 {
@@ -404,13 +494,21 @@
                         ti,hwmods = "wkup_m3";
                 };
 
+                elm: elm@48080000 {
+                        compatible = "ti,am3352-elm";
+                        reg = <0x48080000 0x2000>;
+                        interrupts = <4>;
+                        ti,hwmods = "elm";
+                        status = "disabled";
+                };
+
                 gpmc: gpmc@50000000 {
                         compatible = "ti,am3352-gpmc";
                         ti,hwmods = "gpmc";
                         reg = <0x50000000 0x2000>;
                         interrupts = <100>;
-                        num-cs = <7>;
-                        num-waitpins = <2>;
+                        gpmc,num-cs = <7>;
+                        gpmc,num-waitpins = <2>;
                         #address-cells = <2>;
                         #size-cells = <1>;
                         status = "disabled";