Merge commit '81fd23e2b3ccf71c807e671444e8accaba98ca53' of https://git.pengutronix...
[linux-2.6-microblaze.git] / arch / arm / boot / dts / am33xx-l4.dtsi
index 039a9ab..859e760 100644 (file)
                                #mbox-cells = <1>;
                                ti,mbox-num-users = <4>;
                                ti,mbox-num-fifos = <8>;
-                               mbox_wkupm3: wkup_m3 {
+                               mbox_wkupm3: mbox-wkup-m3 {
                                        ti,mbox-send-noirq;
                                        ti,mbox-tx = <0 0 0>;
                                        ti,mbox-rx = <0 0 3>;
                        };
                };
 
-               target-module@ae000 {                   /* 0x481ae000, ap 56 3a.0 */
+               gpio3_target: target-module@ae000 {             /* 0x481ae000, ap 56 3a.0 */
                        compatible = "ti,sysc-omap2", "ti,sysc";
                        reg = <0xae000 0x4>,
                              <0xae010 0x4>,
                                status = "disabled";
                                ranges = <0 0 0x1000>;
 
-                               ecap0: ecap@100 {
-                                       compatible = "ti,am3352-ecap",
-                                                    "ti,am33xx-ecap";
+                               ecap0: pwm@100 {
+                                       compatible = "ti,am3352-ecap";
                                        #pwm-cells = <3>;
                                        reg = <0x100 0x80>;
                                        clocks = <&l4ls_gclk>;
                                        clock-names = "fck";
-                                       interrupts = <31>;
-                                       interrupt-names = "ecap0";
                                        status = "disabled";
                                };
 
                                };
 
                                ehrpwm0: pwm@200 {
-                                       compatible = "ti,am3352-ehrpwm",
-                                                    "ti,am33xx-ehrpwm";
+                                       compatible = "ti,am3352-ehrpwm";
                                        #pwm-cells = <3>;
                                        reg = <0x200 0x80>;
                                        clocks = <&ehrpwm0_tbclk>, <&l4ls_gclk>;
                                status = "disabled";
                                ranges = <0 0 0x1000>;
 
-                               ecap1: ecap@100 {
-                                       compatible = "ti,am3352-ecap",
-                                                    "ti,am33xx-ecap";
+                               ecap1: pwm@100 {
+                                       compatible = "ti,am3352-ecap";
                                        #pwm-cells = <3>;
                                        reg = <0x100 0x80>;
                                        clocks = <&l4ls_gclk>;
                                        clock-names = "fck";
-                                       interrupts = <47>;
-                                       interrupt-names = "ecap1";
                                        status = "disabled";
                                };
 
                                };
 
                                ehrpwm1: pwm@200 {
-                                       compatible = "ti,am3352-ehrpwm",
-                                                    "ti,am33xx-ehrpwm";
+                                       compatible = "ti,am3352-ehrpwm";
                                        #pwm-cells = <3>;
                                        reg = <0x200 0x80>;
                                        clocks = <&ehrpwm1_tbclk>, <&l4ls_gclk>;
                                status = "disabled";
                                ranges = <0 0 0x1000>;
 
-                               ecap2: ecap@100 {
-                                       compatible = "ti,am3352-ecap",
-                                                    "ti,am33xx-ecap";
+                               ecap2: pwm@100 {
+                                       compatible = "ti,am3352-ecap";
                                        #pwm-cells = <3>;
                                        reg = <0x100 0x80>;
                                        clocks = <&l4ls_gclk>;
                                        clock-names = "fck";
-                                       interrupts = <61>;
-                                       interrupt-names = "ecap2";
                                        status = "disabled";
                                };
 
                                };
 
                                ehrpwm2: pwm@200 {
-                                       compatible = "ti,am3352-ehrpwm",
-                                                    "ti,am33xx-ehrpwm";
+                                       compatible = "ti,am3352-ehrpwm";
                                        #pwm-cells = <3>;
                                        reg = <0x200 0x80>;
                                        clocks = <&ehrpwm2_tbclk>, <&l4ls_gclk>;