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 branch 'master' of git://git.denx.de/u-boot-spi
[platform/kernel/u-boot.git]
/
arch
/
arm
/
dts
/
socfpga_arria5.dtsi
diff --git
a/arch/arm/dts/socfpga_arria5.dtsi
b/arch/arm/dts/socfpga_arria5.dtsi
index
fa0bd7d
..
22dbf07
100644
(file)
--- a/
arch/arm/dts/socfpga_arria5.dtsi
+++ b/
arch/arm/dts/socfpga_arria5.dtsi
@@
-1,7
+1,6
@@
+// SPDX-License-Identifier: GPL-2.0
/*
/*
- * Copyright (C) 2013 Altera Corporation <www.altera.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
+ * Copyright (C) 2013 Altera Corporation <www.altera.com>
*/
/dts-v1/;
*/
/dts-v1/;
@@
-20,13
+19,10
@@
};
mmc0: dwmmc0@ff704000 {
};
mmc0: dwmmc0@ff704000 {
- num-slots = <1>;
broken-cd;
bus-width = <4>;
cap-mmc-highspeed;
cap-sd-highspeed;
broken-cd;
bus-width = <4>;
cap-mmc-highspeed;
cap-sd-highspeed;
- drvsel = <3>;
- smplsel = <0>;
};
sysmgr@ffd08000 {
};
sysmgr@ffd08000 {
@@
-34,3
+30,7
@@
};
};
};
};
};
};
+
+&watchdog0 {
+ status = "okay";
+};