[linux] 01/01: [armel] Add DT support of Buffalo Linkstation Live v3 (LS-CHL)

debian-kernel at lists.debian.org debian-kernel at lists.debian.org
Wed Jan 18 16:16:19 UTC 2017


This is an automated email from the git hooks/post-receive script.

rosh-guest pushed a commit to branch master
in repository linux.

commit 6f47d5347698caf344886448ebc1f5070f9b40a0
Author: Roger Shimizu <rogershimizu at gmail.com>
Date:   Thu Jan 19 01:12:36 2017 +0900

    [armel] Add DT support of Buffalo Linkstation Live v3 (LS-CHL)
---
 debian/changelog                                   |   7 +
 .../ARM-dts-orion5x-convert-ls-chl-to-FDT.patch    | 207 +++++++++++++++++++++
 debian/patches/series                              |   1 +
 3 files changed, 215 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 9c511e5..0ea5301 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+linux (4.9.2-2) UNRELEASED; urgency=medium
+
+  [ Roger Shimizu ]
+  * [armel] Add DT support of Buffalo Linkstation Live v3 (LS-CHL)
+
+ -- Roger Shimizu <rogershimizu at gmail.com>  Thu, 19 Jan 2017 01:06:58 +0900
+
 linux (4.9.2-1) unstable; urgency=medium
 
   * New upstream stable update:
