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

Merge tag 'dt-3.13-2' of git://git.infradead.org/linux-mvebu into next/dt 

From Jason Cooper:
mvebu dt changes for v3.13 (round 2)

 - kirkwood
    - use MBus DT binding for setting up the windows
    - move crypto and nand underneath the mbus node
    - ib62x0 has a u-boot env partition

 - mvebu
    - add the Armada XP matrix board

* tag 'dt-3.13-2' of git://git.infradead.org/linux-mvebu

:
  arm: mvebu: add support for the Armada XP Matrix board
  ARM: kirkwood: ib62x0: add u-boot environment partition
  ARM: kirkwood: Move the nand node under the mbus node
  ARM: kirkwood: Move the crypto node under the mbus node
  ARM: kirkwood: Remove kirkwood_setup_wins and rely on the DT binding

Signed-off-by: default avatarKevin Hilman <khilman@linaro.org>
parents 3197e4a1 7837feff

arch/arm/boot/dts/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -111,6 +111,7 @@ dtb-$(CONFIG_ARCH_MVEBU) += armada-370-db.dtb \ 
	armada-xp-axpwifiap.dtb \

	armada-xp-db.dtb \

	armada-xp-gp.dtb \

	armada-xp-matrix.dtb \

	armada-xp-openblocks-ax3-4.dtb

dtb-$(CONFIG_ARCH_MXC) += \

	imx25-karo-tx25.dtb \

arch/arm/boot/dts/armada-xp-matrix.dts

0 → 100644
+75 −0
Original line number Diff line number Diff line 
/*

 * Device Tree file for Marvell Armada XP Matrix board

 *

 * Copyright (C) 2013 Marvell

 *

 * Lior Amsalem <alior@marvell.com>

 *

 * This file is licensed under the terms of the GNU General Public

 * License version 2.  This program is licensed "as is" without any

 * warranty of any kind, whether express or implied.

 */



/dts-v1/;

#include "armada-xp-mv78460.dtsi"



/ {

	model = "Marvell Armada XP Matrix Board";

	compatible = "marvell,axp-matrix", "marvell,armadaxp-mv78460", "marvell,armadaxp", "marvell,armada-370-xp";



	chosen {

		bootargs = "console=ttyS0,115200 earlyprintk";

	};



	memory {

		device_type = "memory";

		reg = <0 0x00000000 0 0x80000000>; /* 2 GB */

	};



	soc {

		ranges = <MBUS_ID(0xf0, 0x01) 0 0 0xf1000000 0x100000

			  MBUS_ID(0x01, 0x1d) 0 0 0xfff00000 0x100000>;



		internal-regs {

			serial@12000 {

				clock-frequency = <250000000>;

				status = "okay";

			};

			serial@12100 {

				clock-frequency = <250000000>;

				status = "okay";

			};

			serial@12200 {

				clock-frequency = <250000000>;

				status = "okay";

			};

			serial@12300 {

				clock-frequency = <250000000>;

				status = "okay";

			};



			sata@a0000 {

				nr-ports = <2>;

				status = "okay";

			};



			ethernet@30000 {

				status = "okay";

				phy-mode = "sgmii";

			};



			pcie-controller {

				status = "okay";



				pcie@1,0 {

					/* Port 0, Lane 0 */

					status = "okay";

				};

			};



			usb@50000 {

				status = "okay";

			};

		};

	};

};

arch/arm/boot/dts/kirkwood-db-88f6281.dts

+0 −1
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 
	compatible = "marvell,db-88f6281-bp", "marvell,kirkwood-88f6281", "marvell,kirkwood";



	mbus {

		ranges = <MBUS_ID(0xf0, 0x01) 0 0xf1000000 0x100000>;

		pcie-controller {

			status = "okay";

arch/arm/boot/dts/kirkwood-db-88f6282.dts

+0 −1
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 
	compatible = "marvell,db-88f6282-bp", "marvell,kirkwood-88f6282", "marvell,kirkwood";



	mbus {

		ranges = <MBUS_ID(0xf0, 0x01) 0 0xf1000000 0x100000>;

		pcie-controller {

			status = "okay";

arch/arm/boot/dts/kirkwood-db.dtsi

+22 −22
Original line number Diff line number Diff line
@@ -39,7 +39,26 @@ 
			status = "ok";

		};



		nand@3000000 {

		sata@80000 {

			nr-ports = <2>;

			status = "okay";

		};



		ehci@50000 {

			status = "okay";

		};



		mvsdio@90000 {

			pinctrl-0 = <&pmx_sdio_gpios>;

			pinctrl-names = "default";

			wp-gpios = <&gpio1 5 0>;

			cd-gpios = <&gpio1 6 0>;

			status = "okay";

		};

	};

};



&nand {

	pinctrl-0 = <&pmx_nand>;

	pinctrl-names = "default";

	chip-delay = <25>;
@@ -61,25 +80,6 @@ 
	};

};



		sata@80000 {

			nr-ports = <2>;

			status = "okay";

		};



		ehci@50000 {

			status = "okay";

		};



		mvsdio@90000 {

			pinctrl-0 = <&pmx_sdio_gpios>;

			pinctrl-names = "default";

			wp-gpios = <&gpio1 5 0>;

			cd-gpios = <&gpio1 6 0>;

			status = "okay";

		};

	};

};



&mdio {

	status = "okay";

CRA Git | Maintained and supported by SUSTech CRA and CCSE