Merge tag 'sound-fix2-3.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[karo-tx-linux.git] / arch / arm / boot / dts / da850.dtsi

diff --git a/arch/arm/boot/dts/da850.dtsi b/arch/arm/boot/dts/da850.dtsi
index d70ba5504481d90b796872d4c258061cb8de4b4d..8d17346f9702173184da0b61d217f91fc6a1fff1 100644 (file)
--- a/arch/arm/boot/dts/da850.dtsi
+++ b/arch/arm/boot/dts/da850.dtsi
@@ -125,11 +125,33 @@
                                        0x14 0x00000010 0x000000f0
                                >;
                        };
+                       mdio_pins: pinmux_mdio_pins {
+                               pinctrl-single,bits = <
+                                       /* MDIO_CLK, MDIO_D */
+                                       0x10 0x00000088 0x000000ff
+                               >;
+                       };
+                       mii_pins: pinmux_mii_pins {
+                               pinctrl-single,bits = <
+                                       /*
+                                        * MII_TXEN, MII_TXCLK, MII_COL
+                                        * MII_TXD_3, MII_TXD_2, MII_TXD_1
+                                        * MII_TXD_0
+                                        */
+                                       0x8 0x88888880 0xfffffff0
+                                       /*
+                                        * MII_RXER, MII_CRS, MII_RXCLK
+                                        * MII_RXDV, MII_RXD_3, MII_RXD_2
+                                        * MII_RXD_1, MII_RXD_0
+                                        */
+                                       0xc 0x88888888 0xffffffff
+                               >;
+                       };
+
                };
                serial0: serial@1c42000 {
                        compatible = "ns16550a";
                        reg = <0x42000 0x100>;
-                       clock-frequency = <150000000>;
                        reg-shift = <2>;
                        interrupts = <25>;
                        status = "disabled";
@@ -137,7 +159,6 @@
                serial1: serial@1d0c000 {
                        compatible = "ns16550a";
                        reg = <0x10c000 0x100>;
-                       clock-frequency = <150000000>;
                        reg-shift = <2>;
                        interrupts = <53>;
                        status = "disabled";
@@ -145,7 +166,6 @@
                serial2: serial@1d0d000 {
                        compatible = "ns16550a";
                        reg = <0x10d000 0x100>;
-                       clock-frequency = <150000000>;
                        reg-shift = <2>;
                        interrupts = <61>;
                        status = "disabled";
@@ -216,6 +236,26 @@
                        interrupts = <56>;
                        status = "disabled";
                };
+               mdio: mdio@1e24000 {
+                       compatible = "ti,davinci_mdio";
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <0x224000 0x1000>;
+               };
+               eth0: ethernet@1e20000 {
+                       compatible = "ti,davinci-dm6467-emac";
+                       reg = <0x220000 0x4000>;
+                       ti,davinci-ctrl-reg-offset = <0x3000>;
+                       ti,davinci-ctrl-mod-reg-offset = <0x2000>;
+                       ti,davinci-ctrl-ram-offset = <0>;
+                       ti,davinci-ctrl-ram-size = <0x2000>;
+                       local-mac-address = [ 00 00 00 00 00 00 ];
+                       interrupts = <33
+                                       34
+                                       35
+                                       36
+                                       >;
+               };
        };
        nand_cs3@62000000 {
                compatible = "ti,davinci-nand";