projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ARM: dts: sama5d2: Add uart4 definition
[oweals/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 5285f62d1a30f6c21f6311e3dab8f14f2db4a4dc..1726edf78ed23a64decc9a9e894526c11c339747 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";
@@
-120,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>;
};
};
};
};
@@
-216,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 */