diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2018-12-20 16:30:59 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2018-12-20 16:31:32 +0100 |
| commit | 5385c226b63db5827814e381c5aa290814445c03 (patch) | |
| tree | a464617f71973c2b595536123b8578217886b2d6 /arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts | |
| parent | b125eb0bf4699e1645f71bed72674a2634874bc0 (diff) | |
| parent | d1d4445abffb2b17e841d37b555b6f1364b571c1 (diff) | |
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-zcu111-revA.dts')
| -rw-r--r-- | arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts b/arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts index a61b3cc6f4c9..460adc378295 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-zcu111-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"; |