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 226cda76e77c74439e7d09bab01ea4bb1b0ef85a..25f0f8e6dde5ecfa7f4452e99706cb72e15d1b7e 100644 (file)
--- a/arch/arm/boot/dts/da850.dtsi
+++ b/arch/arm/boot/dts/da850.dtsi
@@ -15,15 +15,15 @@
                #address-cells = <1>;
                #size-cells = <1>;
                ranges;
-               intc: interrupt-controller {
+               intc: interrupt-controller@fffee000 {
                        compatible = "ti,cp-intc";
                        interrupt-controller;
                        #interrupt-cells = <1>;
-                       ti,intc-size = <100>;
+                       ti,intc-size = <101>;
                        reg = <0xfffee000 0x2000>;
                };
        };
-       soc {
+       soc@1c00000 {
                compatible = "simple-bus";
                model = "da850";
                #address-cells = <1>;
@@ -31,7 +31,7 @@
                ranges = <0x0 0x01c00000 0x400000>;
                interrupt-parent = <&intc>;
 
-               pmx_core: pinmux@1c14120 {
+               pmx_core: pinmux@14120 {
                        compatible = "pinctrl-single";
                        reg = <0x14120 0x50>;
                        #address-cells = <1>;
@@ -63,6 +63,12 @@
                                        0x10 0x00002200 0x0000ff00
                                >;
                        };
+                       i2c1_pins: pinmux_i2c1_pins {
+                               pinctrl-single,bits = <
+                                       /* I2C1_SDA, I2C1_SCL */
+                                       0x10 0x00440000 0x00ff0000
+                               >;
+                       };
                        mmc0_pins: pinmux_mmc_pins {
                                pinctrl-single,bits = <
                                        /* MMCSD0_DAT[3] MMCSD0_DAT[2]
@@ -114,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
@@ -150,7 +168,7 @@
                        };
 
                };
-               edma0: edma@01c00000 {
+               edma0: edma@0 {
                        compatible = "ti,edma3-tpcc";
                        /* eDMA3 CC0: 0x01c0 0000 - 0x01c0 7fff */
                        reg =   <0x0 0x8000>;
@@ -161,19 +179,19 @@
 
                        ti,tptcs = <&edma0_tptc0 7>, <&edma0_tptc1 0>;
                };
-               edma0_tptc0: tptc@01c08000 {
+               edma0_tptc0: tptc@8000 {
                        compatible = "ti,edma3-tptc";
                        reg =   <0x8000 0x400>;
                        interrupts = <13>;
                        interrupt-names = "edm3_tcerrint";
                };
-               edma0_tptc1: tptc@01c08400 {
+               edma0_tptc1: tptc@8400 {
                        compatible = "ti,edma3-tptc";
                        reg =   <0x8400 0x400>;
                        interrupts = <32>;
                        interrupt-names = "edm3_tcerrint";
                };
-               edma1: edma@01e30000 {
+               edma1: edma@230000 {
                        compatible = "ti,edma3-tpcc";
                        /* eDMA3 CC1: 0x01e3 0000 - 0x01e3 7fff */
                        reg =   <0x230000 0x8000>;
@@ -184,41 +202,41 @@
 
                        ti,tptcs = <&edma1_tptc0 7>;
                };
-               edma1_tptc0: tptc@01e38000 {
+               edma1_tptc0: tptc@238000 {
                        compatible = "ti,edma3-tptc";
                        reg =   <0x238000 0x400>;
                        interrupts = <95>;
                        interrupt-names = "edm3_tcerrint";
                };
-               serial0: serial@1c42000 {
+               serial0: serial@42000 {
                        compatible = "ns16550a";
                        reg = <0x42000 0x100>;
                        reg-shift = <2>;
                        interrupts = <25>;
                        status = "disabled";
                };
-               serial1: serial@1d0c000 {
+               serial1: serial@10c000 {
                        compatible = "ns16550a";
                        reg = <0x10c000 0x100>;
                        reg-shift = <2>;
                        interrupts = <53>;
                        status = "disabled";
                };
-               serial2: serial@1d0d000 {
+               serial2: serial@10d000 {
                        compatible = "ns16550a";
                        reg = <0x10d000 0x100>;
                        reg-shift = <2>;
                        interrupts = <61>;
                        status = "disabled";
                };
-               rtc0: rtc@1c23000 {
+               rtc0: rtc@23000 {
                        compatible = "ti,da830-rtc";
                        reg = <0x23000 0x1000>;
                        interrupts = <19
                                      19>;
                        status = "disabled";
                };
-               i2c0: i2c@1c22000 {
+               i2c0: i2c@22000 {
                        compatible = "ti,davinci-i2c";
                        reg = <0x22000 0x1000>;
                        interrupts = <15>;
@@ -226,12 +244,20 @@
                        #size-cells = <0>;
                        status = "disabled";
                };
-               wdt: wdt@1c21000 {
+               i2c1: i2c@228000 {
+                       compatible = "ti,davinci-i2c";
+                       reg = <0x228000 0x1000>;
+                       interrupts = <51>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       status = "disabled";
+               };
+               wdt: wdt@21000 {
                        compatible = "ti,davinci-wdt";
                        reg = <0x21000 0x1000>;
                        status = "disabled";
                };
-               mmc0: mmc@1c40000 {
+               mmc0: mmc@40000 {
                        compatible = "ti,da830-mmc";
                        reg = <0x40000 0x1000>;
                        interrupts = <16>;
@@ -239,7 +265,7 @@
                        dma-names = "rx", "tx";
                        status = "disabled";
                };
-               mmc1: mmc@1e1b000 {
+               mmc1: mmc@21b000 {
                        compatible = "ti,da830-mmc";
                        reg = <0x21b000 0x1000>;
                        interrupts = <72>;
@@ -247,37 +273,47 @@
                        dma-names = "rx", "tx";
                        status = "disabled";
                };
-               ehrpwm0: ehrpwm@01f00000 {
+               ehrpwm0: pwm@300000 {
                        compatible = "ti,da850-ehrpwm", "ti,am33xx-ehrpwm";
                        #pwm-cells = <3>;
                        reg = <0x300000 0x2000>;
                        status = "disabled";
                };
-               ehrpwm1: ehrpwm@01f02000 {
+               ehrpwm1: pwm@302000 {
                        compatible = "ti,da850-ehrpwm", "ti,am33xx-ehrpwm";
                        #pwm-cells = <3>;
                        reg = <0x302000 0x2000>;
                        status = "disabled";
                };
-               ecap0: ecap@01f06000 {
+               ecap0: ecap@306000 {
                        compatible = "ti,da850-ecap", "ti,am33xx-ecap";
                        #pwm-cells = <3>;
                        reg = <0x306000 0x80>;
                        status = "disabled";
                };
-               ecap1: ecap@01f07000 {
+               ecap1: ecap@307000 {
                        compatible = "ti,da850-ecap", "ti,am33xx-ecap";
                        #pwm-cells = <3>;
                        reg = <0x307000 0x80>;
                        status = "disabled";
                };
-               ecap2: ecap@01f08000 {
+               ecap2: ecap@308000 {
                        compatible = "ti,da850-ecap", "ti,am33xx-ecap";
                        #pwm-cells = <3>;
                        reg = <0x308000 0x80>;
                        status = "disabled";
                };
-               spi1: spi@1f0e000 {
+               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>;
                        compatible = "ti,da830-spi";
@@ -289,13 +325,14 @@
                        dma-names = "rx", "tx";
                        status = "disabled";
                };
-               mdio: mdio@1e24000 {
+               mdio: mdio@224000 {
                        compatible = "ti,davinci_mdio";
                        #address-cells = <1>;
                        #size-cells = <0>;
                        reg = <0x224000 0x1000>;
+                       status = "disabled";
                };
-               eth0: ethernet@1e20000 {
+               eth0: ethernet@220000 {
                        compatible = "ti,davinci-dm6467-emac";
                        reg = <0x220000 0x4000>;
                        ti,davinci-ctrl-reg-offset = <0x3000>;
@@ -308,10 +345,12 @@
                                        35
                                        36
                                        >;
+                       status = "disabled";
                };
-               gpio: gpio@1e26000 {
+               gpio: gpio@226000 {
                        compatible = "ti,dm6441-gpio";
                        gpio-controller;
+                       #gpio-cells = <2>;
                        reg = <0x226000 0x1000>;
                        interrupts = <42 IRQ_TYPE_EDGE_BOTH
                                43 IRQ_TYPE_EDGE_BOTH 44 IRQ_TYPE_EDGE_BOTH
@@ -323,7 +362,7 @@
                        status = "disabled";
                };
 
-               mcasp0: mcasp@01d00000 {
+               mcasp0: mcasp@100000 {
                        compatible = "ti,da830-mcasp-audio";
                        reg = <0x100000 0x2000>,
                              <0x102000 0x400000>;