diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-05-07 19:23:49 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-05-07 19:23:49 +0300 |
| commit | 654758ae09b4257f2f79c46ade01f973990d63f0 (patch) | |
| tree | 4aa138bbb938ee9240a329ef587d69e37c05680a | |
| parent | 1be518bd0bf77eedf9bbda5d5b25466f615813b2 (diff) | |
| parent | 750e30d4076ae5e02ad13a376e96c95a2627742c (diff) | |
| download | linux-654758ae09b4257f2f79c46ade01f973990d63f0.tar.xz | |
Merge tag 'mvebu-fixes-4.1' of git://git.infradead.org/linux-mvebu into 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
| -rw-r--r-- | arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts b/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts index e3b08fb959e5..990e8a2100f0 100644 --- a/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts +++ b/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts @@ -105,6 +105,10 @@ }; internal-regs { + rtc@10300 { + /* No crystal connected to the internal RTC */ + status = "disabled"; + }; serial@12000 { status = "okay"; }; |