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 branches 'arm/rockchip', 'arm/exynos', 'arm/smmu', 'x86/vt-d', 'x86/amd', ...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
armada-xp-linksys-mamba.dts
diff --git
a/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
b/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
index a2cf2154dcdb68d8374c2bea4b136fccaccb7aa2..fdd187c55aa5f78b5ab61d15dc12c1ad001990d2 100644
(file)
--- a/
arch/arm/boot/dts/armada-xp-linksys-mamba.dts
+++ b/
arch/arm/boot/dts/armada-xp-linksys-mamba.dts
@@
-95,6
+95,11
@@
internal-regs {
+ rtc@10300 {
+ /* No crystal connected to the internal RTC */
+ status = "disabled";
+ };
+
/* J10: VCC, NC, RX, NC, TX, GND */
serial@12000 {
status = "okay";