Merge tag 'davinci-for-v4.7/dt-part2' of git://git.kernel.org/pub/scm/linux/kernel...
authorArnd Bergmann <arnd@arndb.de>
Tue, 10 May 2016 13:39:18 +0000 (15:39 +0200)
committerArnd Bergmann <arnd@arndb.de>
Tue, 10 May 2016 13:39:18 +0000 (15:39 +0200)
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

arch/arm/boot/dts/da850-enbw-cmc.dts
arch/arm/boot/dts/da850.dtsi
arch/arm/mach-davinci/da8xx-dt.c

index 101d1a16b0ac1763639611d156b011803ca2f0b1..14dff3e188ed5fa83a801c96ddd42adb9e60aad3 100644 (file)
                serial2: serial@10d000 {
                        status = "okay";
                };
+               mdio: mdio@224000 {
+                       status = "okay";
+               };
+               eth0: ethernet@220000 {
+                       status = "okay";
+               };
        };
 };
 
index c7e357ee2998a637509fe6ab9d8286f081382e34..25f0f8e6dde5ecfa7f4452e99706cb72e15d1b7e 100644 (file)
@@ -19,7 +19,7 @@
                        compatible = "ti,cp-intc";
                        interrupt-controller;
                        #interrupt-cells = <1>;
-                       ti,intc-size = <100>;
+                       ti,intc-size = <101>;
                        reg = <0xfffee000 0x2000>;
                };
        };
                                        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
                        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>;
                        #address-cells = <1>;
                        #size-cells = <0>;
                        reg = <0x224000 0x1000>;
+                       status = "disabled";
                };
                eth0: ethernet@220000 {
                        compatible = "ti,davinci-dm6467-emac";
                                        35
                                        36
                                        >;
+                       status = "disabled";
                };
                gpio: gpio@226000 {
                        compatible = "ti,dm6441-gpio";
index 880b94e6481673b14b07e2dad656d4817b74d84f..0ba3dc9963d48937fa8b9af2eaf9d6e70294c9e7 100644 (file)
@@ -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),