From 28002f99bf623cd8add2961ddd3eb553b31bf83a Mon Sep 17 00:00:00 2001 From: Roger Shimizu Date: Tue, 31 Jan 2017 02:11:17 +0900 Subject: [PATCH] [armel] ARM: dts: orion5x-linkstation-lschl - Fix model name - More consistent naming on linkstation series --- debian/changelog | 6 +++ ...ARM-dts-orion5x-lschl-Fix-model-name.patch | 43 +++++++++++++++++++ ...lschl-More-consistent-naming-on-link.patch | 31 +++++++++++++ debian/patches/series | 2 + 4 files changed, 82 insertions(+) create mode 100644 debian/patches/features/arm/ARM-dts-orion5x-lschl-Fix-model-name.patch create mode 100644 debian/patches/features/arm/ARM-dts-orion5x-lschl-More-consistent-naming-on-link.patch diff --git a/debian/changelog b/debian/changelog index ff3cdf07c..94db72a3f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ linux (4.9.6-4) UNRELEASED; urgency=medium + [ Ben Hutchings ] * Bump ABI to 2 * [or1k] Remove configuration, as the port has been abandoned * [arm64] Enable KEXEC (Closes: #852747) @@ -9,6 +10,11 @@ linux (4.9.6-4) UNRELEASED; urgency=medium USB_CONFIGFS_F_{LB_SS,LS,UAC1,UAC2,MIDI,HID,UVC,PRINTER}, USB_ETH_RNDIS, USB_FUNCTIONFS_{ETH,RNDIS,GENERIC} (thanks to Riku Voipio) + [ Roger Shimizu ] + * [armel] ARM: dts: orion5x-lschl: Fix model name + * [armel] ARM: dts: orion5x-lschl: More consistent naming on linkstation + series + -- Ben Hutchings Fri, 27 Jan 2017 18:14:31 +0000 linux (4.9.6-3) unstable; urgency=medium diff --git a/debian/patches/features/arm/ARM-dts-orion5x-lschl-Fix-model-name.patch b/debian/patches/features/arm/ARM-dts-orion5x-lschl-Fix-model-name.patch new file mode 100644 index 000000000..41e0a1c34 --- /dev/null +++ b/debian/patches/features/arm/ARM-dts-orion5x-lschl-Fix-model-name.patch @@ -0,0 +1,43 @@ +From: Roger Shimizu +Date: Mon, 30 Jan 2017 20:07:29 +0900 +Subject: [PATCH 1/2] ARM: dts: orion5x-lschl: Fix model name +Origin: http://git.infradead.org/linux-mvebu.git/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 +Signed-off-by: Roger Shimizu +Signed-off-by: Gregory CLEMENT +--- + 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 +- * Copyright (C) 2015, 2016 ++ * Copyright (C) 2015-2017 + * Roger Shimizu + * + * This file is dual-licensed: you can use it either under the terms +@@ -52,7 +52,7 @@ + #include + + / { +- model = "Buffalo Linkstation Live v3 (LS-CHL)"; ++ model = "Buffalo Linkstation LiveV3 (LS-CHL)"; + compatible = "buffalo,lschl", "marvell,orion5x-88f5182", "marvell,orion5x"; + + memory { /* 128 MB */ diff --git a/debian/patches/features/arm/ARM-dts-orion5x-lschl-More-consistent-naming-on-link.patch b/debian/patches/features/arm/ARM-dts-orion5x-lschl-More-consistent-naming-on-link.patch new file mode 100644 index 000000000..b2372a680 --- /dev/null +++ b/debian/patches/features/arm/ARM-dts-orion5x-lschl-More-consistent-naming-on-link.patch @@ -0,0 +1,31 @@ +From: Roger Shimizu +Date: Mon, 30 Jan 2017 20:07:30 +0900 +Subject: [PATCH 2/2] ARM: dts: orion5x-lschl: More consistent naming on + linkstation series +Origin: http://git.infradead.org/linux-mvebu.git/56ba99b01308c360df5d18c6127f38b287550965 + +DTS files, which includes orion5x-linkstation.dtsi, are named: + orion5x-linkstation-*.dts + +So we rename the file below: + arch/arm/boot/dts/orion5x-lschl.dts +to the new name: + arch/arm/boot/dts/orion5x-linkstation-lschl.dts + +Because DTS conversion of this device was just introduced in 4.9, Debian +is still using legacy device support, other distros are the same, +so here we won't expect any impact actually. + +Fixes: f94f268979a2 ("ARM: dts: orion5x: convert ls-chl to FDT") +Cc: Ashley Hughes +Signed-off-by: Roger Shimizu +Signed-off-by: Gregory CLEMENT +--- + arch/arm/boot/dts/{orion5x-lschl.dts => orion5x-linkstation-lschl.dts} | 0 + 1 file changed, 0 insertions(+), 0 deletions(-) + rename arch/arm/boot/dts/{orion5x-lschl.dts => orion5x-linkstation-lschl.dts} (100%) + +diff --git a/arch/arm/boot/dts/orion5x-lschl.dts b/arch/arm/boot/dts/orion5x-linkstation-lschl.dts +similarity index 100% +rename from arch/arm/boot/dts/orion5x-lschl.dts +rename to arch/arm/boot/dts/orion5x-linkstation-lschl.dts diff --git a/debian/patches/series b/debian/patches/series index dde9dba48..00f30b887 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -58,6 +58,8 @@ features/arm/arm-dts-add-support-for-turris-omnia.patch features/arm/arm-dts-turris-omnia-add-support-for-ethernet-switch.patch features/arm/ARM-dts-orion5x-convert-ls-chl-to-FDT.patch features/arm64/dts-meson-gx-add-firmware-reserved-memory-zone.patch +features/arm/ARM-dts-orion5x-lschl-Fix-model-name.patch +features/arm/ARM-dts-orion5x-lschl-More-consistent-naming-on-link.patch # Miscellaneous bug fixes bugfix/all/kbuild-use-nostdinc-in-compile-tests.patch