60 lines
1.9 KiB
Diff
60 lines
1.9 KiB
Diff
From: Roger Shimizu <rogershimizu@gmail.com>
|
|
Date: Fri, 22 Jan 2016 00:00:36 +0900
|
|
Subject: ARM: dts: orion5x: gpio pin fixes for linkstation lswtgl
|
|
Origin: https://git.kernel.org/linus/ff61ee84e7aa5842d9e33c0b442f0b43a6a44eaf
|
|
|
|
Here're a few gpio pin related fixes:
|
|
- remove pinctrl-0 definition from pinctrl, since those pins are used
|
|
in other places such as gpio-fan and regulators.
|
|
- keep initial state of power led
|
|
- fix for alarm pin of gpio-fan.
|
|
|
|
Fixes: dc57844a736f ("ARM: dts: orion5x: add buffalo linkstation ls-wtgl")
|
|
Signed-off-by: Roger Shimizu <rogershimizu@gmail.com>
|
|
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
|
|
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
|
|
---
|
|
arch/arm/boot/dts/orion5x-linkstation-lswtgl.dts | 8 ++++----
|
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/arch/arm/boot/dts/orion5x-linkstation-lswtgl.dts b/arch/arm/boot/dts/orion5x-linkstation-lswtgl.dts
|
|
index 3daec912b4bf..420788229e6f 100644
|
|
--- a/arch/arm/boot/dts/orion5x-linkstation-lswtgl.dts
|
|
+++ b/arch/arm/boot/dts/orion5x-linkstation-lswtgl.dts
|
|
@@ -1,7 +1,8 @@
|
|
/*
|
|
* Device Tree file for Buffalo Linkstation LS-WTGL
|
|
*
|
|
- * Copyright (C) 2015, Roger Shimizu <rogershimizu@gmail.com>
|
|
+ * Copyright (C) 2015, 2016
|
|
+ * Roger Shimizu <rogershimizu@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
|
|
@@ -69,8 +70,6 @@
|
|
|
|
internal-regs {
|
|
pinctrl: pinctrl@10000 {
|
|
- pinctrl-0 = <&pmx_usb_power &pmx_power_hdd
|
|
- &pmx_fan_low &pmx_fan_high &pmx_fan_lock>;
|
|
pinctrl-names = "default";
|
|
|
|
pmx_led_power: pmx-leds {
|
|
@@ -162,6 +161,7 @@
|
|
led@1 {
|
|
label = "lswtgl:blue:power";
|
|
gpios = <&gpio0 0 GPIO_ACTIVE_LOW>;
|
|
+ default-state = "keep";
|
|
};
|
|
|
|
led@2 {
|
|
@@ -188,7 +188,7 @@
|
|
3250 1
|
|
5000 0>;
|
|
|
|
- alarm-gpios = <&gpio0 2 GPIO_ACTIVE_HIGH>;
|
|
+ alarm-gpios = <&gpio0 6 GPIO_ACTIVE_HIGH>;
|
|
};
|
|
|
|
restart_poweroff {
|