leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

DaVinci DT updates for v3.12

Browse Source 
----------------------------
 
 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.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.10 (GNU/Linux)
 
 iQIcBAABAgAGBQJSFRjpAAoJEGFBu2jqvgRN0n8P/iHP7wG0dp1O4JOgGYWQoSN7
 SXT+cCnwzQoSzuuhHH40ZfGPz+UMiBuvzC77U8gwj77ZMCj0a3thBpTU4MuZKSG3
 ePJL+9571FUH6erAybeCvwAew/3lFYbXcnatRDCyZ6drGv3be02uaYqAtYe6xXdJ
 lO7rS903M/8eIXzlVVwMNr4zC+//EfbpfGtRyibpemN2rwO1EtPYM/Hr7GKjnxRm
 AJ/Z0ODk0Atc/ThSWPzifjEaYnlVh+5VEioVk3HESWTBzWxx0JP+yzK0iWkzRb6g
 rnpFPWTz4doKlqO2nUIFFeqL+nrNGzLD8a/TEncvMQP3seFo/rrqf/5mM4M9zxkB
 rHAA8MHHHElqSsMOvJLBZ81eUhDVj0SnIihZmzKgJF/EzF+My9c4/BQfwSfbogdw
 RaN3/vbdjWenlqWW19tvMqrWiPsHecsolc6kUpRknJhpfk/f5pJjCEGBiWdHHTYh
 qX9yjtwXvxQR2jM/UOTZIIR+En9thWffzeJSo6p9rEr+bPuK+N2U05t8O/KsLom1
 i7FvMFQA5Jg3vHfMZo6gSMgPzFrsPm7yxECllwXbuBs2xYTAXgzSXwttqsGgH8pE
 iUyAGnHgi5ke2b9qTsy5iyWO/1VDFLaY+ohoR7AVKx126wQAkCx4XNz/7yl2YArZ
 10dBn4oxPi+6Zcwk9gbT
 =7jwl
 -----END PGP SIGNATURE-----

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

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>
This commit is contained in:
Kevin Hilman 2013-08-22 12:07:15 -07:00
commit 0703150224
3 changed files with 57 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
arch/arm/boot/dts/da850-evm.dts
View File

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

46
arch/arm/boot/dts/da850.dtsi
View File

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

3
arch/arm/mach-davinci/da8xx-dt.c
View File

@ -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),
{}
};