openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

mvebu DT changes for v3.14 (incr. #3) 

- kirkwood
     - use symbolic names for gpios and key inputs
 
  - mvebu
     - add the pxa nand controller to the ReadyNAS and A370-RD boards
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
 iQIcBAABAgAGBQJSrNh/AAoJEP45WPkGe8ZnXFoP/jlCWdq7sjHgeEVq086xjcRq
 altKZbk4VcfbQmZoM+LSdVsMXhxjOvRrsOUG06uzQftzE6YgZ6TuypB++sEIkfzL
 qAyu+DDDZGTeK35JDbM9MhjUCHdhCoBoQW8LUAgXk77p/FSccOvHAGINRiWZ5xib
 a/Eb5YR8Of4anNOqG1Tl/Uji8A2cGTMo4yQcWXo//A9XHPg3zsDgXYmkYJHs80ce
 8bgOChAF5tjAjchbYncRkQyZhGVLEBZ6dFMLDFW/4NQtSYUu7CopTTOJnYbj5w//
 wxDrr222DXcMQ4Po6NYJHzsewu6QmRYBqZLG2HSfCN3sGVRzmq7B6OQaif8N8j9g
 9WmfD7PCVhcSCMx6N4FGtnJobSP3H3oZuEOAmsy5MVFF22c8SwwBMIwF+UVwP9wR
 mny1FhZbWREgyDDbKEYwuc13PgjIrP5DoJ5jhTuG9Mqv/fUn4ZS5XOPTe2AIbBO3
 UBZRLUsUirYMyGJxy2Yz08ovIOfBb6ilQFvvli2BWDcyiqdpxZ5HTYtQSKd8YLnQ
 Q2B28n4Gxi8QC9OpObeyU2y03wiI/jYTGKDDgS5Ar8SKEZg479QK0lAGuaZPFSdo
 09mRkY3OF521+2LfAByw8AFIBW945XzJLDUx0L9Qv9OFTkJof3VB4S3DTF8PILQB
 SWXQHTLNhJLF4fVxd1B0
 =ux36
 -----END PGP SIGNATURE-----

Merge tag 'mvebu-dt-3.14-3' of git://git.infradead.org/linux-mvebu into next/dt

From Jason Cooper:
mvebu DT changes for v3.14 (incr. #3)

 - kirkwood
    - use symbolic names for gpios and key inputs

 - mvebu
    - add the pxa nand controller to the ReadyNAS and A370-RD boards

* tag 'mvebu-dt-3.14-3' of git://git.infradead.org/linux-mvebu:
  ARM: mvebu: Enable NAND controller in A370 Reference Design board
  ARM: mvebu: Enable NAND controller in ReadyNAS 2120 .dts file
  ARM: mvebu: Enable NAND controller in ReadyNAS 104 .dts file
  ARM: mvebu: Enable NAND controller in ReadyNAS 102 .dts file
  ARM: DT: Kirkwood: Use symbolic names from gpio.h
  ARM: DT: Kirkwood: Use symbolic names from input.h

Signed-off-by: Kevin Hilman <khilman@linaro.org>
This commit is contained in:
Kevin Hilman 2013-12-19 07:33:57 -08:00
parent 1cfe0874c1 69e18e26b5
commit 718133a637
37 changed files with 313 additions and 186 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
arch/arm/boot/dts/armada-370-netgear-rn102.dts
View File

@ -131,6 +131,42 @@ g762: g762@3e {
pwm_polarity = <0>;
};
};
nand@d0000 {
status = "okay";
num-cs = <1>;
marvell,nand-keep-config;
marvell,nand-enable-arbiter;
nand-on-flash-bbt;
partition@0 {
label = "u-boot";
reg = <0x0000000 0x180000>; /* 1.5MB */
read-only;
};
partition@180000 {
label = "u-boot-env";
reg = <0x180000 0x20000>; /* 128KB */
read-only;
};
partition@200000 {
label = "uImage";
reg = <0x0200000 0x600000>; /* 6MB */
};
partition@800000 {
label = "minirootfs";
reg = <0x0800000 0x400000>; /* 4MB */
};
/* Last MB is for the BBT, i.e. not writable */
partition@c00000 {
label = "ubifs";
reg = <0x0c00000 0x7400000>; /* 116MB */
};
};
};
};

36
arch/arm/boot/dts/armada-370-netgear-rn104.dts
View File

@ -133,6 +133,42 @@ pca9554: pca9554@23 {
reg = <0x23>;
};
};
nand@d0000 {
status = "okay";
num-cs = <1>;
marvell,nand-keep-config;
marvell,nand-enable-arbiter;
nand-on-flash-bbt;
partition@0 {
label = "u-boot";
reg = <0x0000000 0x180000>; /* 1.5MB */
read-only;
};
partition@180000 {
label = "u-boot-env";
reg = <0x180000 0x20000>; /* 128KB */
read-only;
};
partition@200000 {
label = "uImage";
reg = <0x0200000 0x600000>; /* 6MB */
};
partition@800000 {
label = "minirootfs";
reg = <0x0800000 0x400000>; /* 4MB */
};
/* Last MB is for the BBT, i.e. not writable */
partition@c00000 {
label = "ubifs";
reg = <0x0c00000 0x7400000>; /* 116MB */
};
};
};
};

