Commit 87adf92b authored by Olof Johansson's avatar Olof Johansson
Browse files

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

Merge "ARM: mvebu: DT changes for v3.17" from Jason Cooper:

mvebu DT changes for v3.17
 - kirkwood
   * add boards net2big and net5big

 - dove
   * add vendor prefix for SolidRun
   * split CuBox into it's variants

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

:
  ARM: kirkwood: fix net5big regulator gpio assignments
  ARM: dts: mvebu: split SolidRun CuBox into variants
  dt-binding: add vendor prefix for SolidRun
  ARM: Kirkwood: Add DT descriptions for net2big and net5big.

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents aaaa10b0 d854fa8a

Documentation/devicetree/bindings/vendor-prefixes.txt

+1 −0
Original line number Diff line number Diff line
@@ -122,6 +122,7 @@ sii Seiko Instruments, Inc. 
sirf	SiRF Technology, Inc.

smsc	Standard Microsystems Corporation

snps 	Synopsys, Inc.

solidrun	SolidRun

spansion	Spansion Inc.

st	STMicroelectronics

ste	ST-Ericsson

arch/arm/boot/dts/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -125,6 +125,8 @@ kirkwood := \ 
	kirkwood-lsxhl.dtb \

	kirkwood-mplcec4.dtb \

	kirkwood-mv88f6281gtw-ge.dtb \

	kirkwood-net2big.dtb \

	kirkwood-net5big.dtb \

	kirkwood-netgear_readynas_duo_v2.dtb \

	kirkwood-netgear_readynas_nv+_v2.dtb \

	kirkwood-ns2.dtb \
@@ -471,6 +473,7 @@ dtb-$(CONFIG_MACH_ARMADA_XP) += \ 
	armada-xp-openblocks-ax3-4.dtb

dtb-$(CONFIG_MACH_DOVE) += dove-cm-a510.dtb \

	dove-cubox.dtb \

	dove-cubox-es.dtb \

	dove-d2plug.dtb \

	dove-d3plug.dtb \

	dove-dove-db.dtb

arch/arm/boot/dts/dove-cubox-es.dts

0 → 100644
+12 −0
Original line number Diff line number Diff line 
#include "dove-cubox.dts"



/ {

	model = "SolidRun CuBox (Engineering Sample)";

	compatible = "solidrun,cubox-es", "solidrun,cubox", "marvell,dove";

};



&sdio0 {

	/* sdio0 card detect is connected to wrong pin on CuBox ES */

	cd-gpios = <&gpio0 12 1>;

	pinctrl-0 = <&pmx_sdio0 &pmx_gpio_12>;

};

arch/arm/boot/dts/dove-cubox.dts

+0 −3
Original line number Diff line number Diff line
@@ -111,9 +111,6 @@ 


&sdio0 {

	status = "okay";

	/* sdio0 card detect is connected to wrong pin on CuBox */

	cd-gpios = <&gpio0 12 1>;

	pinctrl-0 = <&pmx_sdio0 &pmx_gpio_12>;

};



&spi0 {

arch/arm/boot/dts/kirkwood-net2big.dts

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

 * Device Tree file for LaCie 2Big Network v2

 *

 * Copyright (C) 2014

 *

 * Andrew Lunn <andrew@lunn.ch>

 *

 * Based on netxbig_v2-setup.c,

 * Copyright (C) 2010 Simon Guinot <sguinot@lacie.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 "kirkwood.dtsi"

#include "kirkwood-6281.dtsi"

#include "kirkwood-netxbig.dtsi"



/ {

	model = "LaCie 2Big Network v2";

	compatible = "lacie,net2big_v2", "lacie,netxbig", "marvell,kirkwood-88f6281", "marvell,kirkwood";



	memory {

		device_type = "memory";

		reg = <0x00000000 0x10000000>;

	};

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE