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

Commit a47b3fca authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'mvebu-fixes-4.10-1' of git://git.infradead.org/linux-mvebu into fixes 

Pull "mvebu fixes for 4.10 (part 1)" from Gregory CLEMENT:

More consistent naming for some orion5x based boards helping the
switch to device tree for debian users.

* tag 'mvebu-fixes-4.10-1' of git://git.infradead.org/linux-mvebu:
  ARM: orion5x: fix Makefile for linkstation-lschl.dtb
  ARM: dts: orion5x-lschl: More consistent naming on linkstation series
  ARM: dts: orion5x-lschl: Fix model name
parents 08b3b33f 1a902f6b

arch/arm/boot/dts/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -617,7 +617,7 @@ dtb-$(CONFIG_ARCH_ORION5X) += \ 
	orion5x-lacie-ethernet-disk-mini-v2.dtb \

	orion5x-linkstation-lsgl.dtb \

	orion5x-linkstation-lswtgl.dtb \

	orion5x-lschl.dtb \

	orion5x-linkstation-lschl.dtb \

	orion5x-lswsgl.dtb \

	orion5x-maxtor-shared-storage-2.dtb \

	orion5x-netgear-wnr854t.dtb \

arch/arm/boot/dts/orion5x-lschl.dts→arch/arm/boot/dts/orion5x-linkstation-lschl.dts

+2 −2
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
 * Device Tree file for Buffalo Linkstation LS-CHLv3

 *

 * Copyright (C) 2016 Ash Hughes <ashley.hughes@blueyonder.co.uk>

 * Copyright (C) 2015, 2016

 * Copyright (C) 2015-2017

 * Roger Shimizu <rogershimizu@gmail.com>

 *

 * This file is dual-licensed: you can use it either under the terms
@@ -52,7 +52,7 @@ 
#include <dt-bindings/gpio/gpio.h>



/ {

	model = "Buffalo Linkstation Live v3 (LS-CHL)";

	model = "Buffalo Linkstation LiveV3 (LS-CHL)";

	compatible = "buffalo,lschl", "marvell,orion5x-88f5182", "marvell,orion5x";



	memory { /* 128 MB */