aboutsummaryrefslogtreecommitdiff
path: root/arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2018-12-20 16:30:59 +0100
committerArnd Bergmann <arnd@arndb.de>2018-12-20 16:31:32 +0100
commit5385c226b63db5827814e381c5aa290814445c03 (patch)
treea464617f71973c2b595536123b8578217886b2d6 /arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts
parentb125eb0bf4699e1645f71bed72674a2634874bc0 (diff)
parentd1d4445abffb2b17e841d37b555b6f1364b571c1 (diff)
downloadlinux-stericsson-5385c226b63db5827814e381c5aa290814445c03.tar.gz
Merge tag 'zynqmp-dt-for-v5.0' of https://github.com/Xilinx/linux-xlnx into next/dt
arm64: dts: zynqmp: DT changes for v5.0 - Fix node names - Fix wakeup-source - Wire ddrc - Label gpio controller (PS gpio) * tag 'zynqmp-dt-for-v5.0' of https://github.com/Xilinx/linux-xlnx: arm64: dts: zynqmp: Fix node names which contain "_" arm64: dts: zynqmp: Add missing gpio-controller to ps gpio arm64: dts: zynqmp: Add DDRC node arm64: dts: zynqmp: replace gpio-key,wakeup with wakeup-source property arm64: dts: zynqmp: Use mmc@ instead sdhci@ Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts')
-rw-r--r--arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts
index 259f21b0c001..94cf5094df64 100644
--- a/arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts
+++ b/arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts
@@ -46,14 +46,14 @@
label = "sw19";
gpios = <&gpio 22 GPIO_ACTIVE_HIGH>;
linux,code = <KEY_DOWN>;
- gpio-key,wakeup;
+ wakeup-source;
autorepeat;
};
};
leds {
compatible = "gpio-leds";
- heartbeat_led {
+ heartbeat-led {
label = "heartbeat";
gpios = <&gpio 23 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "heartbeat";