21
arch/arm/boot/dts/armada-370-rd.dts
View File

@ -104,6 +104,27 @@ button@1 {
gpios = <&gpio0 6 1>;
};
};
nand@d0000 {
status = "okay";
num-cs = <1>;
marvell,nand-keep-config;
marvell,nand-enable-arbiter;
nand-on-flash-bbt;
partition@0 {
label = "U-Boot";
reg = <0 0x800000>;
};
partition@800000 {
label = "Linux";
reg = <0x800000 0x800000>;
};
partition@1000000 {
label = "Filesystem";
reg = <0x1000000 0x3f000000>;
};
};
};
};
};

36
arch/arm/boot/dts/armada-xp-netgear-rn2120.dts
View File

@ -211,6 +211,42 @@ g751: g751@4c {
reg = <0x4c>;
};
};
nand@d0000 {
status = "okay";
num-cs = <1>;
marvell,nand-keep-config;
marvell,nand-enable-arbiter;
nand-on-flash-bbt;
partition@0 {
label = "u-boot";
reg = <0x0000000 0x180000>; /* 1.5MB */
read-only;
};
partition@180000 {
label = "u-boot-env";
reg = <0x180000 0x20000>; /* 128KB */
read-only;
};
partition@200000 {
label = "uImage";
reg = <0x0200000 0x600000>; /* 6MB */
};
partition@800000 {
label = "minirootfs";
reg = <0x0800000 0x400000>; /* 4MB */
};
/* Last MB is for the BBT, i.e. not writable */
partition@c00000 {
label = "ubifs";
reg = <0x0c00000 0x7400000>; /* 116MB */
};
};
};
};

10
arch/arm/boot/dts/kirkwood-cloudbox.dts
View File

@ -66,8 +66,8 @@ gpio_keys {
button@1 {
label = "Power push button";
linux,code = <116>;
gpios = <&gpio0 16 1>;
linux,code = <KEY_POWER>;
gpios = <&gpio0 16 GPIO_ACTIVE_LOW>;
};
};
@ -76,17 +76,17 @@ gpio-leds {
red-fail {
label = "cloudbox:red:fail";
gpios = <&gpio0 14 0>;
gpios = <&gpio0 14 GPIO_ACTIVE_HIGH>;
};
blue-sata {
label = "cloudbox:blue:sata";
gpios = <&gpio0 15 0>;
gpios = <&gpio0 15 GPIO_ACTIVE_HIGH>;
};
};
gpio_poweroff {
compatible = "gpio-poweroff";
gpios = <&gpio0 17 0>;
gpios = <&gpio0 17 GPIO_ACTIVE_HIGH>;
};
};

4
arch/arm/boot/dts/kirkwood-db.dtsi
View File

@ -51,8 +51,8 @@ ehci@50000 {
mvsdio@90000 {
pinctrl-0 = <&pmx_sdio_gpios>;
pinctrl-names = "default";
wp-gpios = <&gpio1 5 0>;
cd-gpios = <&gpio1 6 0>;
wp-gpios = <&gpio1 5 GPIO_ACTIVE_HIGH>;
cd-gpios = <&gpio1 6 GPIO_ACTIVE_HIGH>;
status = "okay";
};
};

10
arch/arm/boot/dts/kirkwood-dns320.dts
View File

@ -24,24 +24,24 @@ &pmx_led_red_left_hdd &pmx_led_red_right_hdd
blue-power {
label = "dns320:blue:power";
gpios = <&gpio0 26 1>; /* GPIO 26 Active Low */
gpios = <&gpio0 26 GPIO_ACTIVE_LOW>;
default-state = "keep";
};
blue-usb {
label = "dns320:blue:usb";
gpios = <&gpio1 11 1>; /* GPIO 43 Active Low */
gpios = <&gpio1 11 GPIO_ACTIVE_LOW>;
};
orange-l_hdd {
label = "dns320:orange:l_hdd";
gpios = <&gpio0 28 1>; /* GPIO 28 Active Low */
gpios = <&gpio0 28 GPIO_ACTIVE_LOW>;
};
orange-r_hdd {
label = "dns320:orange:r_hdd";
gpios = <&gpio0 27 1>; /* GPIO 27 Active Low */
gpios = <&gpio0 27 GPIO_ACTIVE_LOW>;
};
orange-usb {
label = "dns320:orange:usb";
gpios = <&gpio1 3 1>; /* GPIO 35 Active Low */
gpios = <&gpio1 3 GPIO_ACTIVE_LOW>; /* GPIO 35 */
};
};

10
arch/arm/boot/dts/kirkwood-dns325.dts
View File

