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

[mirror_ubuntu-zesty-kernel.git] / arch / arm / boot / dts / da850.dtsi

diff --git a/arch/arm/boot/dts/da850.dtsi b/arch/arm/boot/dts/da850.dtsi
index a25a55387db395483f18a4818221ef73de6c6c54..ff13e95af29803e492adf37821eb0a5bd4db2c81 100644 (file)
--- a/arch/arm/boot/dts/da850.dtsi
+++ b/arch/arm/boot/dts/da850.dtsi
@@ -187,8 +187,43 @@
                                        0xc 0x88888888 0xffffffff
                                >;
                        };
+                       lcd_pins: pinmux_lcd_pins {
+                               pinctrl-single,bits = <
+                                       /*
+                                        * LCD_D[2], LCD_D[3], LCD_D[4], LCD_D[5],
+                                        * LCD_D[6], LCD_D[7]
+                                        */
+                                       0x40 0x22222200 0xffffff00
+                                       /*
+                                        * LCD_D[10], LCD_D[11], LCD_D[12], LCD_D[13],
+                                        * LCD_D[14], LCD_D[15], LCD_D[0], LCD_D[1]
+                                        */
+                                       0x44 0x22222222 0xffffffff
+                                       /* LCD_D[8], LCD_D[9] */
+                                       0x48 0x00000022 0x000000ff
+
+                                       /* LCD_PCLK */
+                                       0x48 0x02000000 0x0f000000
+                                       /* LCD_AC_ENB_CS, LCD_VSYNC, LCD_HSYNC */
+                                       0x4c 0x02000022 0x0f0000ff
+                               >;
+                       };
 
                };
+               prictrl: priority-controller@14110 {
+                       compatible = "ti,da850-mstpri";
+                       reg = <0x14110 0x0c>;
+               };
+               cfgchip: chip-controller@1417c {
+                       compatible = "ti,da830-cfgchip", "syscon", "simple-mfd";
+                       reg = <0x1417c 0x14>;
+
+                       usb_phy: usb-phy {
+                               compatible = "ti,da830-usb-phy";
+                               #phy-cells = <1>;
+                               status = "disabled";
+                       };
+               };
                edma0: edma@0 {
                        compatible = "ti,edma3-tpcc";
                        /* eDMA3 CC0: 0x01c0 0000 - 0x01c0 7fff */
@@ -337,6 +372,8 @@
                        num-cs = <6>;
                        ti,davinci-spi-intr-line = <1>;
                        interrupts = <20>;
+                       dmas = <&edma0 14 0>, <&edma0 15 0>;
+                       dma-names = "rx", "tx";
                        status = "disabled";
                };
                spi1: spi@30e000 {
@@ -351,6 +388,16 @@
                        dma-names = "rx", "tx";
                        status = "disabled";
                };
+               usb0: usb@200000 {
+                       compatible = "ti,da830-musb";
+                       reg = <0x200000 0x10000>;
+                       interrupts = <58>;
+                       interrupt-names = "mc";
+                       dr_mode = "otg";
+                       phys = <&usb_phy 0>;
+                       phy-names = "usb-phy";
+                       status = "disabled";
+               };
                mdio: mdio@224000 {
                        compatible = "ti,davinci_mdio";
                        #address-cells = <1>;
@@ -400,6 +447,13 @@
                                <&edma0 0 1>;
                        dma-names = "tx", "rx";
                };
+
+               display: display@213000 {
+                       compatible = "ti,da850-tilcdc";
+                       reg = <0x213000 0x1000>;
+                       interrupts = <52>;
+                       status = "disabled";
+               };
        };
        aemif: aemif@68000000 {
                compatible = "ti,da850-aemif";
@@ -411,4 +465,8 @@
                          1 0 0x68000000 0x00008000>;
                status = "disabled";
        };
+       memctrl: memory-controller@b0000000 {
+               compatible = "ti,da850-ddr-controller";
+               reg = <0xb0000000 0xe8>;
+       };
 };