Merge tag 'davinci-for-v3.12/dt' of git://git.kernel.org/pub/scm/linux/kernel/git...

From Sekhar Nori:

DaVinci DT updates for v3.12
----------------------------

This set of patches add ethernet DT nodes
for DA850 and also remove now unneeded
specification of UART clock frequency so
kernel can now boot irrespective of what
the bootloader setting of UART frequency is.

* tag 'davinci-for-v3.12/dt' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
  ARM: davinci: da850: do not specify clock_frequency for UART DT node
  ARM: davinci: da850: add DT node for ethernet
  ARM: davinci: da850: add OF_DEV_AUXDATA entry for davinci_emac
  ARM: davinci: da850: add OF_DEV_AUXDATA entry for mdio.
  ARM: davinci: da850: add DT node for mdio device

Signed-off-by: Kevin Hilman <khilman@linaro.org>

diff --git a/arch/arm/boot/dts/da850-evm.dts b/arch/arm/boot/dts/da850-evm.dts
index 5bce7cc55cf35ba6446ff77803f5aa167899aaea..588ce58a2959f0215b3a6c2b16c0c2b6a502b625 100644 (file)
--- a/arch/arm/boot/dts/da850-evm.dts
+++ b/arch/arm/boot/dts/da850-evm.dts
@@ -90,6 +90,17 @@
                                };
                        };
                };
+               mdio: mdio@1e24000 {
+                       status = "okay";
+                       pinctrl-names = "default";
+                       pinctrl-0 = <&mdio_pins>;
+                       bus_freq = <2200000>;
+               };
+               eth0: ethernet@1e20000 {
+                       status = "okay";
+                       pinctrl-names = "default";
+                       pinctrl-0 = <&mii_pins>;
+               };
        };
        nand_cs3@62000000 {
                status = "okay";

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";

diff --git a/arch/arm/mach-davinci/da8xx-dt.c b/arch/arm/mach-davinci/da8xx-dt.c
index 9683cbd1f6c8f3153ee51f978146c09c49f8fde3..d2bc574ae172cfbfc2671f24372c137baa73056d 100644 (file)
--- a/arch/arm/mach-davinci/da8xx-dt.c
+++ b/arch/arm/mach-davinci/da8xx-dt.c
@@ -43,6 +43,9 @@ static struct of_dev_auxdata da850_auxdata_lookup[] __initdata = {
        OF_DEV_AUXDATA("ns16550a", 0x01c42000, "serial8250.0", NULL),
        OF_DEV_AUXDATA("ns16550a", 0x01d0c000, "serial8250.1", NULL),
        OF_DEV_AUXDATA("ns16550a", 0x01d0d000, "serial8250.2", NULL),
+       OF_DEV_AUXDATA("ti,davinci_mdio", 0x01e24000, "davinci_mdio.0", NULL),
+       OF_DEV_AUXDATA("ti,davinci-dm6467-emac", 0x01e20000, "davinci_emac.1",
+                      NULL),
        {}
 };