projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'u-boot-imx-20200825' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx
[platform/kernel/u-boot.git]
/
arch
/
arm
/
dts
/
zynqmp-zcu216-revA.dts
diff --git
a/arch/arm/dts/zynqmp-zcu216-revA.dts
b/arch/arm/dts/zynqmp-zcu216-revA.dts
index
c294e1b
..
511727f
100644
(file)
--- a/
arch/arm/dts/zynqmp-zcu216-revA.dts
+++ b/
arch/arm/dts/zynqmp-zcu216-revA.dts
@@
-2,7
+2,7
@@
/*
* dts file for Xilinx ZynqMP ZCU216
*
/*
* dts file for Xilinx ZynqMP ZCU216
*
- * (C) Copyright 2017 - 20
19
, Xilinx, Inc.
+ * (C) Copyright 2017 - 20
20
, Xilinx, Inc.
*
* Michal Simek <michal.simek@xilinx.com>
*/
*
* Michal Simek <michal.simek@xilinx.com>
*/
@@
-50,7
+50,7
@@
label = "sw19";
gpios = <&gpio 22 GPIO_ACTIVE_HIGH>;
linux,code = <KEY_DOWN>;
label = "sw19";
gpios = <&gpio 22 GPIO_ACTIVE_HIGH>;
linux,code = <KEY_DOWN>;
-
gpio-key,wakeup
;
+
wakeup-source
;
autorepeat;
};
};
autorepeat;
};
};
@@
-355,13
+355,11
@@
/* u112 - ir38164 0x13/0x43 */
/* u123 - ir38164 0x1c/0x4c */
/* u112 - ir38164 0x13/0x43 */
/* u123 - ir38164 0x1c/0x4c */
- irps5401_44: irps54012@44 { /* IRPS5401 - u53 */
- #clock-cells = <0>;
+ irps5401_44: irps5401@44 { /* IRPS5401 - u53 */
compatible = "infineon,irps5401";
reg = <0x44>; /* i2c addr 0x14 */
};
compatible = "infineon,irps5401";
reg = <0x44>; /* i2c addr 0x14 */
};
- irps5401_45: irps54012@45 { /* IRPS5401 - u55 */
- #clock-cells = <0>;
+ irps5401_45: irps5401@45 { /* IRPS5401 - u55 */
compatible = "infineon,irps5401";
reg = <0x45>; /* i2c addr 0x15 */
};
compatible = "infineon,irps5401";
reg = <0x45>; /* i2c addr 0x15 */
};
@@
-567,7
+565,11
@@
&sdhci1 {
status = "okay";
disable-wp;
&sdhci1 {
status = "okay";
disable-wp;
- xlnx,mio_bank = <1>;
+ /*
+ * This property should be removed for supporting UHS mode
+ */
+ no-1-8-v;
+ xlnx,mio-bank = <1>;
};
&serdes {
};
&serdes {