diff options
| author | Arnd Bergmann <[email protected]> | 2022-07-08 09:38:50 +0200 |
|---|---|---|
| committer | Arnd Bergmann <[email protected]> | 2022-07-08 09:38:52 +0200 |
| commit | 30a32ee55f6a4290da30ed939961009ac8ca505d (patch) | |
| tree | 38025270fbd82c20b425f0cf473f044dae38c620 | |
| parent | 999462d336492e04e427158fac04c92ade465bc9 (diff) | |
| parent | c8b35008b4f1104b7d1296ee9508d45f9079e312 (diff) | |
Merge tag 'zynq-dt-for-v5.20' of https://github.com/Xilinx/linux-xlnx into arm/dt
ARM: Zynq DT changes for v5.20
- Align gpio-keys node names with dtschema
* tag 'zynq-dt-for-v5.20' of https://github.com/Xilinx/linux-xlnx:
ARM: dts: xilinx: align gpio-key node names with dtschema
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Arnd Bergmann <[email protected]>
| -rw-r--r-- | arch/arm/boot/dts/zynq-zc702.dts | 4 | ||||
| -rw-r--r-- | arch/arm/boot/dts/zynq-zturn-common.dtsi | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/zynq-zc702.dts b/arch/arm/boot/dts/zynq-zc702.dts index cf70aff26c66..d23201ba8cd7 100644 --- a/arch/arm/boot/dts/zynq-zc702.dts +++ b/arch/arm/boot/dts/zynq-zc702.dts @@ -30,14 +30,14 @@ gpio-keys { compatible = "gpio-keys"; autorepeat; - sw14 { + switch-14 { label = "sw14"; gpios = <&gpio0 12 0>; linux,code = <108>; /* down */ wakeup-source; autorepeat; }; - sw13 { + switch-13 { label = "sw13"; gpios = <&gpio0 14 0>; linux,code = <103>; /* up */ diff --git a/arch/arm/boot/dts/zynq-zturn-common.dtsi b/arch/arm/boot/dts/zynq-zturn-common.dtsi index bf5d1c4568b0..dfb1fbafe3aa 100644 --- a/arch/arm/boot/dts/zynq-zturn-common.dtsi +++ b/arch/arm/boot/dts/zynq-zturn-common.dtsi @@ -49,7 +49,7 @@ gpio-keys { compatible = "gpio-keys"; autorepeat; - K1 { + key { label = "K1"; gpios = <&gpio0 0x32 0x1>; linux,code = <0x66>; |