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-zcu100-revC.dts
diff --git
a/arch/arm/dts/zynqmp-zcu100-revC.dts
b/arch/arm/dts/zynqmp-zcu100-revC.dts
index
2fffe17
..
d6c914c
100644
(file)
--- a/
arch/arm/dts/zynqmp-zcu100-revC.dts
+++ b/
arch/arm/dts/zynqmp-zcu100-revC.dts
@@
-2,7
+2,7
@@
/*
* dts file for Xilinx ZynqMP ZCU100 revC
*
/*
* dts file for Xilinx ZynqMP ZCU100 revC
*
- * (C) Copyright 2016 - 20
18
, Xilinx, Inc.
+ * (C) Copyright 2016 - 20
20
, Xilinx, Inc.
*
* Michal Simek <michal.simek@xilinx.com>
* Nathalie Chan King Choy
*
* Michal Simek <michal.simek@xilinx.com>
* Nathalie Chan King Choy
@@
-11,7
+11,7
@@
/dts-v1/;
#include "zynqmp.dtsi"
/dts-v1/;
#include "zynqmp.dtsi"
-#include "zynqmp-clk.dtsi"
+#include "zynqmp-clk
-ccf
.dtsi"
#include <dt-bindings/input/input.h>
#include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h>
#include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/gpio/gpio.h>
@@
-53,7
+53,7
@@
label = "sw4";
gpios = <&gpio 23 GPIO_ACTIVE_LOW>;
linux,code = <KEY_POWER>;
label = "sw4";
gpios = <&gpio 23 GPIO_ACTIVE_LOW>;
linux,code = <KEY_POWER>;
-
gpio-key,wakeup
;
+
wakeup-source
;
autorepeat;
};
};
autorepeat;
};
};
@@
-95,7
+95,7
@@
linux,default-trigger = "bluetooth-power";
};
linux,default-trigger = "bluetooth-power";
};
- vbus
_
det { /* U5 USB5744 VBUS detection via MIO25 */
+ vbus
-
det { /* U5 USB5744 VBUS detection via MIO25 */
label = "vbus_det";
gpios = <&gpio 25 GPIO_ACTIVE_HIGH>;
default-state = "on";
label = "vbus_det";
gpios = <&gpio 25 GPIO_ACTIVE_HIGH>;
default-state = "on";
@@
-104,6
+104,7
@@
ltc2954: ltc2954 { /* U7 */
compatible = "lltc,ltc2954", "lltc,ltc2952";
ltc2954: ltc2954 { /* U7 */
compatible = "lltc,ltc2954", "lltc,ltc2952";
+ status = "disabled";
trigger-gpios = <&gpio 26 GPIO_ACTIVE_LOW>; /* INT line - input */
/* If there is HW watchdog on mezzanine this signal should be connected there */
watchdog-gpios = <&gpio 35 GPIO_ACTIVE_HIGH>; /* MIO on PAD */
trigger-gpios = <&gpio 26 GPIO_ACTIVE_LOW>; /* INT line - input */
/* If there is HW watchdog on mezzanine this signal should be connected there */
watchdog-gpios = <&gpio 35 GPIO_ACTIVE_HIGH>; /* MIO on PAD */
@@
-119,9
+120,15
@@
regulator-boot-on;
};
regulator-boot-on;
};
- sdio_pwrseq: sdio
_
pwrseq {
+ sdio_pwrseq: sdio
-
pwrseq {
compatible = "mmc-pwrseq-simple";
reset-gpios = <&gpio 7 GPIO_ACTIVE_LOW>; /* WIFI_EN */
compatible = "mmc-pwrseq-simple";
reset-gpios = <&gpio 7 GPIO_ACTIVE_LOW>; /* WIFI_EN */
+ post-power-on-delay-ms = <10>;
+ };
+
+ ina226 {
+ compatible = "iio-hwmon";
+ io-channels = <&u35 0>, <&u35 1>, <&u35 2>, <&u35 3>;
};
};
};
};
@@
-215,8
+222,9
@@
#size-cells = <0>;
reg = <5>;
/* PS_PMBUS */
#size-cells = <0>;
reg = <5>;
/* PS_PMBUS */
- ina226@40 { /* u35 */
+
u35:
ina226@40 { /* u35 */
compatible = "ti,ina226";
compatible = "ti,ina226";
+ #io-channel-cells = <1>;
reg = <0x40>;
shunt-resistor = <10000>;
/* MIO31 is alert which should be routed to PMUFW */
reg = <0x40>;
shunt-resistor = <10000>;
/* MIO31 is alert which should be routed to PMUFW */
@@
-251,13
+259,13
@@
status = "okay";
no-1-8-v;
disable-wp;
status = "okay";
no-1-8-v;
disable-wp;
- xlnx,mio
_
bank = <0>;
+ xlnx,mio
-
bank = <0>;
};
&sdhci1 {
status = "okay";
bus-width = <0x4>;
};
&sdhci1 {
status = "okay";
bus-width = <0x4>;
- xlnx,mio
_
bank = <0>;
+ xlnx,mio
-
bank = <0>;
non-removable;
disable-wp;
cap-power-off-card;
non-removable;
disable-wp;
cap-power-off-card;
@@
-295,7
+303,6
@@
compatible = "ti,wl1831-st";
enable-gpios = <&gpio 8 GPIO_ACTIVE_HIGH>;
};
compatible = "ti,wl1831-st";
enable-gpios = <&gpio 8 GPIO_ACTIVE_HIGH>;
};
-
};
&uart1 {
};
&uart1 {
@@
-331,7
+338,6
@@
&watchdog0 {
status = "okay";
&watchdog0 {
status = "okay";
- reset-on-timeout;
};
&xilinx_ams {
};
&xilinx_ams {