@ -24,24 +24,24 @@ &pmx_led_red_left_hdd &pmx_led_red_right_hdd
white-power {
label = "dns325:white:power";
gpios = <&gpio0 26 1>; /* GPIO 26 Active Low */
gpios = <&gpio0 26 GPIO_ACTIVE_LOW>;
default-state = "keep";
};
white-usb {
label = "dns325:white:usb";
gpios = <&gpio1 11 1>; /* GPIO 43 Active Low */
gpios = <&gpio1 11 GPIO_ACTIVE_LOW>; /* GPIO 43 */
};
red-l_hdd {
label = "dns325:red:l_hdd";
gpios = <&gpio0 28 1>; /* GPIO 28 Active Low */
gpios = <&gpio0 28 GPIO_ACTIVE_LOW>;
};
red-r_hdd {
label = "dns325:red:r_hdd";
gpios = <&gpio0 27 1>; /* GPIO 27 Active Low */
gpios = <&gpio0 27 GPIO_ACTIVE_LOW>;
};
red-usb {
label = "dns325:red:usb";
gpios = <&gpio0 29 1>; /* GPIO 29 Active Low */
gpios = <&gpio0 29 GPIO_ACTIVE_LOW>;
};
};

18
arch/arm/boot/dts/kirkwood-dnskw.dtsi
View File

@ -15,18 +15,18 @@ gpio_keys {
button@1 {
label = "Power button";
linux,code = <116>;
gpios = <&gpio1 2 1>;
linux,code = <KEY_POWER>;
gpios = <&gpio1 2 GPIO_ACTIVE_LOW>;
};
button@2 {
label = "USB unmount button";
linux,code = <161>;
gpios = <&gpio1 15 1>;
linux,code = <KEY_EJECTCD>;
gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
};
button@3 {
label = "Reset button";
linux,code = <0x198>;
gpios = <&gpio1 16 1>;
linux,code = <KEY_RESTART>;
gpios = <&gpio1 16 GPIO_ACTIVE_LOW>;
};
};
@ -35,8 +35,8 @@ gpio_fan {
compatible = "gpio-fan";
pinctrl-0 = <&pmx_fan_high_speed &pmx_fan_low_speed>;
pinctrl-names = "default";
gpios = <&gpio1 14 1
&gpio1 13 1>;
gpios = <&gpio1 14 GPIO_ACTIVE_LOW
&gpio1 13 GPIO_ACTIVE_LOW>;
gpio-fan,speed-map = <0 0
3000 1
6000 2>;
@ -46,7 +46,7 @@ gpio_poweroff {
compatible = "gpio-poweroff";
pinctrl-0 = <&pmx_power_off>;
pinctrl-names = "default";
gpios = <&gpio1 4 0>;
gpios = <&gpio1 4 GPIO_ACTIVE_HIGH>;
};
ocp@f1000000 {

4
arch/arm/boot/dts/kirkwood-dockstar.dts
View File

@ -42,12 +42,12 @@ gpio-leds {
health {
label = "status:green:health";
gpios = <&gpio1 14 1>;
gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
default-state = "keep";
};
fault {
label = "status:orange:fault";
gpios = <&gpio1 15 1>;
gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
};
};
regulators {

6
arch/arm/boot/dts/kirkwood-dreamplug.dts
View File

@ -87,15 +87,15 @@ gpio-leds {
bluetooth {
label = "dreamplug:blue:bluetooth";
gpios = <&gpio1 15 1>;
gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
};
wifi {
label = "dreamplug:green:wifi";
gpios = <&gpio1 16 1>;
gpios = <&gpio1 16 GPIO_ACTIVE_LOW>;
};
wifi-ap {
label = "dreamplug:green:wifi_ap";
gpios = <&gpio1 17 1>;
gpios = <&gpio1 17 GPIO_ACTIVE_LOW>;
};
};
};

22
arch/arm/boot/dts/kirkwood-goflexnet.dts
View File

@ -85,44 +85,44 @@ &pmx_led_right_cap_2 &pmx_led_right_cap_3
health {
label = "status:green:health";
gpios = <&gpio1 14 1>;
gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
default-state = "keep";
};
fault {
label = "status:orange:fault";
gpios = <&gpio1 15 1>;
gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
};
left0 {
label = "status:white:left0";
gpios = <&gpio1 10 0>;
gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>;
};
left1 {
label = "status:white:left1";
gpios = <&gpio1 11 0>;
gpios = <&gpio1 11 GPIO_ACTIVE_HIGH>;
};
left2 {
label = "status:white:left2";
gpios = <&gpio1 12 0>;
gpios = <&gpio1 12 GPIO_ACTIVE_HIGH>;
};
left3 {
label = "status:white:left3";
gpios = <&gpio1 13 0>;
gpios = <&gpio1 13 GPIO_ACTIVE_HIGH>;
};
right0 {
label = "status:white:right0";
gpios = <&gpio1 6 0>;
gpios = <&gpio1 6 GPIO_ACTIVE_HIGH>;
};
right1 {
label = "status:white:right1";
gpios = <&gpio1 7 0>;
gpios = <&gpio1 7 GPIO_ACTIVE_HIGH>;
};
right2 {
label = "status:white:right2";
gpios = <&gpio1 8 0>;
gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>;
};
right3 {
label = "status:white:right3";
gpios = <&gpio1 9 0>;
gpios = <&gpio1 9 GPIO_ACTIVE_HIGH>;
};
};
regulators {
@ -141,7 +141,7 @@ usb_power: regulator@1 {
enable-active-high;
regulator-always-on;
regulator-boot-on;
gpio = <&gpio0 29 0>;
gpio = <&gpio0 29 GPIO_ACTIVE_HIGH>;
};
};
};

8
arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts
View File

