aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoger Shimizu <rogershimizu@gmail.com>2017-01-30 06:07:29 -0500
committerGregory CLEMENT <gregory.clement@free-electrons.com>2017-01-31 06:19:32 -0500
commit81917bad86a66f2bdcb12b4c10ab1bf333ed25ec (patch)
tree3d56cb771fc5f0a37412e62f99aacc6d21a646c0
parent0c744ea4f77d72b3dcebb7a8f2684633ec79be88 (diff)
ARM: dts: orion5x-lschl: Fix model name
Model name should be consistent with legacy device file, so that user can migrate their system from legacy device support to device-tree safely. Legacy device file is currently removed, but it can be found on 4.8 or previous version of linux: arch/arm/mach-orion5x/ls-chl-setup.c Fixes: f94f268979a2 ("ARM: dts: orion5x: convert ls-chl to FDT") Cc: Ashley Hughes <ashley.hughes@blueyonder.co.uk> Signed-off-by: Roger Shimizu <rogershimizu@gmail.com> Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
-rw-r--r--arch/arm/boot/dts/orion5x-lschl.dts4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/orion5x-lschl.dts b/arch/arm/boot/dts/orion5x-lschl.dts
index 947409252845..ea6c881634b9 100644
--- a/arch/arm/boot/dts/orion5x-lschl.dts
+++ b/arch/arm/boot/dts/orion5x-lschl.dts
@@ -2,7 +2,7 @@
2 * Device Tree file for Buffalo Linkstation LS-CHLv3 2 * Device Tree file for Buffalo Linkstation LS-CHLv3
3 * 3 *
4 * Copyright (C) 2016 Ash Hughes <ashley.hughes@blueyonder.co.uk> 4 * Copyright (C) 2016 Ash Hughes <ashley.hughes@blueyonder.co.uk>
5 * Copyright (C) 2015, 2016 5 * Copyright (C) 2015-2017
6 * Roger Shimizu <rogershimizu@gmail.com> 6 * Roger Shimizu <rogershimizu@gmail.com>
7 * 7 *
8 * This file is dual-licensed: you can use it either under the terms 8 * This file is dual-licensed: you can use it either under the terms
@@ -52,7 +52,7 @@
52#include <dt-bindings/gpio/gpio.h> 52#include <dt-bindings/gpio/gpio.h>
53 53
54/ { 54/ {
55 model = "Buffalo Linkstation Live v3 (LS-CHL)"; 55 model = "Buffalo Linkstation LiveV3 (LS-CHL)";
56 compatible = "buffalo,lschl", "marvell,orion5x-88f5182", "marvell,orion5x"; 56 compatible = "buffalo,lschl", "marvell,orion5x-88f5182", "marvell,orion5x";
57 57
58 memory { /* 128 MB */ 58 memory { /* 128 MB */