44 lines
1.6 KiB
Diff
44 lines
1.6 KiB
Diff
From: Roger Shimizu <rogershimizu@gmail.com>
|
|
Date: Mon, 30 Jan 2017 20:07:29 +0900
|
|
Subject: [PATCH 1/2] ARM: dts: orion5x-lschl: Fix model name
|
|
Origin: https://git.kernel.org/next/linux-next/c/d566a78ab13abded6b4acdc9b3fafa8c46f3ed09
|
|
|
|
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>
|
|
---
|
|
arch/arm/boot/dts/orion5x-lschl.dts | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/arch/arm/boot/dts/orion5x-lschl.dts b/arch/arm/boot/dts/orion5x-lschl.dts
|
|
index 7c999b092e06..ee751995c8d0 100644
|
|
--- a/arch/arm/boot/dts/orion5x-lschl.dts
|
|
+++ b/arch/arm/boot/dts/orion5x-lschl.dts
|
|
@@ -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 */
|