diff --git a/debian/patches/features/arm/ARM-dts-orion5x-convert-ls-chl-to-FDT.patch b/debian/patches/features/arm/ARM-dts-orion5x-convert-ls-chl-to-FDT.patch
new file mode 100644
index 0000000..babf877
--- /dev/null
+++ b/debian/patches/features/arm/ARM-dts-orion5x-convert-ls-chl-to-FDT.patch
@@ -0,0 +1,207 @@
+From: Ashley Hughes <ashley.hughes at blueyonder.co.uk>
+Date: Sat, 19 Nov 2016 08:10:27 +0100
+Subject: [PATCH] ARM: dts: orion5x: convert ls-chl to FDT
+Origin: https://git.kernel.org/linus/f94f268979a2aaeb5842c5b24ed7d44497f7753c
+
+This patch converts my orion5x ls-chl Linkstation device to device tree.
+
+[gregory.clement at free-electrons.com: fix title, add back the commit log,
+move the removal of the platform in an other patch]
+Signed-off-by: Ashley Hughes <ashley.hughes at blueyonder.co.uk>
+Reviewed-by: Andrew Lunn <andrew at lunn.ch>
+Signed-off-by: Gregory CLEMENT <gregory.clement at free-electrons.com>
+---
+ arch/arm/boot/dts/Makefile          |   1 +
+ arch/arm/boot/dts/orion5x-lschl.dts | 171 ++++++++++++++++++++++++++++++++++++
+ 2 files changed, 172 insertions(+)
+ create mode 100644 arch/arm/boot/dts/orion5x-lschl.dts
+
+diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
+index befcd2619902..485304914916 100644
+--- a/arch/arm/boot/dts/Makefile
++++ b/arch/arm/boot/dts/Makefile
+@@ -597,6 +597,7 @@ dtb-$(CONFIG_ARCH_ORION5X) += \
+ 	orion5x-lacie-ethernet-disk-mini-v2.dtb \
+ 	orion5x-linkstation-lsgl.dtb \
+ 	orion5x-linkstation-lswtgl.dtb \
++	orion5x-lschl.dtb \
+ 	orion5x-lswsgl.dtb \
+ 	orion5x-maxtor-shared-storage-2.dtb \
+ 	orion5x-netgear-wnr854t.dtb \
+diff --git a/arch/arm/boot/dts/orion5x-lschl.dts b/arch/arm/boot/dts/orion5x-lschl.dts
+new file mode 100644
+index 000000000000..947409252845
+--- /dev/null
++++ b/arch/arm/boot/dts/orion5x-lschl.dts
+@@ -0,0 +1,171 @@
++/*
++ * Device Tree file for Buffalo Linkstation LS-CHLv3
++ *
++ * Copyright (C) 2016 Ash Hughes <ashley.hughes at blueyonder.co.uk>
++ * Copyright (C) 2015, 2016
++ * Roger Shimizu <rogershimizu at gmail.com>
++ *
++ * This file is dual-licensed: you can use it either under the terms
++ * of the GPL or the X11 license, at your option. Note that this dual
++ * licensing only applies to this file, and not this project as a
++ * whole.
++ *
++ *  a) This file is free software; you can redistribute it and/or
++ *     modify it under the terms of the GNU General Public License as
++ *     published by the Free Software Foundation; either version 2 of the
++ *     License, or (at your option) any later version.
++ *
++ *     This file is distributed in the hope that it will be useful
++ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *     GNU General Public License for more details.
++ *
++ * Or, alternatively
++ *
++ *  b) Permission is hereby granted, free of charge, to any person
++ *     obtaining a copy of this software and associated documentation
++ *     files (the "Software"), to deal in the Software without
++ *     restriction, including without limitation the rights to use
++ *     copy, modify, merge, publish, distribute, sublicense, and/or
++ *     sell copies of the Software, and to permit persons to whom the
++ *     Software is furnished to do so, subject to the following
++ *     conditions:
++ *
++ *     The above copyright notice and this permission notice shall be
++ *     included in all copies or substantial portions of the Software.
++ *
++ *     THE SOFTWARE IS PROVIDED , WITHOUT WARRANTY OF ANY KIND
++ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
++ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
++ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
++ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY
++ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
++ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
++ *     OTHER DEALINGS IN THE SOFTWARE.
++ */
++
++/dts-v1/;
++
++#include "orion5x-linkstation.dtsi"
++#include "mvebu-linkstation-gpio-simple.dtsi"
++#include "mvebu-linkstation-fan.dtsi"
++#include <dt-bindings/gpio/gpio.h>
++
++/ {
++	model = "Buffalo Linkstation Live v3 (LS-CHL)";
++	compatible = "buffalo,lschl", "marvell,orion5x-88f5182", "marvell,orion5x";
++
++	memory { /* 128 MB */
++		device_type = "memory";
++		reg = <0x00000000 0x8000000>;
++	};
++
++	gpio_keys {
++		func {
++			label = "Function Button";
++			linux,code = <KEY_OPTION>;
++			gpios = <&gpio0 15 GPIO_ACTIVE_LOW>;
++		};
++
++		power-on-switch {
++			gpios = <&gpio0 8 GPIO_ACTIVE_LOW>;
++		};
++
++		power-auto-switch {
++			gpios = <&gpio0 10 GPIO_ACTIVE_LOW>;
++		};
++	};
++
++	gpio_leds {
++		pinctrl-0 = <&pmx_led_power &pmx_led_alarm &pmx_led_info &pmx_led_func>;
++		blue-power-led {
++			gpios = <&gpio0 0 GPIO_ACTIVE_LOW>;
++		};
++
++		red-alarm-led {
++			gpios = <&gpio0 2 GPIO_ACTIVE_LOW>;
++		};
++
++		amber-info-led {
++			gpios = <&gpio0 3 GPIO_ACTIVE_LOW>;
++		};
++
++		func {
++			label = "lschl:func:blue:top";
++			gpios = <&gpio0 17 GPIO_ACTIVE_LOW>;
++		};
++	};
++
++	gpio_fan {
++		gpios = <&gpio0 14 GPIO_ACTIVE_LOW
++			 &gpio0 16 GPIO_ACTIVE_LOW>;
++
++		alarm-gpios = <&gpio0 6 GPIO_ACTIVE_HIGH>;
++	};
++};
++
++&pinctrl {
++	pmx_led_power: pmx-leds {
++		marvell,pins = "mpp0";
++		marvell,function = "gpio";
++	};
++
++	pmx_power_hdd: pmx-power-hdd {
++		marvell,pins = "mpp1";
++		marvell,function = "gpio";
++	};
++
++	pmx_led_alarm: pmx-leds {
++		marvell,pins = "mpp2";
++		marvell,function = "gpio";
++	};
++
++	pmx_led_info: pmx-leds {
++		marvell,pins = "mpp3";
++		marvell,function = "gpio";
++	};
++
++	pmx_fan_lock: pmx-fan-lock {
++		marvell,pins = "mpp6";
++		marvell,function = "gpio";
++	};
++
++	pmx_power_switch: pmx-power-switch {
++		marvell,pins = "mpp8", "mpp10", "mpp15";
++		marvell,function = "gpio";
++	};
++
++	pmx_power_usb: pmx-power-usb {
++		marvell,pins = "mpp9";
++		marvell,function = "gpio";
++	};
++
++	pmx_fan_high: pmx-fan-high {
++		marvell,pins = "mpp14";
++		marvell,function = "gpio";
++	};
++
++	pmx_fan_low: pmx-fan-low {
++		marvell,pins = "mpp16";
++		marvell,function = "gpio";
++	};
++
++	pmx_led_func: pmx-leds {
++		marvell,pins = "mpp17";
++		marvell,function = "gpio";
++	};
++
++	pmx_sw_init: pmx-sw-init {
++		marvell,pins = "mpp7";
++		marvell,function = "gpio";
++	};
++};
++
++&hdd_power {
++	gpios = <&gpio0 1 GPIO_ACTIVE_HIGH>;
++};
++
++&usb_power {
++	gpios = <&gpio0 9 GPIO_ACTIVE_HIGH>;
++};
++
diff --git a/debian/patches/series b/debian/patches/series
index 4682eea..9c81d22 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -55,6 +55,7 @@ features/x86/x86-memtest-WARN-if-bad-RAM-found.patch
 features/x86/x86-make-x32-syscall-support-conditional.patch
 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
 
 # Miscellaneous bug fixes
 bugfix/all/kbuild-use-nostdinc-in-compile-tests.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git



More information about the Kernel-svn-changes mailing list