@ -60,19 +60,19 @@ gpio-leds {
health-r {
label = "guruplug:red:health";
gpios = <&gpio1 14 1>;
gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
};
health-g {
label = "guruplug:green:health";
gpios = <&gpio1 15 1>;
gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
};
wmode-r {
label = "guruplug:red:wmode";
gpios = <&gpio1 16 1>;
gpios = <&gpio1 16 GPIO_ACTIVE_LOW>;
};
wmode-g {
label = "guruplug:green:wmode";
gpios = <&gpio1 17 1>;
gpios = <&gpio1 17 GPIO_ACTIVE_LOW>;
};
};
};

16
arch/arm/boot/dts/kirkwood-ib62x0.dts
View File

@ -63,13 +63,13 @@ gpio_keys {
button@1 {
label = "USB Copy";
linux,code = <133>;
gpios = <&gpio0 29 1>;
linux,code = <KEY_COPY>;
gpios = <&gpio0 29 GPIO_ACTIVE_LOW>;
};
button@2 {
label = "Reset";
linux,code = <0x198>;
gpios = <&gpio0 28 1>;
linux,code = <KEY_RESTART>;
gpios = <&gpio0 28 GPIO_ACTIVE_LOW>;
};
};
@ -81,16 +81,16 @@ gpio-leds {
green-os {
label = "ib62x0:green:os";
gpios = <&gpio0 25 0>;
gpios = <&gpio0 25 GPIO_ACTIVE_HIGH>;
default-state = "keep";
};
red-os {
label = "ib62x0:red:os";
gpios = <&gpio0 22 0>;
gpios = <&gpio0 22 GPIO_ACTIVE_HIGH>;
};
usb-copy {
label = "ib62x0:red:usb_copy";
gpios = <&gpio0 27 0>;
gpios = <&gpio0 27 GPIO_ACTIVE_HIGH>;
};
};
@ -98,7 +98,7 @@ gpio_poweroff {
compatible = "gpio-poweroff";
pinctrl-0 = <&pmx_power_off>;
pinctrl-names = "default";
gpios = <&gpio0 24 0>;
gpios = <&gpio0 24 GPIO_ACTIVE_HIGH>;
};
};

24
arch/arm/boot/dts/kirkwood-iconnect.dts
View File

@ -94,37 +94,37 @@ &pmx_led_usb2 &pmx_led_usb3
led-level {
label = "led_level";
gpios = <&gpio1 9 0>;
gpios = <&gpio1 9 GPIO_ACTIVE_HIGH>;
default-state = "on";
};
power-blue {
label = "power:blue";
gpios = <&gpio1 10 0>;
gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>;
default-state = "keep";
};
power-red {
label = "power:red";
gpios = <&gpio1 11 0>;
gpios = <&gpio1 11 GPIO_ACTIVE_HIGH>;
};
usb1 {
label = "usb1:blue";
gpios = <&gpio1 12 0>;
gpios = <&gpio1 12 GPIO_ACTIVE_HIGH>;
};
usb2 {
label = "usb2:blue";
gpios = <&gpio1 13 0>;
gpios = <&gpio1 13 GPIO_ACTIVE_HIGH>;
};
usb3 {
label = "usb3:blue";
gpios = <&gpio1 14 0>;
gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>;
};
usb4 {
label = "usb4:blue";
gpios = <&gpio1 15 0>;
gpios = <&gpio1 15 GPIO_ACTIVE_HIGH>;
};
otb {
label = "otb:blue";
gpios = <&gpio1 16 0>;
gpios = <&gpio1 16 GPIO_ACTIVE_HIGH>;
};
};
@ -137,14 +137,14 @@ gpio_keys {
button@1 {
label = "OTB Button";
linux,code = <133>;
gpios = <&gpio1 3 1>;
linux,code = <KEY_COPY>;
gpios = <&gpio1 3 GPIO_ACTIVE_LOW>;
debounce-interval = <100>;
};
button@2 {
label = "Reset";
linux,code = <0x198>;
gpios = <&gpio0 12 1>;
linux,code = <KEY_RESTART>;
gpios = <&gpio0 12 GPIO_ACTIVE_LOW>;
debounce-interval = <100>;
};
};

20
arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts
View File

@ -127,20 +127,20 @@ gpio-leds {
power_led {
label = "status:white:power_led";
gpios = <&gpio0 16 0>;
gpios = <&gpio0 16 GPIO_ACTIVE_HIGH>;
default-state = "keep";
};
rebuild_led {
label = "status:white:rebuild_led";
gpios = <&gpio1 4 0>;
gpios = <&gpio1 4 GPIO_ACTIVE_HIGH>;
};
health_led {
label = "status:red:health_led";
gpios = <&gpio1 5 0>;
gpios = <&gpio1 5 GPIO_ACTIVE_HIGH>;
};
backup_led {
label = "status:blue:backup_led";
gpios = <&gpio0 15 0>;
gpios = <&gpio0 15 GPIO_ACTIVE_HIGH>;
};
};
gpio-keys {
@ -154,18 +154,18 @@ gpio-keys {
Power {
label = "Power Button";
linux,code = <116>;
gpios = <&gpio0 14 1>;
linux,code = <KEY_POWER>;
gpios = <&gpio0 14 GPIO_ACTIVE_LOW>;
};
Reset {
label = "Reset Button";
linux,code = <0x198>;
gpios = <&gpio0 12 1>;
linux,code = <KEY_RESTART>;
gpios = <&gpio0 12 GPIO_ACTIVE_LOW>;
};
OTB {
label = "OTB Button";
linux,code = <133>;
gpios = <&gpio1 3 1>;
linux,code = <KEY_COPY>;
gpios = <&gpio1 3 GPIO_ACTIVE_LOW>;
};
};
};

