Commit efcd3bab authored by Olof Johansson's avatar Olof Johansson
Browse files

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

mvebu dt for 4.19 (part 1)

 - Add a new Armada 388 based board: helios4
 - Enable SPI flash by default on SolidRun Armada 38x Microsom

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

:
  ARM: dts: armada388-clearfog: drop future changes disclaimer
  ARM: dts: armada388-clearfog: enable spi flash
  ARM: dts: armada388-helios4

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 1b6d7328 96487173

arch/arm/boot/dts/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -1141,6 +1141,7 @@ dtb-$(CONFIG_MACH_ARMADA_38X) += \ 
	armada-388-clearfog-pro.dtb \

	armada-388-db.dtb \

	armada-388-gp.dtb \

	armada-388-helios4.dtb \

	armada-388-rd.dtb

dtb-$(CONFIG_MACH_ARMADA_39X) += \

	armada-398-db.dtb

arch/arm/boot/dts/armada-388-clearfog-base.dts

+0 −5
Original line number Diff line number Diff line
@@ -3,11 +3,6 @@ 
 * Device Tree file for SolidRun Clearfog Base revision A1 rev 2.0 (88F6828)

 *

 *  Copyright (C) 2015 Russell King

 *

 * This board is in development; the contents of this file work with

 * the A1 rev 2.0 of the board, which does not represent final

 * production board.  Things will change, don't expect this file to

 * remain compatible info the future.

 */



/dts-v1/;

arch/arm/boot/dts/armada-388-clearfog-pro.dts

+0 −5
Original line number Diff line number Diff line
@@ -3,11 +3,6 @@ 
 * Device Tree file for SolidRun Clearfog Pro revision A1 rev 2.0 (88F6828)

 *

 *  Copyright (C) 2015 Russell King

 *

 * This board is in development; the contents of this file work with

 * the A1 rev 2.0 of the board, which does not represent final

 * production board.  Things will change, don't expect this file to

 * remain compatible info the future.

 */

#include "armada-388-clearfog.dts"

arch/arm/boot/dts/armada-388-clearfog.dts

+1 −6
Original line number Diff line number Diff line
@@ -3,11 +3,6 @@ 
 * Device Tree file for SolidRun Clearfog Pro revision A1 rev 2.0 (88F6828)

 *

 *  Copyright (C) 2015 Russell King

 *

 * This board is in development; the contents of this file work with

 * the A1 rev 2.0 of the board, which does not represent final

 * production board.  Things will change, don't expect this file to

 * remain compatible info the future.

 */



/dts-v1/;
@@ -235,7 +230,7 @@ 
&spi1 {

	/*

	 * Add SPI CS pins for clearfog:

	 * CS0: W25Q32 (not populated on uSOM)

	 * CS0: W25Q32

	 * CS1:

	 * CS2: mikrobus

	 */

arch/arm/boot/dts/armada-388-clearfog.dtsi

+1 −6
Original line number Diff line number Diff line
@@ -3,11 +3,6 @@ 
 * Device Tree include file for SolidRun Clearfog 88F6828 based boards

 *

 *  Copyright (C) 2015 Russell King

 *

 * This board is in development; the contents of this file work with

 * the A1 rev 2.0 of the board, which does not represent final

 * production board.  Things will change, don't expect this file to

 * remain compatible info the future.

 */



#include "armada-388.dtsi"
@@ -230,7 +225,7 @@ 
&spi1 {

	/*

	 * Add SPI CS pins for clearfog:

	 * CS0: W25Q32 (not populated on uSOM)

	 * CS0: W25Q32

	 * CS1: PIC microcontroller (Pro models)

	 * CS2: mikrobus

	 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE