git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'modules-for-v4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
r8a7790-lager.dts
diff --git
a/arch/arm/boot/dts/r8a7790-lager.dts
b/arch/arm/boot/dts/r8a7790-lager.dts
index f07f9018c3e72e4631967dc3ca3c3da8d6772aef..092610e3f953167c22b71edf7242aa6e2e29c836 100644
(file)
--- a/
arch/arm/boot/dts/r8a7790-lager.dts
+++ b/
arch/arm/boot/dts/r8a7790-lager.dts
@@
-902,9
+902,6
@@
status = "okay";
port {
- #address-cells = <1>;
- #size-cells = <0>;
-
vin1ep0: endpoint {
remote-endpoint = <&adv7180>;
bus-width = <8>;
@@
-929,6
+926,11
@@
};
};
+&rwdt {
+ timeout-sec = <60>;
+ status = "okay";
+};
+
&ssi1 {
shared-pin;
};