4
arch/arm/boot/dts/kirkwood-km_kirkwood.dts
View File

@ -38,8 +38,8 @@ serial@12000 {
i2c@0 {
compatible = "i2c-gpio";
gpios = < &gpio0 8 0 /* sda */
&gpio0 9 0 >; /* scl */
gpios = < &gpio0 8 GPIO_ACTIVE_HIGH /* sda */
&gpio0 9 GPIO_ACTIVE_HIGH>; /* scl */
i2c-gpio,delay-us = <2>; /* ~100 kHz */
};
};

28
arch/arm/boot/dts/kirkwood-lsxl.dtsi
View File

@ -108,20 +108,20 @@ gpio_keys {
button@1 {
label = "Function Button";
linux,code = <357>;
gpios = <&gpio1 9 1>;
linux,code = <KEY_OPTION>;
gpios = <&gpio1 9 GPIO_ACTIVE_LOW>;
};
button@2 {
label = "Power-on Switch";
linux,code = <0>;
linux,code = <KEY_RESERVED>;
linux,input-type = <5>;
gpios = <&gpio1 10 1>;
gpios = <&gpio1 10 GPIO_ACTIVE_LOW>;
};
button@3 {
label = "Power-auto Switch";
linux,code = <1>;
linux,code = <KEY_ESC>;
linux,input-type = <5>;
gpios = <&gpio1 11 1>;
gpios = <&gpio1 11 GPIO_ACTIVE_LOW>;
};
};
@ -134,28 +134,28 @@ &pmx_led_info &pmx_led_power
led@1 {
label = "lsxl:blue:func";
gpios = <&gpio1 4 1>;
gpios = <&gpio1 4 GPIO_ACTIVE_LOW>;
};
led@2 {
label = "lsxl:red:alarm";
gpios = <&gpio1 5 1>;
gpios = <&gpio1 5 GPIO_ACTIVE_LOW>;
};
led@3 {
label = "lsxl:amber:info";
gpios = <&gpio1 6 1>;
gpios = <&gpio1 6 GPIO_ACTIVE_LOW>;
};
led@4 {
label = "lsxl:blue:power";
gpios = <&gpio1 7 1>;
gpios = <&gpio1 7 GPIO_ACTIVE_LOW>;
default-state = "keep";
};
led@5 {
label = "lsxl:red:func";
gpios = <&gpio1 16 1>;
gpios = <&gpio1 16 GPIO_ACTIVE_LOW>;
};
};
@ -163,13 +163,13 @@ gpio_fan {
compatible = "gpio-fan";
pinctrl-0 = <&pmx_fan_low &pmx_fan_high &pmx_fan_lock>;
pinctrl-names = "default";
gpios = <&gpio0 19 1
&gpio0 18 1>;
gpios = <&gpio0 19 GPIO_ACTIVE_LOW
&gpio0 18 GPIO_ACTIVE_LOW>;
gpio-fan,speed-map = <0 3
1500 2
3250 1
5000 0>;
alarm-gpios = <&gpio1 8 0>;
alarm-gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>;
};
restart_poweroff {

14
arch/arm/boot/dts/kirkwood-mplcec4.dts
View File

@ -110,7 +110,7 @@ mvsdio@90000 {
pinctrl-0 = <&pmx_sdio &pmx_sdio_cd>;
pinctrl-names = "default";
status = "okay";
cd-gpios = <&gpio1 15 1>;
cd-gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
/* No WP GPIO */
};
};
@ -126,36 +126,36 @@ &pmx_led_user0g &pmx_led_misc
health {
label = "status:green:health";
gpios = <&gpio0 7 1>;
gpios = <&gpio0 7 GPIO_ACTIVE_LOW>;
};
user1o {
label = "user1:orange";
gpios = <&gpio1 8 1>;
gpios = <&gpio1 8 GPIO_ACTIVE_LOW>;
default-state = "on";
};
user1g {
label = "user1:green";
gpios = <&gpio1 9 1>;
gpios = <&gpio1 9 GPIO_ACTIVE_LOW>;
default-state = "on";
};
user0o {
label = "user0:orange";
gpios = <&gpio1 12 1>;
gpios = <&gpio1 12 GPIO_ACTIVE_LOW>;
default-state = "on";
};
user0g {
label = "user0:green";
gpios = <&gpio1 13 1>;
gpios = <&gpio1 13 GPIO_ACTIVE_LOW>;
default-state = "on";
};
misc {
label = "status:orange:misc";
gpios = <&gpio1 14 1>;
gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
default-state = "on";
};

14
arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts
View File

