Commit b08f5cbd authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Bjorn Andersson

arm64: dts: qcom: align gpio-key node names with dtschema

The node names should be generic and DT schema expects certain pattern
(e.g. with key/button/switch).
Signed-off-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
Link: https://lore.kernel.org/r/20220616005333.18491-21-krzysztof.kozlowski@linaro.org
parent 372cf591
......@@ -82,7 +82,7 @@ div1_mclk: divclk1 {
};
};
gpio_keys {
gpio-keys {
compatible = "gpio-keys";
#address-cells = <1>;
#size-cells = <0>;
......
......@@ -27,7 +27,7 @@ gpio-keys {
label = "GPIO Buttons";
volume-up {
button-volume-up {
label = "Volume Up";
gpios = <&msmgpio 107 GPIO_ACTIVE_LOW>;
linux,code = <KEY_VOLUMEUP>;
......
......@@ -28,14 +28,14 @@ gpio-keys {
label = "GPIO Buttons";
volume-up {
button-volume-up {
label = "Volume Up";
gpios = <&msmgpio 107 GPIO_ACTIVE_LOW>;
linux,code = <KEY_VOLUMEUP>;
debounce-interval = <15>;
};
volume-down {
button-volume-down {
label = "Volume Down";
gpios = <&msmgpio 117 GPIO_ACTIVE_LOW>;
linux,code = <KEY_VOLUMEDOWN>;
......
......@@ -39,7 +39,7 @@ gpio-keys {
label = "GPIO Buttons";
volume-up {
button-volume-up {
label = "Volume Up";
gpios = <&msmgpio 107 GPIO_ACTIVE_LOW>;
linux,code = <KEY_VOLUMEUP>;
......
......@@ -39,7 +39,7 @@ gpio-keys {
label = "GPIO Buttons";
volume-up {
button-volume-up {
label = "Volume Up";
gpios = <&msmgpio 107 GPIO_ACTIVE_LOW>;
linux,code = <KEY_VOLUMEUP>;
......
......@@ -28,7 +28,7 @@ gpio-keys {
label = "GPIO Buttons";
volume-up {
button-volume-up {
label = "Volume Up";
gpios = <&msmgpio 107 GPIO_ACTIVE_LOW>;
linux,code = <KEY_VOLUMEUP>;
......
......@@ -31,13 +31,13 @@ gpio-keys {
label = "GPIO Buttons";
volume-up {
button-volume-up {
label = "Volume Up";
gpios = <&msmgpio 107 GPIO_ACTIVE_LOW>;
linux,code = <KEY_VOLUMEUP>;
};
home {
button-home {
label = "Home";
gpios = <&msmgpio 109 GPIO_ACTIVE_LOW>;
linux,code = <KEY_HOMEPAGE>;
......@@ -52,7 +52,7 @@ gpio-hall-sensor {
label = "GPIO Hall Effect Sensor";
hall-sensor {
event-hall-sensor {
label = "Hall Effect Sensor";
gpios = <&msmgpio 52 GPIO_ACTIVE_LOW>;
linux,input-type = <EV_SW>;
......
......@@ -34,13 +34,13 @@ gpio-keys {
label = "GPIO Buttons";
volume-up {
button-volume-up {
label = "Volume Up";
gpios = <&msmgpio 107 GPIO_ACTIVE_LOW>;
linux,code = <KEY_VOLUMEUP>;
};
home-key {
button-home {
label = "Home Key";
gpios = <&msmgpio 109 GPIO_ACTIVE_LOW>;
linux,code = <KEY_HOMEPAGE>;
......
......@@ -49,13 +49,13 @@ gpio-keys {
label = "GPIO Buttons";
volume-up {
button-volume-up {
label = "Volume Up";
gpios = <&msmgpio 107 GPIO_ACTIVE_LOW>;
linux,code = <KEY_VOLUMEUP>;
};
home {
button-home {
label = "Home";
gpios = <&msmgpio 109 GPIO_ACTIVE_LOW>;
linux,code = <KEY_HOMEPAGE>;
......@@ -70,7 +70,7 @@ gpio-hall-sensor {
label = "GPIO Hall Effect Sensor";
hall-sensor {
event-hall-sensor {
label = "Hall Effect Sensor";
gpios = <&msmgpio 52 GPIO_ACTIVE_LOW>;
linux,input-type = <EV_SW>;
......
......@@ -29,7 +29,7 @@ gpio-keys {
label = "GPIO Buttons";
volume-up {
button-volume-up {
label = "Volume Up";
gpios = <&msmgpio 107 GPIO_ACTIVE_LOW>;
linux,code = <KEY_VOLUMEUP>;
......
......@@ -51,7 +51,7 @@ framebuffer0: framebuffer@3400000 {
};
};
gpio_keys {
gpio-keys {
compatible = "gpio-keys";
#address-cells = <1>;
#size-cells = <0>;
......
......@@ -64,7 +64,7 @@ gpio-keys {
compatible = "gpio-keys";
autorepeat;
volupkey {
volup-key {
label = "Volume Up";
gpios = <&pm8994_gpios 3 GPIO_ACTIVE_LOW>;
linux,input-type = <1>;
......@@ -73,7 +73,7 @@ volupkey {
debounce-interval = <15>;
};
camsnapkey {
camsnap-key {
label = "Camera Snapshot";
gpios = <&pm8994_gpios 4 GPIO_ACTIVE_LOW>;
linux,input-type = <1>;
......@@ -82,7 +82,7 @@ camsnapkey {
debounce-interval = <15>;
};
camfocuskey {
camfocus-key {
label = "Camera Focus";
gpios = <&pm8994_gpios 5 GPIO_ACTIVE_LOW>;
linux,input-type = <1>;
......@@ -100,7 +100,7 @@ gpio-hall-sensor {
label = "GPIO Hall Effect Sensor";
hall-front-sensor {
event-hall-front-sensor {
label = "Hall Effect Front Sensor";
gpios = <&tlmm 42 GPIO_ACTIVE_HIGH>;
linux,input-type = <EV_SW>;
......@@ -108,7 +108,7 @@ hall-front-sensor {
linux,can-disable;
};
hall-back-sensor {
event-hall-back-sensor {
label = "Hall Effect Back Sensor";
gpios = <&tlmm 75 GPIO_ACTIVE_HIGH>;
linux,input-type = <EV_SW>;
......
......@@ -27,7 +27,7 @@ / {
/* Kitakami firmware doesn't support PSCI */
/delete-node/ psci;
gpio_keys {
gpio-keys {
compatible = "gpio-keys";
#address-cells = <1>;
#size-cells = <0>;
......
......@@ -38,10 +38,10 @@ divclk4: divclk4 {
};
};
gpio_keys {
gpio-keys {
compatible = "gpio-keys";
vol_up {
key-vol-up {
label = "Volume Up";
gpios = <&pm8994_gpios 2 GPIO_ACTIVE_LOW>;
linux,code = <KEY_VOLUMEUP>;
......@@ -49,7 +49,7 @@ vol_up {
debounce-interval = <15>;
};
dome {
key-dome {
label = "Home";
gpios = <&tlmm 34 GPIO_ACTIVE_LOW>;
linux,code = <KEY_HOME>;
......
......@@ -40,7 +40,7 @@ gpio-hall-sensors {
pinctrl-names = "default";
pinctrl-0 = <&hall_sensor1_default>;
hall-sensor1 {
event-hall-sensor1 {
label = "Keyboard Hall Sensor";
gpios = <&tlmm 124 GPIO_ACTIVE_HIGH>;
debounce-interval = <15>;
......@@ -56,7 +56,7 @@ gpio-kb-extra-keys {
pinctrl-names = "default";
pinctrl-0 = <&gpio_kb_pins_extra>;
home {
key-home {
label = "Home";
gpios = <&tlmm 21 GPIO_ACTIVE_LOW>;
linux,code = <KEY_HOMEPAGE>;
......@@ -64,7 +64,7 @@ home {
linux,can-disable;
};
super-l {
key-super-l {
label = "Super Left";
gpios = <&tlmm 32 GPIO_ACTIVE_LOW>;
linux,code = <KEY_FN>;
......@@ -72,7 +72,7 @@ super-l {
linux,can-disable;
};
super-r {
key-super-r {
label = "Super Right";
gpios = <&tlmm 33 GPIO_ACTIVE_LOW>;
linux,code = <KEY_FN>;
......@@ -80,7 +80,7 @@ super-r {
linux,can-disable;
};
shift {
key-shift {
label = "Shift";
gpios = <&tlmm 114 GPIO_ACTIVE_LOW>;
linux,code = <KEY_RIGHTSHIFT>;
......@@ -88,7 +88,7 @@ shift {
linux,can-disable;
};
ctrl {
key-ctrl {
label = "Ctrl";
gpios = <&tlmm 128 GPIO_ACTIVE_LOW>;
linux,code = <KEY_LEFTCTRL>;
......@@ -96,7 +96,7 @@ ctrl {
linux,can-disable;
};
alt {
key-alt {
label = "Alt";
gpios = <&tlmm 129 GPIO_ACTIVE_LOW>;
linux,code = <KEY_LEFTALT>;
......@@ -113,7 +113,7 @@ gpio-keys {
pinctrl-names = "default";
pinctrl-0 = <&vol_up_pin_a>, <&cam_focus_pin_a>,
<&cam_snapshot_pin_a>;
vol-up {
button-vol-up {
label = "Volume Up";
gpios = <&pm8998_gpio 6 GPIO_ACTIVE_LOW>;
linux,input-type = <EV_KEY>;
......@@ -122,7 +122,7 @@ vol-up {
debounce-interval = <15>;
};
camera-snapshot {
button-camera-snapshot {
label = "Camera Snapshot";
gpios = <&pm8998_gpio 7 GPIO_ACTIVE_LOW>;
linux,input-type = <EV_KEY>;
......@@ -130,7 +130,7 @@ camera-snapshot {
debounce-interval = <15>;
};
camera-focus {
button-camera-focus {
label = "Camera Focus";
gpios = <&pm8998_gpio 8 GPIO_ACTIVE_LOW>;
linux,input-type = <EV_KEY>;
......
......@@ -90,7 +90,7 @@ gpio-keys {
pinctrl-names = "default";
pinctrl-0 = <&vol_keys_default>;
vol-down {
button-vol-down {
label = "Volume down";
gpios = <&pm8998_gpio 5 GPIO_ACTIVE_LOW>;
linux,code = <KEY_VOLUMEDOWN>;
......@@ -98,7 +98,7 @@ vol-down {
wakeup-source;
};
vol-up {
button-vol-up {
label = "Volume up";
gpios = <&pm8998_gpio 6 GPIO_ACTIVE_LOW>;
linux,code = <KEY_VOLUMEUP>;
......@@ -114,7 +114,7 @@ gpio-hall-sensor {
pinctrl-names = "default";
pinctrl-0 = <&hall_sensor_default>;
hall-sensor {
event-hall-sensor {
label = "Hall Effect Sensor";
gpios = <&tlmm 124 GPIO_ACTIVE_LOW>;
linux,input-type = <EV_SW>;
......
......@@ -101,7 +101,7 @@ gpio-keys {
pinctrl-names = "default";
pinctrl-0 = <&vol_down_pin_a>, <&cam_focus_pin_a>,
<&cam_snapshot_pin_a>;
vol-down {
button-vol-down {
label = "Volume Down";
gpios = <&pm8998_gpio 5 GPIO_ACTIVE_LOW>;
linux,input-type = <EV_KEY>;
......@@ -110,7 +110,7 @@ vol-down {
debounce-interval = <15>;
};
camera-snapshot {
button-camera-snapshot {
label = "Camera Snapshot";
gpios = <&pm8998_gpio 7 GPIO_ACTIVE_LOW>;
linux,input-type = <EV_KEY>;
......@@ -118,7 +118,7 @@ camera-snapshot {
debounce-interval = <15>;
};
camera-focus {
button-camera-focus {
label = "Camera Focus";
gpios = <&pm8998_gpio 8 GPIO_ACTIVE_LOW>;
linux,input-type = <EV_KEY>;
......@@ -133,7 +133,7 @@ gpio-hall-sensor {
pinctrl-names = "default";
pinctrl-0 = <&hall_sensor0_default>;
hall-sensor0 {
event-hall-sensor0 {
label = "Cover Hall Sensor";
gpios = <&tlmm 124 GPIO_ACTIVE_LOW>;
linux,input-type = <EV_SW>;
......
......@@ -331,7 +331,7 @@ gpio_keys: gpio-keys {
pinctrl-names = "default";
pinctrl-0 = <&pen_pdct_l>;
pen_insert: pen-insert {
pen_insert: switch-pen-insert {
label = "Pen Insert";
/* Insert = low, eject = high */
......
......@@ -27,7 +27,7 @@ gpio-keys {
pinctrl-names = "default";
pinctrl-0 = <&key_vol_up_default>;
volume-up {
key-volume-up {
label = "volume_up";
gpios = <&pm7325_gpios 6 GPIO_ACTIVE_LOW>;
linux,input-type = <1>;
......
......@@ -87,13 +87,13 @@ cam_vana_rear_vreg: cam_vana_rear_vreg {
pinctrl-0 = <&imx300_vana_default>;
};
gpio_keys {
gpio-keys {
status = "okay";
compatible = "gpio-keys";
#address-cells = <1>;
#size-cells = <0>;
camera_focus {
key-camera-focus {
label = "Camera Focus";
gpios = <&tlmm 64 GPIO_ACTIVE_LOW>;
linux,input-type = <1>;
......@@ -101,7 +101,7 @@ camera_focus {
debounce-interval = <15>;
};
camera_snapshot {
key-camera-snapshot {
label = "Camera Snapshot";
gpios = <&tlmm 113 GPIO_ACTIVE_LOW>;
linux,input-type = <1>;
......@@ -109,7 +109,7 @@ camera_snapshot {
debounce-interval = <15>;
};
vol_down {
key-vol-down {
label = "Volume Down";
gpios = <&pm660l_gpios 7 GPIO_ACTIVE_LOW>;
linux,input-type = <1>;
......
......@@ -27,7 +27,7 @@ chosen {
gpio-keys {
compatible = "gpio-keys";
volume-up {
key-volume-up {
label = "volume_up";
linux,code = <KEY_VOLUMEUP>;
gpios = <&tlmm 85 GPIO_ACTIVE_LOW>;
......
......@@ -51,7 +51,7 @@ vph_pwr: vph-pwr-regulator {
gpio-keys {
compatible = "gpio-keys";
volup {
key-volup {
label = "Volume Up";
gpios = <&pm660l_gpios 7 GPIO_ACTIVE_LOW>;
linux,code = <KEY_VOLUMEUP>;
......
......@@ -119,7 +119,7 @@ gpio-keys {
pinctrl-names = "default";
pinctrl-0 = <&pen_eject_odl>;
pen-insert {
switch-pen-insert {
label = "Pen Insert";
/* Insert = low, eject = high */
gpios = <&tlmm 119 GPIO_ACTIVE_LOW>;
......
......@@ -43,14 +43,14 @@ dc12v: dc12v-regulator {
regulator-always-on;
};
gpio_keys {
gpio-keys {
compatible = "gpio-keys";
autorepeat;
pinctrl-names = "default";
pinctrl-0 = <&vol_up_pin_a>;
vol-up {
key-vol-up {
label = "Volume Up";
linux,code = <KEY_VOLUMEUP>;
gpios = <&pm8998_gpio 6 GPIO_ACTIVE_LOW>;
......
......@@ -34,14 +34,14 @@ gpio-keys {
pinctrl-names = "default";
pinctrl-0 = <&volume_down_gpio &volume_up_gpio>;
vol-down {
key-vol-down {
label = "Volume down";
linux,code = <KEY_VOLUMEDOWN>;
gpios = <&pm8998_gpio 5 GPIO_ACTIVE_LOW>;
debounce-interval = <15>;
};
vol-up {
key-vol-up {
label = "Volume up";
linux,code = <KEY_VOLUMEUP>;
gpios = <&pm8998_gpio 6 GPIO_ACTIVE_LOW>;
......
......@@ -48,7 +48,7 @@ gpio-keys {
pinctrl-names = "default";
pinctrl-0 = <&volume_up_gpio>;
vol-up {
key-vol-up {
label = "volume_up";
linux,code = <KEY_VOLUMEUP>;
gpios = <&pm8998_gpio 6 GPIO_ACTIVE_LOW>;
......
......@@ -19,7 +19,7 @@ gpio-keys {
/* Neither Camera Focus, nor Camera Shutter seem to work... */
vol-down {
key-vol-down {
label = "volume_down";
gpios = <&pm8998_gpio 5 GPIO_ACTIVE_LOW>;
linux,code = <KEY_VOLUMEDOWN>;
......
......@@ -45,7 +45,7 @@ gpio-keys {
pinctrl-names = "default";
pinctrl-0 = <&vol_up_pin_a>;
vol-up {
key-vol-up {
label = "Volume Up";
linux,code = <KEY_VOLUMEUP>;
gpios = <&pm8998_gpio 6 GPIO_ACTIVE_LOW>;
......
......@@ -41,7 +41,7 @@ gpio-keys {
pinctrl-names = "default";
pinctrl-0 = <&lid_pin_active>, <&mode_pin_active>;
lid {
switch-lid {
gpios = <&tlmm 124 GPIO_ACTIVE_HIGH>;
linux,input-type = <EV_SW>;
linux,code = <SW_LID>;
......@@ -49,7 +49,7 @@ lid {
wakeup-event-action = <EV_ACT_DEASSERTED>;
};
mode {
switch-mode {
gpios = <&tlmm 95 GPIO_ACTIVE_HIGH>;
linux,input-type = <EV_SW>;
linux,code = <SW_TABLET_MODE>;
......
......@@ -46,7 +46,7 @@ gpio-keys {
#size-cells = <0>;
autorepeat;
vol-dn {
key-vol-dn {
label = "Volume Down";
gpios = <&tlmm 47 GPIO_ACTIVE_LOW>;
linux,input-type = <1>;
......
......@@ -48,7 +48,7 @@ gpio-keys {
pinctrl-names = "default";
pinctrl-0 = <&gpio_keys_pin>;
volume-up {
key-volume-up {
label = "volume_up";
linux,code = <KEY_VOLUMEUP>;
gpios = <&pm6350_gpios 2 GPIO_ACTIVE_LOW>;
......
......@@ -44,10 +44,10 @@ vreg_s4a_1p8: pm8150-s4 {
vin-supply = <&vph_pwr>;
};
gpio_keys {
gpio-keys {
compatible = "gpio-keys";
vol-up {
key-vol-up {
label = "Volume Up";
linux,code = <KEY_VOLUMEUP>;
gpios = <&pm8150_gpios 6 GPIO_ACTIVE_LOW>;
......
......@@ -49,10 +49,10 @@ vreg_s4a_1p8: pm8150-s4 {
vin-supply = <&vph_pwr>;
};
gpio_keys {
gpio-keys {
compatible = "gpio-keys";
vol_up {
key-vol-up {
label = "Volume Up";
gpios = <&pm8150_gpios 6 GPIO_ACTIVE_LOW>;
linux,code = <KEY_VOLUMEUP>;
......
......@@ -53,10 +53,10 @@ vreg_s6c_0p88: smpc6-regulator {
vin-supply = <&vph_pwr>;
};
gpio_keys {
gpio-keys {
compatible = "gpio-keys";
vol-up {
key-vol-up {
label = "Volume Up";
linux,code = <KEY_VOLUMEUP>;
gpios = <&pm8150_gpios 6 GPIO_ACTIVE_LOW>;
......
......@@ -57,7 +57,7 @@ gpio_keys: gpio-keys {
* case, they are both on &pm8150b_gpios: camera focus(2), camera snapshot(1).
*/
vol-down {
key-vol-down {
label = "Volume Down";
linux,code = <KEY_VOLUMEDOWN>;
gpios = <&pm8150_gpios 1 GPIO_ACTIVE_LOW>;
......
......@@ -49,7 +49,7 @@ gpio-keys {
/* For reasons still unknown, GAssist key and Camera Focus/Shutter don't work.. */
vol-down {
key-vol-down {
label = "Volume Down";
linux,code = <KEY_VOLUMEDOWN>;
gpios = <&pmk8350_gpios 3 GPIO_ACTIVE_LOW>;
......
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