Skip to content

Commit

Permalink
Merge tag 'mvebu-fixes-4.1' of git://git.infradead.org/linux-mvebu in…
Browse files Browse the repository at this point in the history
…to fixes

Pull "mvebu fix for 4.1" from Gregory CLEMENT:

Disable the unused internal RTC in the dts of the OpenBlock AX3

* tag 'mvebu-fixes-4.1' of git://git.infradead.org/linux-mvebu:
  ARM: mvebu: armada-xp-openblocks-ax3-4: Disable internal RTC
  • Loading branch information
Arnd Bergmann committed May 7, 2015
2 parents 1be518b + 750e30d commit 654758a
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,10 @@
};

internal-regs {
rtc@10300 {
/* No crystal connected to the internal RTC */
status = "disabled";
};
serial@12000 {
status = "okay";
};
Expand Down

0 comments on commit 654758a

Please sign in to comment.