@ -90,17 +90,17 @@ gpio-leds {
green-status {
label = "gtw:green:Status";
gpios = <&gpio0 20 0>;
gpios = <&gpio0 20 GPIO_ACTIVE_HIGH>;
};
red-status {
label = "gtw:red:Status";
gpios = <&gpio0 21 0>;
gpios = <&gpio0 21 GPIO_ACTIVE_HIGH>;
};
green-usb {
label = "gtw:green:USB";
gpios = <&gpio0 12 0>;
gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>;
};
};
@ -113,13 +113,13 @@ gpio_keys {
button@1 {
label = "SWR Button";
linux,code = <0x198>; /* KEY_RESTART */
gpios = <&gpio1 15 1>;
linux,code = <KEY_RESTART>;
gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
};
button@2 {
label = "WPS Button";
linux,code = <0x211>; /* KEY_WPS_BUTTON */
gpios = <&gpio1 14 1>;
linux,code = <KEY_WPS_BUTTON>;
gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
};
};
};

2
arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts
View File

@ -11,8 +11,6 @@
/dts-v1/;
#include <dt-bindings/input/input.h>
#include <dt-bindings/gpio/gpio.h>
#include "kirkwood.dtsi"
#include "kirkwood-6282.dtsi"

2
arch/arm/boot/dts/kirkwood-netgear_readynas_nv+_v2.dts
View File

@ -11,8 +11,6 @@
/dts-v1/;
#include <dt-bindings/input/input.h>
#include <dt-bindings/gpio/gpio.h>
#include "kirkwood.dtsi"
#include "kirkwood-6282.dtsi"

8
arch/arm/boot/dts/kirkwood-ns2-common.dtsi
View File

@ -64,8 +64,8 @@ gpio_keys {
button@1 {
label = "Power push button";
linux,code = <116>;
gpios = <&gpio1 0 0>;
linux,code = <KEY_POWER>;
gpios = <&gpio1 0 GPIO_ACTIVE_HIGH>;
};
};
@ -74,13 +74,13 @@ gpio-leds {
red-fail {
label = "ns2:red:fail";
gpios = <&gpio0 12 0>;
gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>;
};
};
gpio_poweroff {
compatible = "gpio-poweroff";
gpios = <&gpio0 31 0>;
gpios = <&gpio0 31 GPIO_ACTIVE_HIGH>;
};
};

2
arch/arm/boot/dts/kirkwood-ns2lite.dts
View File

@ -25,7 +25,7 @@ gpio-leds {
blue-sata {
label = "ns2:blue:sata";
gpios = <&gpio0 30 1>;
gpios = <&gpio0 30 GPIO_ACTIVE_LOW>;
linux,default-trigger = "ide-disk";
};
};

10
arch/arm/boot/dts/kirkwood-ns2max.dts
View File

