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

Merge "DaVinci DT updates for v4.7 (part 2)" from Sekhar Nori:

Second set of DT updates for DaVinci
adding support for SPI0 and some low
priority fixes for ethernet and interrupt
controller.

* tag 'davinci-for-v4.7/dt-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
  ARM: dts: da850: There are 101 interrupts.
  ARM: dts: da850: disable mdio and eth0 in da850.dtsi
  ARM: davinci: da8xx-dt: Add spi0 lookup for clock matching
  ARM: dts: da850: add spi0 to device tree

3 files changed, 33 insertions, 2 deletions

diff --git a/arch/arm/boot/dts/da850-enbw-cmc.dts b/arch/arm/boot/dts/da850-enbw-cmc.dts
index 101d1a16b0ac..14dff3e188ed 100644
--- a/arch/arm/boot/dts/da850-enbw-cmc.dts
+++ b/arch/arm/boot/dts/da850-enbw-cmc.dts
@@ -26,6 +26,12 @@
                 serial2: serial@10d000 {
                         status = "okay";
                 };
+                mdio: mdio@224000 {
+                        status = "okay";
+                };
+                eth0: ethernet@220000 {
+                        status = "okay";
+                };
         };
 };
 
diff --git a/arch/arm/boot/dts/da850.dtsi b/arch/arm/boot/dts/da850.dtsi
index c7e357ee2998..25f0f8e6dde5 100644
--- 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
@@ -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";
diff --git a/arch/arm/mach-davinci/da8xx-dt.c b/arch/arm/mach-davinci/da8xx-dt.c
index 880b94e64816..0ba3dc9963d4 100644
--- a/arch/arm/mach-davinci/da8xx-dt.c
+++ b/arch/arm/mach-davinci/da8xx-dt.c
@@ -40,6 +40,7 @@ static struct of_dev_auxdata da850_auxdata_lookup[] __initdata = {
         OF_DEV_AUXDATA("ti,da850-ecap", 0x01f06000, "ecap", NULL),
         OF_DEV_AUXDATA("ti,da850-ecap", 0x01f07000, "ecap", NULL),
         OF_DEV_AUXDATA("ti,da850-ecap", 0x01f08000, "ecap", NULL),
+        OF_DEV_AUXDATA("ti,da830-spi", 0x01c41000, "spi_davinci.0", NULL),
         OF_DEV_AUXDATA("ti,da830-spi", 0x01f0e000, "spi_davinci.1", NULL),
         OF_DEV_AUXDATA("ns16550a", 0x01c42000, "serial8250.0", NULL),
         OF_DEV_AUXDATA("ns16550a", 0x01d0c000, "serial8250.1", NULL),