Commit 144e08ab authored by Roger Shimizu's avatar Roger Shimizu Committed by Gregory CLEMENT

ARM: dts: kirkwood: gpio pin fixes for linkstation ls-wxl/wsxl

For kirkwood, gpio pins starts from 32 are in the 2nd bank, so it should be
converted to "gpio1 <pin minus 32>" in dts file.
e.g. gpio 40 should be "gpio1 8"

Besides, a few other pin fixes for ls-wxl/wsxl, to match with mpp pin
definition:
  - gpio-leds: "lswxl:blue:power" pin
  - gpio-leds: "lswxl:red:func" pin
  - gpio-leds: "lswxl:red:hdderr0" pin
  - gpio-leds: "lswxl:red:hdderr1" pin
  - gpio-fan:  low/high/alarm pin

The pin/bank issue was found when discussing Debian Bug #810894
  [https://bugs.debian.org/810894#47]

Fixes: e54e4b1b ("ARM: dts: add buffalo linkstation ls-wxl/wsxl")
Reported-by: default avatarArnaud Patard (Rtp) <arnaud.patard@rtp-net.org>
Signed-off-by: default avatarRoger Shimizu <rogershimizu@gmail.com>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarGregory CLEMENT <gregory.clement@free-electrons.com>
parent 293de94c
/* /*
* Device Tree file for Buffalo Linkstation LS-WXL/WSXL * Device Tree file for Buffalo Linkstation LS-WXL/WSXL
* *
* Copyright (C) 2015, rogershimizu@gmail.com * Copyright (C) 2015, 2016
* Roger Shimizu <rogershimizu@gmail.com>
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
...@@ -156,21 +157,21 @@ gpio_keys { ...@@ -156,21 +157,21 @@ gpio_keys {
button@1 { button@1 {
label = "Function Button"; label = "Function Button";
linux,code = <KEY_OPTION>; linux,code = <KEY_OPTION>;
gpios = <&gpio1 41 GPIO_ACTIVE_LOW>; gpios = <&gpio1 9 GPIO_ACTIVE_LOW>;
}; };
button@2 { button@2 {
label = "Power-on Switch"; label = "Power-on Switch";
linux,code = <KEY_RESERVED>; linux,code = <KEY_RESERVED>;
linux,input-type = <5>; linux,input-type = <5>;
gpios = <&gpio1 42 GPIO_ACTIVE_LOW>; gpios = <&gpio1 10 GPIO_ACTIVE_LOW>;
}; };
button@3 { button@3 {
label = "Power-auto Switch"; label = "Power-auto Switch";
linux,code = <KEY_ESC>; linux,code = <KEY_ESC>;
linux,input-type = <5>; linux,input-type = <5>;
gpios = <&gpio1 43 GPIO_ACTIVE_LOW>; gpios = <&gpio1 11 GPIO_ACTIVE_LOW>;
}; };
}; };
...@@ -185,12 +186,12 @@ &pmx_led_hdderr0 ...@@ -185,12 +186,12 @@ &pmx_led_hdderr0
led@1 { led@1 {
label = "lswxl:blue:func"; label = "lswxl:blue:func";
gpios = <&gpio1 36 GPIO_ACTIVE_LOW>; gpios = <&gpio1 4 GPIO_ACTIVE_LOW>;
}; };
led@2 { led@2 {
label = "lswxl:red:alarm"; label = "lswxl:red:alarm";
gpios = <&gpio1 49 GPIO_ACTIVE_LOW>; gpios = <&gpio1 17 GPIO_ACTIVE_LOW>;
}; };
led@3 { led@3 {
...@@ -200,23 +201,23 @@ led@3 { ...@@ -200,23 +201,23 @@ led@3 {
led@4 { led@4 {
label = "lswxl:blue:power"; label = "lswxl:blue:power";
gpios = <&gpio1 8 GPIO_ACTIVE_LOW>; gpios = <&gpio1 7 GPIO_ACTIVE_LOW>;
}; };
led@5 { led@5 {
label = "lswxl:red:func"; label = "lswxl:red:func";
gpios = <&gpio1 5 GPIO_ACTIVE_LOW>; gpios = <&gpio1 2 GPIO_ACTIVE_LOW>;
default-state = "keep"; default-state = "keep";
}; };
led@6 { led@6 {
label = "lswxl:red:hdderr0"; label = "lswxl:red:hdderr0";
gpios = <&gpio1 2 GPIO_ACTIVE_LOW>; gpios = <&gpio0 8 GPIO_ACTIVE_LOW>;
}; };
led@7 { led@7 {
label = "lswxl:red:hdderr1"; label = "lswxl:red:hdderr1";
gpios = <&gpio1 3 GPIO_ACTIVE_LOW>; gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
}; };
}; };
...@@ -225,15 +226,15 @@ gpio_fan { ...@@ -225,15 +226,15 @@ gpio_fan {
pinctrl-0 = <&pmx_fan_low &pmx_fan_high &pmx_fan_lock>; pinctrl-0 = <&pmx_fan_low &pmx_fan_high &pmx_fan_lock>;
pinctrl-names = "default"; pinctrl-names = "default";
gpios = <&gpio0 47 GPIO_ACTIVE_LOW gpios = <&gpio1 16 GPIO_ACTIVE_LOW
&gpio0 48 GPIO_ACTIVE_LOW>; &gpio1 15 GPIO_ACTIVE_LOW>;
gpio-fan,speed-map = <0 3 gpio-fan,speed-map = <0 3
1500 2 1500 2
3250 1 3250 1
5000 0>; 5000 0>;
alarm-gpios = <&gpio1 49 GPIO_ACTIVE_HIGH>; alarm-gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>;
}; };
restart_poweroff { restart_poweroff {
...@@ -256,7 +257,7 @@ usb_power: regulator@1 { ...@@ -256,7 +257,7 @@ usb_power: regulator@1 {
enable-active-high; enable-active-high;
regulator-always-on; regulator-always-on;
regulator-boot-on; regulator-boot-on;
gpio = <&gpio0 37 GPIO_ACTIVE_HIGH>; gpio = <&gpio1 5 GPIO_ACTIVE_HIGH>;
}; };
hdd_power0: regulator@2 { hdd_power0: regulator@2 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment