Merge tag 'davinci-for-v4.7/dt-part2' of git://git.kernel.org/pub/scm/linux/kernel...

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / da850.dtsi

diff --git a/arch/arm/boot/dts/da850.dtsi b/arch/arm/boot/dts/da850.dtsi
index c9bf27d5ee9cc9d27b5af0b56be1188533ebd239..25f0f8e6dde5ecfa7f4452e99706cb72e15d1b7e 100644 (file)
--- a/arch/arm/boot/dts/da850.dtsi
+++ b/arch/arm/boot/dts/da850.dtsi
@@ -19,7 +19,7 @@
                        compatible = "ti,cp-intc";
                        interrupt-controller;
                        #interrupt-cells = <1>;
-                       ti,intc-size = <100>;
+                       ti,intc-size = <101>;
                        reg = <0xfffee000 0x2000>;
                };
        };
@@ -120,7 +120,19 @@
                                        0x4 0x00000004 0x0000000f
                                >;
                        };
-                       spi1_pins: pinmux_spi_pins {
+                       spi0_pins: pinmux_spi0_pins {
+                               pinctrl-single,bits = <
+                                       /* SIMO, SOMI, CLK */
+                                       0xc 0x00001101 0x0000ff0f
+                               >;
+                       };
+                       spi0_cs0_pin: pinmux_spi0_cs0 {
+                               pinctrl-single,bits = <
+                                       /* CS0 */
+                                       0x10 0x00000010 0x000000f0
+                               >;
+                       };
+                       spi1_pins: pinmux_spi1_pins {
                                pinctrl-single,bits = <
                                        /* SIMO, SOMI, CLK */
                                        0x14 0x00110100 0x00ff0f00
@@ -261,13 +273,13 @@
                        dma-names = "rx", "tx";
                        status = "disabled";
                };
-               ehrpwm0: ehrpwm@300000 {
+               ehrpwm0: pwm@300000 {
                        compatible = "ti,da850-ehrpwm", "ti,am33xx-ehrpwm";
                        #pwm-cells = <3>;
                        reg = <0x300000 0x2000>;
                        status = "disabled";
                };
-               ehrpwm1: ehrpwm@302000 {
+               ehrpwm1: pwm@302000 {
                        compatible = "ti,da850-ehrpwm", "ti,am33xx-ehrpwm";
                        #pwm-cells = <3>;
                        reg = <0x302000 0x2000>;
@@ -291,6 +303,16 @@
                        reg = <0x308000 0x80>;
                        status = "disabled";
                };
+               spi0: spi@41000 {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       compatible = "ti,da830-spi";
+                       reg = <0x41000 0x1000>;
+                       num-cs = <6>;
+                       ti,davinci-spi-intr-line = <1>;
+                       interrupts = <20>;
+                       status = "disabled";
+               };
                spi1: spi@30e000 {
                        #address-cells = <1>;
                        #size-cells = <0>;
@@ -308,6 +330,7 @@
                        #address-cells = <1>;
                        #size-cells = <0>;
                        reg = <0x224000 0x1000>;
+                       status = "disabled";
                };
                eth0: ethernet@220000 {
                        compatible = "ti,davinci-dm6467-emac";
@@ -322,6 +345,7 @@
                                        35
                                        36
                                        >;
+                       status = "disabled";
                };
                gpio: gpio@226000 {
                        compatible = "ti,dm6441-gpio";