Skip to content

L
linux
Commit 6c388927 authored by Olof Johansson's avatar Olof Johansson
Browse files
Options

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

mvebu fixes for 4.5 (part 1)

- Fix dts on buffalo linksations machines (gpios and leds)
- Fix dts partition node according to new binding introduced in v4.5

* tag 'mvebu-fixes-4.5-1' of git://git.infradead.org/linux-mvebu:
  ARM: dts: orion5x: gpio pin fixes for linkstation lswtgl
  ARM: dts: kirkwood: gpio-leds fixes for linkstation ls-wvl/vl
  ARM: dts: kirkwood: gpio-leds fixes for linkstation ls-wxl/wsxl
  ARM: dts: kirkwood: gpio pin fixes for linkstation ls-wvl/vl
  ARM: dts: kirkwood: gpio pin fixes for linkstation ls-wxl/wsxl
  ARM: mvebu: ix4-300d: Add compatible property to "partitions" node
  ARM: mvebu: kirkwood: Add compatible property to "partitions" node
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 7f7420f0 ff61ee84
Show whitespace changes
Inline Side-by-side
Showing with 35 additions and 31 deletions
arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts
View file @ 6c388927
...@@ -152,6 +152,7 @@ nand@d0000 { ...@@ -152,6 +152,7 @@ nand@d0000 {
nand-on-flash-bbt; nand-on-flash-bbt;
partitions { partitions {
compatible = "fixed-partitions";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
......
arch/arm/boot/dts/kirkwood-lswvl.dts
View file @ 6c388927
/* /*
* Device Tree file for Buffalo Linkstation LS-WVL/VL * Device Tree file for Buffalo Linkstation LS-WVL/VL
* *
* 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 = <&gpio0 45 GPIO_ACTIVE_LOW>; gpios = <&gpio1 13 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 = <&gpio0 46 GPIO_ACTIVE_LOW>; gpios = <&gpio1 14 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 = <&gpio0 47 GPIO_ACTIVE_LOW>; gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
}; };
}; };
...@@ -185,38 +186,38 @@ &pmx_led_hdderr0 ...@@ -185,38 +186,38 @@ &pmx_led_hdderr0
led@1 { led@1 {
label = "lswvl:red:alarm"; label = "lswvl:red:alarm";
gpios = <&gpio0 36 GPIO_ACTIVE_LOW>; gpios = <&gpio1 4 GPIO_ACTIVE_HIGH>;
}; };
led@2 { led@2 {
label = "lswvl:red:func"; label = "lswvl:red:func";
gpios = <&gpio0 37 GPIO_ACTIVE_LOW>; gpios = <&gpio1 5 GPIO_ACTIVE_HIGH>;
}; };
led@3 { led@3 {
label = "lswvl:amber:info"; label = "lswvl:amber:info";
gpios = <&gpio0 38 GPIO_ACTIVE_LOW>; gpios = <&gpio1 6 GPIO_ACTIVE_HIGH>;
}; };
led@4 { led@4 {
label = "lswvl:blue:func"; label = "lswvl:blue:func";
gpios = <&gpio0 39 GPIO_ACTIVE_LOW>; gpios = <&gpio1 7 GPIO_ACTIVE_HIGH>;
}; };
led@5 { led@5 {
label = "lswvl:blue:power"; label = "lswvl:blue:power";
gpios = <&gpio0 40 GPIO_ACTIVE_LOW>; gpios = <&gpio1 8 GPIO_ACTIVE_LOW>;
default-state = "keep"; default-state = "keep";
}; };
led@6 { led@6 {
label = "lswvl:red:hdderr0"; label = "lswvl:red:hdderr0";
gpios = <&gpio0 34 GPIO_ACTIVE_LOW>; gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>;
}; };
led@7 { led@7 {
label = "lswvl:red:hdderr1"; label = "lswvl:red:hdderr1";
gpios = <&gpio0 35 GPIO_ACTIVE_LOW>; gpios = <&gpio1 3 GPIO_ACTIVE_HIGH>;
}; };
}; };
...@@ -233,7 +234,7 @@ gpio_fan { ...@@ -233,7 +234,7 @@ gpio_fan {
3250 1 3250 1
5000 0>; 5000 0>;
alarm-gpios = <&gpio0 43 GPIO_ACTIVE_HIGH>; alarm-gpios = <&gpio1 11 GPIO_ACTIVE_HIGH>;
}; };
restart_poweroff { restart_poweroff {
......
arch/arm/boot/dts/kirkwood-lswxl.dts
View file @ 6c388927
/* /*
* 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_HIGH>;
default-state = "keep";
}; };
led@5 { led@5 {
label = "lswxl:red:func"; label = "lswxl:red:func";
gpios = <&gpio1 5 GPIO_ACTIVE_LOW>; gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>;
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_HIGH>;
}; };
led@7 { led@7 {
label = "lswxl:red:hdderr1"; label = "lswxl:red:hdderr1";
gpios = <&gpio1 3 GPIO_ACTIVE_LOW>; gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>;
}; };
}; };
...@@ -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";
......
arch/arm/boot/dts/kirkwood-pogoplug-series-4.dts
View file @ 6c388927
...@@ -131,6 +131,7 @@ &nand { ...@@ -131,6 +131,7 @@ &nand {
chip-delay = <40>; chip-delay = <40>;
status = "okay"; status = "okay";
partitions { partitions {
compatible = "fixed-partitions";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
......
arch/arm/boot/dts/orion5x-linkstation-lswtgl.dts
View file @ 6c388927
/* /*
* Device Tree file for Buffalo Linkstation LS-WTGL * 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 * 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 * of the GPL or the X11 license, at your option. Note that this dual
...@@ -69,8 +70,6 @@ soc { ...@@ -69,8 +70,6 @@ soc {
internal-regs { internal-regs {
pinctrl: pinctrl@10000 { pinctrl: pinctrl@10000 {
pinctrl-0 = <&pmx_usb_power &pmx_power_hdd
&pmx_fan_low &pmx_fan_high &pmx_fan_lock>;
pinctrl-names = "default"; pinctrl-names = "default";
pmx_led_power: pmx-leds { pmx_led_power: pmx-leds {
...@@ -162,6 +161,7 @@ gpio_leds { ...@@ -162,6 +161,7 @@ gpio_leds {
led@1 { led@1 {
label = "lswtgl:blue:power"; label = "lswtgl:blue:power";
gpios = <&gpio0 0 GPIO_ACTIVE_LOW>; gpios = <&gpio0 0 GPIO_ACTIVE_LOW>;
default-state = "keep";
}; };
led@2 { led@2 {
...@@ -188,7 +188,7 @@ gpio_fan { ...@@ -188,7 +188,7 @@ gpio_fan {
3250 1 3250 1
5000 0>; 5000 0>;
alarm-gpios = <&gpio0 2 GPIO_ACTIVE_HIGH>; alarm-gpios = <&gpio0 6 GPIO_ACTIVE_HIGH>;
}; };
restart_poweroff { restart_poweroff {
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7