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-zcu106-revA.dts
diff --git
a/arch/arm/dts/zynqmp-zcu106-revA.dts
b/arch/arm/dts/zynqmp-zcu106-revA.dts
index
b4dd101
..
1dff845
100644
(file)
--- a/
arch/arm/dts/zynqmp-zcu106-revA.dts
+++ b/
arch/arm/dts/zynqmp-zcu106-revA.dts
@@
-2,7
+2,7
@@
/*
* dts file for Xilinx ZynqMP ZCU106
*
/*
* dts file for Xilinx ZynqMP ZCU106
*
- * (C) Copyright 2016, Xilinx, Inc.
+ * (C) Copyright 2016
- 2020
, Xilinx, Inc.
*
* Michal Simek <michal.simek@xilinx.com>
*/
*
* Michal Simek <michal.simek@xilinx.com>
*/
@@
-51,14
+51,14
@@
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;
};
};
leds {
compatible = "gpio-leds";
autorepeat;
};
};
leds {
compatible = "gpio-leds";
- heartbeat
_
led {
+ heartbeat
-
led {
label = "heartbeat";
gpios = <&gpio 23 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "heartbeat";
label = "heartbeat";
gpios = <&gpio 23 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "heartbeat";
@@
-612,19
+612,19
@@
spi-tx-bus-width = <1>;
spi-rx-bus-width = <4>; /* FIXME also DUAL configuration possible */
spi-max-frequency = <108000000>; /* Based on DC1 spec */
spi-tx-bus-width = <1>;
spi-rx-bus-width = <4>; /* FIXME also DUAL configuration possible */
spi-max-frequency = <108000000>; /* Based on DC1 spec */
- partition@
qspi-fsbl-uboot
{ /* for testing purpose */
+ partition@
0
{ /* for testing purpose */
label = "qspi-fsbl-uboot";
reg = <0x0 0x100000>;
};
label = "qspi-fsbl-uboot";
reg = <0x0 0x100000>;
};
- partition@
qspi-linux
{ /* for testing purpose */
+ partition@
100000
{ /* for testing purpose */
label = "qspi-linux";
reg = <0x100000 0x500000>;
};
label = "qspi-linux";
reg = <0x100000 0x500000>;
};
- partition@
qspi-device-tree
{ /* for testing purpose */
+ partition@
600000
{ /* for testing purpose */
label = "qspi-device-tree";
reg = <0x600000 0x20000>;
};
label = "qspi-device-tree";
reg = <0x600000 0x20000>;
};
- partition@
qspi-rootfs
{ /* for testing purpose */
+ partition@
620000
{ /* for testing purpose */
label = "qspi-rootfs";
reg = <0x620000 0x5E0000>;
};
label = "qspi-rootfs";
reg = <0x620000 0x5E0000>;
};
@@
-653,8
+653,11
@@
/* SD1 with level shifter */
&sdhci1 {
status = "okay";
/* SD1 with level shifter */
&sdhci1 {
status = "okay";
+ /*
+ * This property should be removed for supporting UHS mode
+ */
no-1-8-v;
no-1-8-v;
- xlnx,mio
_
bank = <1>;
+ xlnx,mio
-
bank = <1>;
};
&serdes {
};
&serdes {