xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Arnd Bergmann
2017-02-06 17:33:51 +01:00
parent 08b3b33f3e 1a902f6b70
commit a47b3fca62
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/boot/dts/Makefile
View File

@@ -617,7 +617,7 @@ dtb-$(CONFIG_ARCH_ORION5X) += \
orion5x-lacie-ethernet-disk-mini-v2.dtb \ orion5x-lacie-ethernet-disk-mini-v2.dtb \
orion5x-linkstation-lsgl.dtb \ orion5x-linkstation-lsgl.dtb \
orion5x-linkstation-lswtgl.dtb \ orion5x-linkstation-lswtgl.dtb \
orion5x-lschl.dtb \ orion5x-linkstation-lschl.dtb \
orion5x-lswsgl.dtb \ orion5x-lswsgl.dtb \
orion5x-maxtor-shared-storage-2.dtb \ orion5x-maxtor-shared-storage-2.dtb \
orion5x-netgear-wnr854t.dtb \ orion5x-netgear-wnr854t.dtb \

4
arch/arm/boot/dts/orion5x-lschl.dts → arch/arm/boot/dts/orion5x-linkstation-lschl.dts
View File

@@ -2,7 +2,7 @@
* Device Tree file for Buffalo Linkstation LS-CHLv3 * Device Tree file for Buffalo Linkstation LS-CHLv3
* *
* Copyright (C) 2016 Ash Hughes <ashley.hughes@blueyonder.co.uk> * Copyright (C) 2016 Ash Hughes <ashley.hughes@blueyonder.co.uk>
* Copyright (C) 2015, 2016 * Copyright (C) 2015-2017
* Roger Shimizu <rogershimizu@gmail.com> * Roger Shimizu <rogershimizu@gmail.com>
* *
* This file is dual-licensed: you can use it either under the terms * This file is dual-licensed: you can use it either under the terms
@@ -52,7 +52,7 @@
#include <dt-bindings/gpio/gpio.h> #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"; compatible = "buffalo,lschl", "marvell,orion5x-88f5182", "marvell,orion5x";
memory { /* 128 MB */ memory { /* 128 MB */