Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 07031502 authored by Kevin Hilman's avatar Kevin Hilman
Browse files

Merge tag 'davinci-for-v3.12/dt' of... 

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: default avatarKevin Hilman <khilman@linaro.org>
parents cee7e8bb 29864962

arch/arm/boot/dts/da850-evm.dts

+11 −0
Original line number Original line Diff line number Diff line
@@ -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 {

	nand_cs3@62000000 {

		status = "okay";

		status = "okay";

arch/arm/boot/dts/da850.dtsi

+43 −3
Original line number Original line Diff line number Diff line
@@ -125,11 +125,33 @@ 
					0x14 0x00000010 0x000000f0

					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 {

		serial0: serial@1c42000 {

			compatible = "ns16550a";

			compatible = "ns16550a";

			reg = <0x42000 0x100>;

			reg = <0x42000 0x100>;

			clock-frequency = <150000000>;

			reg-shift = <2>;

			reg-shift = <2>;

			interrupts = <25>;

			interrupts = <25>;

			status = "disabled";

			status = "disabled";
@@ -137,7 +159,6 @@ 
		serial1: serial@1d0c000 {

		serial1: serial@1d0c000 {

			compatible = "ns16550a";

			compatible = "ns16550a";

			reg = <0x10c000 0x100>;

			reg = <0x10c000 0x100>;

			clock-frequency = <150000000>;

			reg-shift = <2>;

			reg-shift = <2>;

			interrupts = <53>;

			interrupts = <53>;

			status = "disabled";

			status = "disabled";
@@ -145,7 +166,6 @@ 
		serial2: serial@1d0d000 {

		serial2: serial@1d0d000 {

			compatible = "ns16550a";

			compatible = "ns16550a";

			reg = <0x10d000 0x100>;

			reg = <0x10d000 0x100>;

			clock-frequency = <150000000>;

			reg-shift = <2>;

			reg-shift = <2>;

			interrupts = <61>;

			interrupts = <61>;

			status = "disabled";

			status = "disabled";
@@ -216,6 +236,26 @@ 
			interrupts = <56>;

			interrupts = <56>;

			status = "disabled";

			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 {

	nand_cs3@62000000 {

		compatible = "ti,davinci-nand";

		compatible = "ti,davinci-nand";

arch/arm/mach-davinci/da8xx-dt.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -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", 0x01c42000, "serial8250.0", NULL),

	OF_DEV_AUXDATA("ns16550a", 0x01d0c000, "serial8250.1", NULL),

	OF_DEV_AUXDATA("ns16550a", 0x01d0c000, "serial8250.1", NULL),

	OF_DEV_AUXDATA("ns16550a", 0x01d0d000, "serial8250.2", 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),

	{}

	{}

};

};