@ -22,10 +22,10 @@ sata@80000 {
gpio_fan {
compatible = "gpio-fan";
gpios = <&gpio0 22 1
&gpio0 7 1
&gpio1 1 1
&gpio0 23 1>;
gpios = <&gpio0 22 GPIO_ACTIVE_LOW
&gpio0 7 GPIO_ACTIVE_LOW
&gpio1 1 GPIO_ACTIVE_LOW
&gpio0 23 GPIO_ACTIVE_LOW>;
gpio-fan,speed-map =
< 0 0
1500 15
@ -36,7 +36,7 @@ &gpio1 1 1
3300 10
4300 9
5500 8>;
alarm-gpios = <&gpio0 25 1>;
alarm-gpios = <&gpio0 25 GPIO_ACTIVE_LOW>;
};
ns2-leds {

10
arch/arm/boot/dts/kirkwood-ns2mini.dts
View File

@ -23,10 +23,10 @@ sata@80000 {
gpio_fan {
compatible = "gpio-fan";
gpios = <&gpio0 22 1
&gpio0 7 1
&gpio1 1 1
&gpio0 23 1>;
gpios = <&gpio0 22 GPIO_ACTIVE_LOW
&gpio0 7 GPIO_ACTIVE_LOW
&gpio1 1 GPIO_ACTIVE_LOW
&gpio0 23 GPIO_ACTIVE_LOW>;
gpio-fan,speed-map =
< 0 0
3000 15
@ -37,7 +37,7 @@ &gpio1 1 1
7140 10
7980 9
9200 8>;
alarm-gpios = <&gpio0 25 1>;
alarm-gpios = <&gpio0 25 GPIO_ACTIVE_LOW>;
};
ns2-leds {

4
arch/arm/boot/dts/kirkwood-nsa310-common.dtsi
View File

@ -40,7 +40,7 @@ gpio_poweroff {
compatible = "gpio-poweroff";
pinctrl-0 = <&pmx_pwr_off>;
pinctrl-names = "default";
gpios = <&gpio1 16 0>;
gpios = <&gpio1 16 GPIO_ACTIVE_HIGH>;
};
regulators {
@ -58,7 +58,7 @@ usb0_power_off: regulator@1 {
regulator-max-microvolt = <5000000>;
regulator-always-on;
regulator-boot-on;
gpio = <&gpio0 21 0>;
gpio = <&gpio0 21 GPIO_ACTIVE_HIGH>;
};
};
};

32
arch/arm/boot/dts/kirkwood-nsa310.dts
View File

@ -119,18 +119,18 @@ gpio_keys {
button@1 {
label = "Power Button";
linux,code = <116>;
gpios = <&gpio1 14 0>;
linux,code = <KEY_POWER>;
gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>;
};
button@2 {
label = "Copy Button";
linux,code = <133>;
gpios = <&gpio1 5 1>;
linux,code = <KEY_COPY>;
gpios = <&gpio1 5 GPIO_ACTIVE_LOW>;
};
button@3 {
label = "Reset Button";
linux,code = <0x198>;
gpios = <&gpio1 4 1>;
linux,code = <KEY_RESTART>;
gpios = <&gpio1 4 GPIO_ACTIVE_LOW>;
};
};
@ -145,43 +145,43 @@ &pmx_led_copy_green &pmx_led_copy_red
green-sys {
label = "nsa310:green:sys";
gpios = <&gpio0 28 0>;
gpios = <&gpio0 28 GPIO_ACTIVE_HIGH>;
};
red-sys {
label = "nsa310:red:sys";
gpios = <&gpio0 29 0>;
gpios = <&gpio0 29 GPIO_ACTIVE_HIGH>;
};
green-hdd {
label = "nsa310:green:hdd";
gpios = <&gpio1 9 0>;
gpios = <&gpio1 9 GPIO_ACTIVE_HIGH>;
};
red-hdd {
label = "nsa310:red:hdd";
gpios = <&gpio1 10 0>;
gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>;
};
green-esata {
label = "nsa310:green:esata";
gpios = <&gpio0 12 0>;
gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>;
};
red-esata {
label = "nsa310:red:esata";
gpios = <&gpio0 13 0>;
gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>;
};
green-usb {
label = "nsa310:green:usb";
gpios = <&gpio0 15 0>;
gpios = <&gpio0 15 GPIO_ACTIVE_HIGH>;
};
red-usb {
label = "nsa310:red:usb";
gpios = <&gpio0 16 0>;
gpios = <&gpio0 16 GPIO_ACTIVE_HIGH>;
};
green-copy {
label = "nsa310:green:copy";
gpios = <&gpio1 7 0>;
gpios = <&gpio1 7 GPIO_ACTIVE_HIGH>;
};
red-copy {
label = "nsa310:red:copy";
gpios = <&gpio1 8 0>;
gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>;
};
};
};

30
arch/arm/boot/dts/kirkwood-nsa310a.dts
View File

@ -107,18 +107,18 @@ gpio_keys {
button@1 {
label = "Power Button";
linux,code = <116>;
gpios = <&gpio1 14 0>;
linux,code = <KEY_POWER>;
gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>;
};
button@2 {
label = "Copy Button";
linux,code = <133>;
gpios = <&gpio1 5 1>;
linux,code = <KEY_COPY>;
gpios = <&gpio1 5 GPIO_ACTIVE_LOW>;
};
button@3 {
label = "Reset Button";
linux,code = <0x198>;
gpios = <&gpio1 4 1>;
linux,code = <KEY_RESTART>;
gpios = <&gpio1 4 GPIO_ACTIVE_LOW>;
};
};
@ -127,39 +127,39 @@ gpio-leds {
green-sys {
label = "nsa310:green:sys";
gpios = <&gpio0 28 0>;
gpios = <&gpio0 28 GPIO_ACTIVE_HIGH>;
};
red-sys {
label = "nsa310:red:sys";
gpios = <&gpio0 29 0>;
gpios = <&gpio0 29 GPIO_ACTIVE_HIGH>;
};
green-hdd {
label = "nsa310:green:hdd";
gpios = <&gpio1 9 0>;
gpios = <&gpio1 9 GPIO_ACTIVE_HIGH>;
};
red-hdd {
label = "nsa310:red:hdd";
gpios = <&gpio1 10 0>;
gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>;
};
green-esata {
label = "nsa310:green:esata";
gpios = <&gpio0 12 0>;
gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>;
};
red-esata {
label = "nsa310:red:esata";
gpios = <&gpio0 13 0>;
gpios = <&gpio0 13 GPIO_ACTIVE_HIGH>;
};
green-usb {
label = "nsa310:green:usb";
gpios = <&gpio0 15 0>;
gpios = <&gpio0 15 GPIO_ACTIVE_HIGH>;
};
green-copy {
label = "nsa310:green:copy";
gpios = <&gpio1 7 0>;
gpios = <&gpio1 7 GPIO_ACTIVE_HIGH>;
};
red-copy {
label = "nsa310:red:copy";
gpios = <&gpio1 8 0>;
gpios = <&gpio1 8 GPIO_ACTIVE_HIGH>;
};
};
};

10
arch/arm/boot/dts/kirkwood-openblocks_a6.dts
View File

@ -101,17 +101,17 @@ gpio-leds {
led-red {
label = "obsa6:red:stat";
gpios = <&gpio1 9 1>;
gpios = <&gpio1 9 GPIO_ACTIVE_LOW>;
};
led-green {
label = "obsa6:green:stat";
gpios = <&gpio1 10 1>;
gpios = <&gpio1 10 GPIO_ACTIVE_LOW>;
};
led-yellow {
label = "obsa6:yellow:stat";
gpios = <&gpio1 11 1>;
gpios = <&gpio1 11 GPIO_ACTIVE_LOW>;
};
};
@ -124,8 +124,8 @@ gpio_keys {
button@1 {
label = "Init Button";
linux,code = <116>;
gpios = <&gpio1 6 0>;
linux,code = <KEY_POWER>;
gpios = <&gpio1 6 GPIO_ACTIVE_HIGH>;
};
};
};

