ARM: DT: Kirkwood: Use symbolic names from input.h
PATCH 1/2 ARM: DT: Kirkwood: Use symbolic names from input.h
Replace the numeric key value with a symbolic name from <bt-bindings/input/input.h>
--- arch/arm/boot/dts/kirkwood-cloudbox.dts | 2 +- arch/arm/boot/dts/kirkwood-dnskw.dtsi | 6 +++--- arch/arm/boot/dts/kirkwood-ib62x0.dts | 4 ++-- arch/arm/boot/dts/kirkwood-iconnect.dts | 4 ++-- arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts | 6 +++--- arch/arm/boot/dts/kirkwood-lsxl.dtsi | 6 +++--- arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts | 4 ++-- arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts | 6 +++--- arch/arm/boot/dts/kirkwood-ns2-common.dtsi | 2 +- arch/arm/boot/dts/kirkwood-nsa310.dts | 6 +++--- arch/arm/boot/dts/kirkwood-nsa310a.dts | 6 +++--- arch/arm/boot/dts/kirkwood-openblocks_a6.dts | 2 +- arch/arm/boot/dts/kirkwood-openblocks_a7.dts | 2 +- arch/arm/boot/dts/kirkwood-ts219-6281.dts | 4 ++-- arch/arm/boot/dts/kirkwood-ts219-6282.dts | 4 ++-- arch/arm/boot/dts/kirkwood.dtsi | 1 + 16 files changed, 33 insertions(+), 32 deletions(-)
arch/arm/boot/dts/kirkwood-cloudbox.dts +1 -1
@@ -66,7 +66,7 @@ button at 1 { label = "Power push button"; - linux,code = <116>; + linux,code = <KEY_POWER>; gpios = <&gpio0 16 1>; }; };
arch/arm/boot/dts/kirkwood-dnskw.dtsi +3 -3
@@ -15,17 +15,17 @@ button at 1 { label = "Power button"; - linux,code = <116>; + linux,code = <KEY_POWER>; gpios = <&gpio1 2 1>; }; button at 2 { label = "USB unmount button"; - linux,code = <161>; + linux,code = <KEY_EJECTCD>; gpios = <&gpio1 15 1>; }; button at 3 { label = "Reset button"; - linux,code = <0x198>; + linux,code = <KEY_RESTART>; gpios = <&gpio1 16 1>; }; };
arch/arm/boot/dts/kirkwood-ib62x0.dts +2 -2
@@ -63,12 +63,12 @@ button at 1 { label = "USB Copy"; - linux,code = <133>; + linux,code = <KEY_COPY>; gpios = <&gpio0 29 1>; }; button at 2 { label = "Reset"; - linux,code = <0x198>; + linux,code = <KEY_RESTART>; gpios = <&gpio0 28 1>; }; };
arch/arm/boot/dts/kirkwood-iconnect.dts +2 -2
@@ -137,13 +137,13 @@ button at 1 { label = "OTB Button"; - linux,code = <133>; + linux,code = <KEY_COPY>; gpios = <&gpio1 3 1>; debounce-interval = <100>; }; button at 2 { label = "Reset"; - linux,code = <0x198>; + linux,code = <KEY_RESTART>; gpios = <&gpio0 12 1>; debounce-interval = <100>; };
arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts +3 -3
@@ -154,17 +154,17 @@ Power { label = "Power Button"; - linux,code = <116>; + linux,code = <KEY_POWER>; gpios = <&gpio0 14 1>; }; Reset { label = "Reset Button"; - linux,code = <0x198>; + linux,code = <KEY_RESTART>; gpios = <&gpio0 12 1>; }; OTB { label = "OTB Button"; - linux,code = <133>; + linux,code = <KEY_COPY>; gpios = <&gpio1 3 1>; }; };
arch/arm/boot/dts/kirkwood-lsxl.dtsi +3 -3
@@ -108,18 +108,18 @@ button at 1 { label = "Function Button"; - linux,code = <357>; + linux,code = <KEY_OPTION>; gpios = <&gpio1 9 1>; }; button at 2 { label = "Power-on Switch"; - linux,code = <0>; + linux,code = <KEY_RESERVED>; linux,input-type = <5>; gpios = <&gpio1 10 1>; }; button at 3 { label = "Power-auto Switch"; - linux,code = <1>; + linux,code = <KEY_ESC>; linux,input-type = <5>; gpios = <&gpio1 11 1>; };
arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts +2 -2
@@ -113,12 +113,12 @@ button at 1 { label = "SWR Button"; - linux,code = <0x198>; /* KEY_RESTART */ + linux,code = <KEY_RESTART>; gpios = <&gpio1 15 1>; }; button at 2 { label = "WPS Button"; - linux,code = <0x211>; /* KEY_WPS_BUTTON */ + linux,code = <KEY_WPS_BUTTON>; gpios = <&gpio1 14 1>; }; };
arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts +3 -3
@@ -143,17 +143,17 @@ button at 1 { label = "Power Button"; - linux,code = <116>; /* KEY_POWER */ + linux,code = <KEY_POWER>; gpios = <&gpio1 15 1>; }; button at 2 { label = "Reset Button"; - linux,code = <0x198>; /* KEY_RESTART */ + linux,code = <KEY_RESTART>; gpios = <&gpio0 13 1>; }; button at 3 { label = "Backup Button"; - linux,code = <133>; /* KEY_COPY */ + linux,code = <KEY_COPY>; gpios = <&gpio1 13 1>; }; };
arch/arm/boot/dts/kirkwood-ns2-common.dtsi +1 -1
@@ -64,7 +64,7 @@ button at 1 { label = "Power push button"; - linux,code = <116>; + linux,code = <KEY_POWER>; gpios = <&gpio1 0 0>; }; };
arch/arm/boot/dts/kirkwood-nsa310.dts +3 -3
@@ -119,17 +119,17 @@ button at 1 { label = "Power Button"; - linux,code = <116>; + linux,code = <KEY_POWER>; gpios = <&gpio1 14 0>; }; button at 2 { label = "Copy Button"; - linux,code = <133>; + linux,code = <KEY_COPY>; gpios = <&gpio1 5 1>; }; button at 3 { label = "Reset Button"; - linux,code = <0x198>; + linux,code = <KEY_RESTART>; gpios = <&gpio1 4 1>; }; };
arch/arm/boot/dts/kirkwood-nsa310a.dts +3 -3
@@ -107,17 +107,17 @@ button at 1 { label = "Power Button"; - linux,code = <116>; + linux,code = <KEY_POWER>; gpios = <&gpio1 14 0>; }; button at 2 { label = "Copy Button"; - linux,code = <133>; + linux,code = <KEY_COPY>; gpios = <&gpio1 5 1>; }; button at 3 { label = "Reset Button"; - linux,code = <0x198>; + linux,code = <KEY_RESTART>; gpios = <&gpio1 4 1>; }; };
arch/arm/boot/dts/kirkwood-openblocks_a6.dts +1 -1
@@ -124,7 +124,7 @@ button at 1 { label = "Init Button"; - linux,code = <116>; + linux,code = <KEY_POWER>; gpios = <&gpio1 6 0>; }; };
arch/arm/boot/dts/kirkwood-openblocks_a7.dts +1 -1
@@ -149,7 +149,7 @@ button at 1 { label = "Init Button"; - linux,code = <116>; + linux,code = <KEY_POWER>; gpios = <&gpio1 6 0>; }; };
arch/arm/boot/dts/kirkwood-ts219-6281.dts +2 -2
@@ -41,12 +41,12 @@ button at 1 { label = "USB Copy"; - linux,code = <133>; + linux,code = <KEY_COPY>; gpios = <&gpio0 15 1>; }; button at 2 { label = "Reset"; - linux,code = <0x198>; + linux,code = <KEY_RESTART>; gpios = <&gpio0 16 1>; }; };
arch/arm/boot/dts/kirkwood-ts219-6282.dts +2 -2
@@ -51,12 +51,12 @@ button at 1 { label = "USB Copy"; - linux,code = <133>; + linux,code = <KEY_COPY>; gpios = <&gpio1 11 1>; }; button at 2 { label = "Reset"; - linux,code = <0x198>; + linux,code = <KEY_RESTART>; gpios = <&gpio1 5 1>; }; };
arch/arm/boot/dts/kirkwood.dtsi +1 -0
@@ -1,4 +1,5 @@ /include/ "skeleton.dtsi" +#include <dt-bindings/input/input.h> #define MBUS_ID(target,attributes) (((target) << 24) | ((attributes) << 16))
Signature · 1 line
1.8.5
PATCH 2/2 ARM: DT: Kirkwood: Use symbolic names from gpio.h
Use GPIO_ACTIVE_HIGH and GPIO_ACTIVE_LOW instead of 0 and 1.
--- arch/arm/boot/dts/kirkwood-cloudbox.dts | 8 +++---- arch/arm/boot/dts/kirkwood-db.dtsi | 4 ++-- arch/arm/boot/dts/kirkwood-dns320.dts | 10 ++++----- arch/arm/boot/dts/kirkwood-dns325.dts | 10 ++++----- arch/arm/boot/dts/kirkwood-dnskw.dtsi | 12 +++++----- arch/arm/boot/dts/kirkwood-dockstar.dts | 4 ++-- arch/arm/boot/dts/kirkwood-dreamplug.dts | 6 ++--- arch/arm/boot/dts/kirkwood-goflexnet.dts | 22 +++++++++--------- .../arm/boot/dts/kirkwood-guruplug-server-plus.dts | 8 +++---- arch/arm/boot/dts/kirkwood-ib62x0.dts | 12 +++++----- arch/arm/boot/dts/kirkwood-iconnect.dts | 20 ++++++++--------- arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts | 14 ++++++------ arch/arm/boot/dts/kirkwood-km_kirkwood.dts | 4 ++-- arch/arm/boot/dts/kirkwood-lsxl.dtsi | 22 +++++++++--------- arch/arm/boot/dts/kirkwood-mplcec4.dts | 14 ++++++------ arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts | 10 ++++----- .../boot/dts/kirkwood-netgear_readynas_duo_v2.dts | 16 ++++++------- arch/arm/boot/dts/kirkwood-ns2-common.dtsi | 6 ++--- arch/arm/boot/dts/kirkwood-ns2lite.dts | 2 +- arch/arm/boot/dts/kirkwood-ns2max.dts | 10 ++++----- arch/arm/boot/dts/kirkwood-ns2mini.dts | 10 ++++----- arch/arm/boot/dts/kirkwood-nsa310-common.dtsi | 4 ++-- arch/arm/boot/dts/kirkwood-nsa310.dts | 26 +++++++++++----------- arch/arm/boot/dts/kirkwood-nsa310a.dts | 24 ++++++++++---------- arch/arm/boot/dts/kirkwood-openblocks_a6.dts | 8 +++---- arch/arm/boot/dts/kirkwood-openblocks_a7.dts | 8 +++---- arch/arm/boot/dts/kirkwood-sheevaplug-esata.dts | 6 ++--- arch/arm/boot/dts/kirkwood-sheevaplug.dts | 4 ++-- arch/arm/boot/dts/kirkwood-topkick.dts | 10 ++++----- arch/arm/boot/dts/kirkwood-ts219-6281.dts | 4 ++-- arch/arm/boot/dts/kirkwood-ts219-6282.dts | 4 ++-- arch/arm/boot/dts/kirkwood.dtsi | 1 + 32 files changed, 162 insertions(+), 161 deletions(-)
arch/arm/boot/dts/kirkwood-cloudbox.dts +4 -4
@@ -67,7 +67,7 @@ button at 1 { label = "Power push button"; linux,code = <KEY_POWER>; - gpios = <&gpio0 16 1>; + gpios = <&gpio0 16 GPIO_ACTIVE_LOW>; }; };
@@ -76,17 +76,17 @@ 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>; }; };
arch/arm/boot/dts/kirkwood-db.dtsi +2 -2
@@ -51,8 +51,8 @@ mvsdio at 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"; }; };
arch/arm/boot/dts/kirkwood-dns320.dts +5 -5
@@ -24,24 +24,24 @@ blue-power { label = "dns320:blue:power"; - gpios = <&gpio0 26 1>; /* GPIO 26 Active Low */ + gpios = <&gpio0 26 GPIO_ACTIVE_LOW>; linux,default-trigger = "default-on"; }; 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 */ }; };
arch/arm/boot/dts/kirkwood-dns325.dts +5 -5
@@ -24,24 +24,24 @@ white-power { label = "dns325:white:power"; - gpios = <&gpio0 26 1>; /* GPIO 26 Active Low */ + gpios = <&gpio0 26 GPIO_ACTIVE_LOW>; linux,default-trigger = "default-on"; }; 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>; }; };
arch/arm/boot/dts/kirkwood-dnskw.dtsi +6 -6
@@ -16,17 +16,17 @@ button at 1 { label = "Power button"; linux,code = <KEY_POWER>; - gpios = <&gpio1 2 1>; + gpios = <&gpio1 2 GPIO_ACTIVE_LOW>; }; button at 2 { label = "USB unmount button"; linux,code = <KEY_EJECTCD>; - gpios = <&gpio1 15 1>; + gpios = <&gpio1 15 GPIO_ACTIVE_LOW>; }; button at 3 { label = "Reset button"; linux,code = <KEY_RESTART>; - gpios = <&gpio1 16 1>; + gpios = <&gpio1 16 GPIO_ACTIVE_LOW>; }; };
@@ -35,8 +35,8 @@ 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 @@ compatible = "gpio-poweroff"; pinctrl-0 = <&pmx_power_off>; pinctrl-names = "default"; - gpios = <&gpio1 4 0>; + gpios = <&gpio1 4 GPIO_ACTIVE_HIGH>; }; ocp at f1000000 {
arch/arm/boot/dts/kirkwood-dockstar.dts +2 -2
@@ -42,12 +42,12 @@ health { label = "status:green:health"; - gpios = <&gpio1 14 1>; + gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; linux,default-trigger = "default-on"; }; fault { label = "status:orange:fault"; - gpios = <&gpio1 15 1>; + gpios = <&gpio1 15 GPIO_ACTIVE_LOW>; }; }; regulators {
arch/arm/boot/dts/kirkwood-dreamplug.dts +3 -3
@@ -87,15 +87,15 @@ 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>; }; }; };
arch/arm/boot/dts/kirkwood-goflexnet.dts +11 -11
@@ -85,44 +85,44 @@ health { label = "status:green:health"; - gpios = <&gpio1 14 1>; + gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; linux,default-trigger = "default-on"; }; 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 @@ enable-active-high; regulator-always-on; regulator-boot-on; - gpio = <&gpio0 29 0>; + gpio = <&gpio0 29 GPIO_ACTIVE_HIGH>; }; }; };
arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts +4 -4
@@ -60,19 +60,19 @@ 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>; }; }; };
arch/arm/boot/dts/kirkwood-ib62x0.dts +6 -6
@@ -64,12 +64,12 @@ button at 1 { label = "USB Copy"; linux,code = <KEY_COPY>; - gpios = <&gpio0 29 1>; + gpios = <&gpio0 29 GPIO_ACTIVE_LOW>; }; button at 2 { label = "Reset"; linux,code = <KEY_RESTART>; - gpios = <&gpio0 28 1>; + gpios = <&gpio0 28 GPIO_ACTIVE_LOW>; }; };
@@ -81,16 +81,16 @@ green-os { label = "ib62x0:green:os"; - gpios = <&gpio0 25 0>; + gpios = <&gpio0 25 GPIO_ACTIVE_HIGH>; linux,default-trigger = "default-on"; }; 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 @@ compatible = "gpio-poweroff"; pinctrl-0 = <&pmx_power_off>; pinctrl-names = "default"; - gpios = <&gpio0 24 0>; + gpios = <&gpio0 24 GPIO_ACTIVE_HIGH>; }; };
arch/arm/boot/dts/kirkwood-iconnect.dts +10 -10
@@ -94,37 +94,37 @@ led-level { label = "led_level"; - gpios = <&gpio1 9 0>; + gpios = <&gpio1 9 GPIO_ACTIVE_HIGH>; linux,default-trigger = "default-on"; }; power-blue { label = "power:blue"; - gpios = <&gpio1 10 0>; + gpios = <&gpio1 10 GPIO_ACTIVE_HIGH>; linux,default-trigger = "timer"; }; 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>; }; };
@@ -138,13 +138,13 @@ button at 1 { label = "OTB Button"; linux,code = <KEY_COPY>; - gpios = <&gpio1 3 1>; + gpios = <&gpio1 3 GPIO_ACTIVE_LOW>; debounce-interval = <100>; }; button at 2 { label = "Reset"; linux,code = <KEY_RESTART>; - gpios = <&gpio0 12 1>; + gpios = <&gpio0 12 GPIO_ACTIVE_LOW>; debounce-interval = <100>; }; };
arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts +7 -7
@@ -127,20 +127,20 @@ power_led { label = "status:white:power_led"; - gpios = <&gpio0 16 0>; + gpios = <&gpio0 16 GPIO_ACTIVE_HIGH>; linux,default-trigger = "default-on"; }; 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 {
@@ -155,17 +155,17 @@ Power { label = "Power Button"; linux,code = <KEY_POWER>; - gpios = <&gpio0 14 1>; + gpios = <&gpio0 14 GPIO_ACTIVE_LOW>; }; Reset { label = "Reset Button"; linux,code = <KEY_RESTART>; - gpios = <&gpio0 12 1>; + gpios = <&gpio0 12 GPIO_ACTIVE_LOW>; }; OTB { label = "OTB Button"; linux,code = <KEY_COPY>; - gpios = <&gpio1 3 1>; + gpios = <&gpio1 3 GPIO_ACTIVE_LOW>; }; }; };
arch/arm/boot/dts/kirkwood-km_kirkwood.dts +2 -2
@@ -38,8 +38,8 @@ i2c at 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 */ }; };
arch/arm/boot/dts/kirkwood-lsxl.dtsi +11 -11
@@ -109,19 +109,19 @@ button at 1 { label = "Function Button"; linux,code = <KEY_OPTION>; - gpios = <&gpio1 9 1>; + gpios = <&gpio1 9 GPIO_ACTIVE_LOW>; }; button at 2 { label = "Power-on Switch"; linux,code = <KEY_RESERVED>; linux,input-type = <5>; - gpios = <&gpio1 10 1>; + gpios = <&gpio1 10 GPIO_ACTIVE_LOW>; }; button at 3 { label = "Power-auto Switch"; linux,code = <KEY_ESC>; linux,input-type = <5>; - gpios = <&gpio1 11 1>; + gpios = <&gpio1 11 GPIO_ACTIVE_LOW>; }; };
@@ -134,28 +134,28 @@ led at 1 { label = "lsxl:blue:func"; - gpios = <&gpio1 4 1>; + gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; }; led at 2 { label = "lsxl:red:alarm"; - gpios = <&gpio1 5 1>; + gpios = <&gpio1 5 GPIO_ACTIVE_LOW>; }; led at 3 { label = "lsxl:amber:info"; - gpios = <&gpio1 6 1>; + gpios = <&gpio1 6 GPIO_ACTIVE_LOW>; }; led at 4 { label = "lsxl:blue:power"; - gpios = <&gpio1 7 1>; + gpios = <&gpio1 7 GPIO_ACTIVE_LOW>; linux,default-trigger = "default-on"; }; led at 5 { label = "lsxl:red:func"; - gpios = <&gpio1 16 1>; + gpios = <&gpio1 16 GPIO_ACTIVE_LOW>; }; };
@@ -163,13 +163,13 @@ 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 {
arch/arm/boot/dts/kirkwood-mplcec4.dts +7 -7
@@ -110,7 +110,7 @@ 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 @@ 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"; };
arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts +5 -5
@@ -90,17 +90,17 @@ 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>; }; };
@@ -114,12 +114,12 @@ button at 1 { label = "SWR Button"; linux,code = <KEY_RESTART>; - gpios = <&gpio1 15 1>; + gpios = <&gpio1 15 GPIO_ACTIVE_LOW>; }; button at 2 { label = "WPS Button"; linux,code = <KEY_WPS_BUTTON>; - gpios = <&gpio1 14 1>; + gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; }; }; };
arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts +8 -8
@@ -112,24 +112,24 @@ power_led { label = "status:blue:power_led"; - gpios = <&gpio0 31 1>; /* GPIO 31 Active Low */ + gpios = <&gpio0 31 GPIO_ACTIVE_LOW>; linux,default-trigger = "default-on"; }; activity_led { label = "status:blue:activity_led"; - gpios = <&gpio1 6 1>; /* GPIO 38 Active Low */ + gpios = <&gpio1 6 GPIO_ACTIVE_LOW>; /* GPIO 38 */ }; disk1_led { label = "status:blue:disk1_led"; - gpios = <&gpio0 23 1>; /* GPIO 23 Active Low */ + gpios = <&gpio0 23 GPIO_ACTIVE_LOW>; }; disk2_led { label = "status:blue:disk2_led"; - gpios = <&gpio0 22 1>; /* GPIO 22 Active Low */ + gpios = <&gpio0 22 GPIO_ACTIVE_LOW>; }; backup_led { label = "status:blue:backup_led"; - gpios = <&gpio0 29 1>; /* GPIO 29 Active Low*/ + gpios = <&gpio0 29 GPIO_ACTIVE_LOW>; }; };
@@ -144,17 +144,17 @@ button at 1 { label = "Power Button"; linux,code = <KEY_POWER>; - gpios = <&gpio1 15 1>; + gpios = <&gpio1 15 GPIO_ACTIVE_LOW>; }; button at 2 { label = "Reset Button"; linux,code = <KEY_RESTART>; - gpios = <&gpio0 13 1>; + gpios = <&gpio0 13 GPIO_ACTIVE_LOW>; }; button at 3 { label = "Backup Button"; linux,code = <KEY_COPY>; - gpios = <&gpio1 13 1>; + gpios = <&gpio1 13 GPIO_ACTIVE_LOW>; }; };
arch/arm/boot/dts/kirkwood-ns2-common.dtsi +3 -3
@@ -65,7 +65,7 @@ button at 1 { label = "Power push button"; linux,code = <KEY_POWER>; - gpios = <&gpio1 0 0>; + gpios = <&gpio1 0 GPIO_ACTIVE_HIGH>; }; };
@@ -74,13 +74,13 @@ 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>; }; };
arch/arm/boot/dts/kirkwood-ns2lite.dts +1 -1
@@ -25,7 +25,7 @@ blue-sata { label = "ns2:blue:sata"; - gpios = <&gpio0 30 1>; + gpios = <&gpio0 30 GPIO_ACTIVE_LOW>; linux,default-trigger = "default-on"; }; };
arch/arm/boot/dts/kirkwood-ns2max.dts +5 -5
@@ -22,10 +22,10 @@ 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 @@ 3300 10 4300 9 5500 8>; - alarm-gpios = <&gpio0 25 1>; + alarm-gpios = <&gpio0 25 GPIO_ACTIVE_LOW>; }; ns2-leds {
arch/arm/boot/dts/kirkwood-ns2mini.dts +5 -5
@@ -23,10 +23,10 @@ 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 @@ 7140 10 7980 9 9200 8>; - alarm-gpios = <&gpio0 25 1>; + alarm-gpios = <&gpio0 25 GPIO_ACTIVE_LOW>; }; ns2-leds {
arch/arm/boot/dts/kirkwood-nsa310-common.dtsi +2 -2
@@ -40,7 +40,7 @@ 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 @@ regulator-max-microvolt = <5000000>; regulator-always-on; regulator-boot-on; - gpio = <&gpio0 21 0>; + gpio = <&gpio0 21 GPIO_ACTIVE_HIGH>; }; }; };
arch/arm/boot/dts/kirkwood-nsa310.dts +13 -13
@@ -120,17 +120,17 @@ button at 1 { label = "Power Button"; linux,code = <KEY_POWER>; - gpios = <&gpio1 14 0>; + gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>; }; button at 2 { label = "Copy Button"; linux,code = <KEY_COPY>; - gpios = <&gpio1 5 1>; + gpios = <&gpio1 5 GPIO_ACTIVE_LOW>; }; button at 3 { label = "Reset Button"; linux,code = <KEY_RESTART>; - gpios = <&gpio1 4 1>; + gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; }; };
@@ -145,43 +145,43 @@ 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>; }; }; };
arch/arm/boot/dts/kirkwood-nsa310a.dts +12 -12
@@ -108,17 +108,17 @@ button at 1 { label = "Power Button"; linux,code = <KEY_POWER>; - gpios = <&gpio1 14 0>; + gpios = <&gpio1 14 GPIO_ACTIVE_HIGH>; }; button at 2 { label = "Copy Button"; linux,code = <KEY_COPY>; - gpios = <&gpio1 5 1>; + gpios = <&gpio1 5 GPIO_ACTIVE_LOW>; }; button at 3 { label = "Reset Button"; linux,code = <KEY_RESTART>; - gpios = <&gpio1 4 1>; + gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; }; };
@@ -127,39 +127,39 @@ 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>; }; }; };
arch/arm/boot/dts/kirkwood-openblocks_a6.dts +4 -4
@@ -101,17 +101,17 @@ 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>; }; };
@@ -125,7 +125,7 @@ button at 1 { label = "Init Button"; linux,code = <KEY_POWER>; - gpios = <&gpio1 6 0>; + gpios = <&gpio1 6 GPIO_ACTIVE_HIGH>; }; }; };
arch/arm/boot/dts/kirkwood-openblocks_a7.dts +4 -4
@@ -126,17 +126,17 @@ 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>; }; };
@@ -150,7 +150,7 @@ button at 1 { label = "Init Button"; linux,code = <KEY_POWER>; - gpios = <&gpio1 6 0>; + gpios = <&gpio1 6 GPIO_ACTIVE_HIGH>; }; }; };
arch/arm/boot/dts/kirkwood-sheevaplug-esata.dts +3 -3
@@ -24,8 +24,8 @@ 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 @@ health { label = "sheevaplug:blue:health"; - gpios = <&gpio1 17 1>; + gpios = <&gpio1 17 GPIO_ACTIVE_LOW>; linux,default-trigger = "default-on"; }; };
arch/arm/boot/dts/kirkwood-sheevaplug.dts +2 -2
@@ -31,13 +31,13 @@ health { label = "sheevaplug:blue:health"; - gpios = <&gpio1 17 1>; + gpios = <&gpio1 17 GPIO_ACTIVE_LOW>; linux,default-trigger = "default-on"; }; misc { label = "sheevaplug:red:misc"; - gpios = <&gpio1 14 1>; + gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; }; }; };
arch/arm/boot/dts/kirkwood-topkick.dts +5 -5
@@ -131,25 +131,25 @@ 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 {
arch/arm/boot/dts/kirkwood-ts219-6281.dts +2 -2
@@ -42,12 +42,12 @@ button at 1 { label = "USB Copy"; linux,code = <KEY_COPY>; - gpios = <&gpio0 15 1>; + gpios = <&gpio0 15 GPIO_ACTIVE_LOW>; }; button at 2 { label = "Reset"; linux,code = <KEY_RESTART>; - gpios = <&gpio0 16 1>; + gpios = <&gpio0 16 GPIO_ACTIVE_LOW>; }; }; };
arch/arm/boot/dts/kirkwood-ts219-6282.dts +2 -2
@@ -52,12 +52,12 @@ button at 1 { label = "USB Copy"; linux,code = <KEY_COPY>; - gpios = <&gpio1 11 1>; + gpios = <&gpio1 11 GPIO_ACTIVE_LOW>; }; button at 2 { label = "Reset"; linux,code = <KEY_RESTART>; - gpios = <&gpio1 5 1>; + gpios = <&gpio1 5 GPIO_ACTIVE_LOW>; }; }; };
arch/arm/boot/dts/kirkwood.dtsi +1 -0
@@ -1,5 +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))
Signature · 1 line
1.8.5
PATCH 1/2 ARM: DT: Kirkwood: Use symbolic names from input.h
In reply to Andrew LunnHi Andrew,
Quoted 4 lines · Andrew Lunn
Replace the numeric key value with a symbolic name from <
bt-bindings/input/input.h>Signed-off-by Andrew Lunn <[email protected]>
Quoted 9 lines
--- arch/arm/boot/dts/kirkwood-cloudbox.dts | 2 +- arch/arm/boot/dts/kirkwood-dnskw.dtsi | 6 +++--- arch/arm/boot/dts/kirkwood-ib62x0.dts | 4 ++-- arch/arm/boot/dts/kirkwood-iconnect.dts | 4 ++-- arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts | 6 +++--- arch/arm/boot/dts/kirkwood-lsxl.dtsi | 6 +++--- arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts | 4 ++-- arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts | 6 +++---
Jason just applied (yesterday IIRC) to mvebu/dt a series which provides cleanup for ReadyNAS .dts files. Among other things, it replaces numeric key values with a symbolic name. And it also does the same for GPIO voltage level. I guess you can remove that specific .dts from your patch.
Just in case you have the same in preparation for armada .dts files, RN102 and RN104 .dts files are also fixed in mvebu/dt.
Anyway, thanks for that work.
Cheers,
a+
PATCH 1/2 ARM: DT: Kirkwood: Use symbolic names from input.h
Andrew,
Quoted 23 lines · Arnaud Ebalard
Hi Andrew,
Quoted 4 lines · Andrew Lunn
Replace the numeric key value with a symbolic name from <
bt-bindings/input/input.h>Signed-off-by Andrew Lunn <[email protected]>Quoted 9 lines
--- arch/arm/boot/dts/kirkwood-cloudbox.dts | 2 +- arch/arm/boot/dts/kirkwood-dnskw.dtsi | 6 +++--- arch/arm/boot/dts/kirkwood-ib62x0.dts | 4 ++-- arch/arm/boot/dts/kirkwood-iconnect.dts | 4 ++-- arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts | 6 +++--- arch/arm/boot/dts/kirkwood-lsxl.dtsi | 6 +++--- arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts | 4 ++-- arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts | 6 +++---Jason just applied (yesterday IIRC) to mvebu/dt a series which provides cleanup for ReadyNAS .dts files. Among other things, it replaces numeric key values with a symbolic name. And it also does the same for GPIO voltage level. I guess you can remove that specific .dts from your patch.
Quoted 4 lines
Just in case you have the same in preparation for armada .dts files, RN102 and RN104 .dts files are also fixed in mvebu/dt.
Anyway, thanks for that work.
Yes, it feels like someone was looking over my shoulder at my TODO list ;-) Anyway, I'll wait for a v2 before applying.
thx,
Jason.
PATCH 1/2 ARM: DT: Kirkwood: Use symbolic names from input.h
In reply to Arnaud EbalardQuoted 18 lines · Arnaud Ebalard
Hi Andrew,
Quoted 4 lines · Andrew Lunn
Replace the numeric key value with a symbolic name from <
bt-bindings/input/input.h>Signed-off-by Andrew Lunn <[email protected]>Quoted 9 lines
--- arch/arm/boot/dts/kirkwood-cloudbox.dts | 2 +- arch/arm/boot/dts/kirkwood-dnskw.dtsi | 6 +++--- arch/arm/boot/dts/kirkwood-ib62x0.dts | 4 ++-- arch/arm/boot/dts/kirkwood-iconnect.dts | 4 ++-- arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts | 6 +++--- arch/arm/boot/dts/kirkwood-lsxl.dtsi | 6 +++--- arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts | 4 ++-- arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts | 6 +++---
Quoted 4 lines
Jason just applied (yesterday IIRC) to mvebu/dt a series which provides cleanup for ReadyNAS .dts files. Among other things, it replaces numeric key values with a symbolic name. And it also does the same for GPIO voltage level. I guess you can remove that specific .dts from your patch.
I sore your patches. I did it slightly different to you, in that i've the includes in the top level kirkwood.dtsi file, where as you put them into the .dts files. That makes yours redundant, if we keep to this scheme.
Jason, which do you prefer, includes in every .dts file, or once in kirkwood.dtsi.
Quoted 2 lines
Just in case you have the same in preparation for armada .dts files, RN102 and RN104 .dts files are also fixed in mvebu/dt.
I've nothing for those files.
Andrew
PATCH 1/2 ARM: DT: Kirkwood: Use symbolic names from input.h
Quoted 24 lines · Andrew Lunn
Quoted 18 lines · Arnaud Ebalard
Hi Andrew,
Quoted 4 lines · Andrew Lunn
Replace the numeric key value with a symbolic name from <
bt-bindings/input/input.h>Signed-off-by Andrew Lunn <[email protected]>Quoted 9 lines
--- arch/arm/boot/dts/kirkwood-cloudbox.dts | 2 +- arch/arm/boot/dts/kirkwood-dnskw.dtsi | 6 +++--- arch/arm/boot/dts/kirkwood-ib62x0.dts | 4 ++-- arch/arm/boot/dts/kirkwood-iconnect.dts | 4 ++-- arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts | 6 +++--- arch/arm/boot/dts/kirkwood-lsxl.dtsi | 6 +++--- arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts | 4 ++-- arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts | 6 +++---Quoted 4 lines
Jason just applied (yesterday IIRC) to mvebu/dt a series which provides cleanup for ReadyNAS .dts files. Among other things, it replaces numeric key values with a symbolic name. And it also does the same for GPIO voltage level. I guess you can remove that specific .dts from your patch.
Quoted 7 lines
I sore your patches. I did it slightly different to you, in that i've the includes in the top level
kirkwood.dtsifile, where as you put them into the .dts files. That makes yours redundant, if we keep to this scheme.Jason, which do you prefer, includes in every .dts file, or once in
kirkwood.dtsi.
I prefer the kernel standard (is it really?) for includes. Which is directly in the file needing it. So, that would mean in both if we use the macros in both.
thx,
Jason.
PATCH 1/2 ARM: DT: Kirkwood: Use symbolic names from input.h
Quoted 30 lines · Jason Cooper
Quoted 29 lines · Andrew Lunn
Quoted 18 lines · Arnaud Ebalard
Hi Andrew,
Quoted 4 lines · Andrew Lunn
Replace the numeric key value with a symbolic name from <
bt-bindings/input/input.h>Signed-off-by Andrew Lunn <[email protected]>Quoted 9 lines
--- arch/arm/boot/dts/kirkwood-cloudbox.dts | 2 +- arch/arm/boot/dts/kirkwood-dnskw.dtsi | 6 +++--- arch/arm/boot/dts/kirkwood-ib62x0.dts | 4 ++-- arch/arm/boot/dts/kirkwood-iconnect.dts | 4 ++-- arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts | 6 +++--- arch/arm/boot/dts/kirkwood-lsxl.dtsi | 6 +++--- arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts | 4 ++-- arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts | 6 +++---Quoted 4 lines
Jason just applied (yesterday IIRC) to mvebu/dt a series which provides cleanup for ReadyNAS .dts files. Among other things, it replaces numeric key values with a symbolic name. And it also does the same for GPIO voltage level. I guess you can remove that specific .dts from your patch.
I sore your patches. I did it slightly different to you, in that i've the includes in the top level
kirkwood.dtsifile, where as you put them into the .dts files. That makes yours redundant, if we keep to this scheme.
Quoted 6 lines
Quoted 2 lines
Jason, which do you prefer, includes in every .dts file, or once in
kirkwood.dtsi.I prefer the kernel standard (is it really?) for includes. Which is directly in the file needing it. So, that would mean in both if we use the macros in both.
We don't directly use the macros in kirkwood.dtsi. We use them in nearly every kirkwood-*.dts* file.
As to kernel standard, looking in arch/arm/boot/*, it seems like <dt-bindings/gpio/tegra-gpio.h> is mostly used in .dtsi files, not .dts files, meaning it is included once at a higher level. That is what my patch does.
Andrew
PATCH 1/2 ARM: DT: Kirkwood: Use symbolic names from input.h
Quoted 38 lines · Andrew Lunn
Quoted 30 lines · Jason Cooper
Quoted 29 lines · Andrew Lunn
Quoted 18 lines · Arnaud Ebalard
Hi Andrew,
Quoted 4 lines · Andrew Lunn
Replace the numeric key value with a symbolic name from <
bt-bindings/input/input.h>Signed-off-by Andrew Lunn <[email protected]>Quoted 9 lines
--- arch/arm/boot/dts/kirkwood-cloudbox.dts | 2 +- arch/arm/boot/dts/kirkwood-dnskw.dtsi | 6 +++--- arch/arm/boot/dts/kirkwood-ib62x0.dts | 4 ++-- arch/arm/boot/dts/kirkwood-iconnect.dts | 4 ++-- arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts | 6 +++--- arch/arm/boot/dts/kirkwood-lsxl.dtsi | 6 +++--- arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts | 4 ++-- arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts | 6 +++---Quoted 4 lines
Jason just applied (yesterday IIRC) to mvebu/dt a series which provides cleanup for ReadyNAS .dts files. Among other things, it replaces numeric key values with a symbolic name. And it also does the same for GPIO voltage level. I guess you can remove that specific .dts from your patch.
I sore your patches. I did it slightly different to you, in that i've the includes in the top level
kirkwood.dtsifile, where as you put them into the .dts files. That makes yours redundant, if we keep to this scheme.Quoted 6 lines
Quoted 2 lines
Jason, which do you prefer, includes in every .dts file, or once in
kirkwood.dtsi.I prefer the kernel standard (is it really?) for includes. Which is directly in the file needing it. So, that would mean in both if we use the macros in both.
Quoted 6 lines
We don't directly use the macros in
kirkwood.dtsi. We use them in nearly every kirkwood-*.dts* file.As to kernel standard, looking in
arch/arm/boot/*, it seems like <dt-bindings/gpio/tegra-gpio.h> is mostly used in .dtsi files, not .dts files, meaning it is included once at a higher level.
hmm, yeah, and I forgot about including dtsi's within nodes and other such stuff. The analogy from C code (to which I was referring) doesn't carry that well.
Quoted 1 line
That is what my patch does.
Yep, keep it in the .dtsi.
thx,
Jason.