10
arch/arm/boot/dts/kirkwood-openblocks_a7.dts
View File

@ -126,17 +126,17 @@ gpio-leds {
led-red {
label = "obsa7:red:stat";
gpios = <&gpio1 9 1>;
gpios = <&gpio1 9 GPIO_ACTIVE_LOW>;
};
led-green {
label = "obsa7:green:stat";
gpios = <&gpio1 10 1>;
gpios = <&gpio1 10 GPIO_ACTIVE_LOW>;
};
led-yellow {
label = "obsa7:yellow:stat";
gpios = <&gpio1 11 1>;
gpios = <&gpio1 11 GPIO_ACTIVE_LOW>;
};
};
@ -149,8 +149,8 @@ gpio_keys {
button@1 {
label = "Init Button";
linux,code = <116>;
gpios = <&gpio1 6 0>;
linux,code = <KEY_POWER>;
gpios = <&gpio1 6 GPIO_ACTIVE_HIGH>;
};
};
};

6
arch/arm/boot/dts/kirkwood-sheevaplug-esata.dts
View File

@ -24,8 +24,8 @@ mvsdio@90000 {
pinctrl-0 = <&pmx_sdio &pmx_sdio_cd &pmx_sdio_wp>;
pinctrl-names = "default";
status = "okay";
cd-gpios = <&gpio1 12 1>;
wp-gpios = <&gpio1 15 0>;
cd-gpios = <&gpio1 12 GPIO_ACTIVE_LOW>;
wp-gpios = <&gpio1 15 GPIO_ACTIVE_HIGH>;
};
};
@ -36,7 +36,7 @@ gpio-leds {
health {
label = "sheevaplug:blue:health";
gpios = <&gpio1 17 1>;
gpios = <&gpio1 17 GPIO_ACTIVE_LOW>;
default-state = "keep";
};
};

4
arch/arm/boot/dts/kirkwood-sheevaplug.dts
View File

@ -31,13 +31,13 @@ gpio-leds {
health {
label = "sheevaplug:blue:health";
gpios = <&gpio1 17 1>;
gpios = <&gpio1 17 GPIO_ACTIVE_LOW>;
default-state = "keep";
};
misc {
label = "sheevaplug:red:misc";
gpios = <&gpio1 14 1>;
gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
};
};
};

10
arch/arm/boot/dts/kirkwood-topkick.dts
View File

@ -131,25 +131,25 @@ &pmx_led_sys_blue &pmx_led_wifi_green
disk {
label = "topkick:yellow:disk";
gpios = <&gpio0 21 1>;
gpios = <&gpio0 21 GPIO_ACTIVE_LOW>;
linux,default-trigger = "ide-disk";
};
system2 {
label = "topkick:red:system";
gpios = <&gpio1 5 1>;
gpios = <&gpio1 5 GPIO_ACTIVE_LOW>;
};
system {
label = "topkick:blue:system";
gpios = <&gpio1 6 1>;
gpios = <&gpio1 6 GPIO_ACTIVE_LOW>;
default-state = "on";
};
wifi {
label = "topkick:green:wifi";
gpios = <&gpio1 7 1>;
gpios = <&gpio1 7 GPIO_ACTIVE_LOW>;
};
wifi2 {
label = "topkick:yellow:wifi";
gpios = <&gpio1 16 1>;
gpios = <&gpio1 16 GPIO_ACTIVE_LOW>;
};
};
regulators {

8
arch/arm/boot/dts/kirkwood-ts219-6281.dts
View File

@ -41,13 +41,13 @@ gpio_keys {
button@1 {
label = "USB Copy";
linux,code = <133>;
gpios = <&gpio0 15 1>;
linux,code = <KEY_COPY>;
gpios = <&gpio0 15 GPIO_ACTIVE_LOW>;
};
button@2 {
label = "Reset";
linux,code = <0x198>;
gpios = <&gpio0 16 1>;
linux,code = <KEY_RESTART>;
gpios = <&gpio0 16 GPIO_ACTIVE_LOW>;
};
};
};

8
arch/arm/boot/dts/kirkwood-ts219-6282.dts
View File

@ -51,13 +51,13 @@ gpio_keys {
button@1 {
label = "USB Copy";
linux,code = <133>;
gpios = <&gpio1 11 1>;
linux,code = <KEY_COPY>;
gpios = <&gpio1 11 GPIO_ACTIVE_LOW>;
};
button@2 {
label = "Reset";
linux,code = <0x198>;
gpios = <&gpio1 5 1>;
linux,code = <KEY_RESTART>;
gpios = <&gpio1 5 GPIO_ACTIVE_LOW>;
};
};
};

2
arch/arm/boot/dts/kirkwood.dtsi
View File

@ -1,4 +1,6 @@
/include/ "skeleton.dtsi"
#include <dt-bindings/input/input.h>
#include <dt-bindings/gpio/gpio.h>
#define MBUS_ID(target,attributes) (((target) << 24) | ((attributes) << 16))