diff options
| author | Thomas Petazzoni | 2017-07-18 15:10:33 +0200 |
|---|---|---|
| committer | Gregory CLEMENT | 2017-08-02 16:07:38 +0200 |
| commit | 249112cef2f323354be61a27be1d6e94507f7587 (patch) | |
| tree | 4a375974c455e8d2b545e7d8e8e0a69d653a773b /arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi | |
| parent | arm64: dts: marvell: mcbin: add an stdout-path (diff) | |
| download | kernel-qcow2-linux-249112cef2f323354be61a27be1d6e94507f7587.tar.gz kernel-qcow2-linux-249112cef2f323354be61a27be1d6e94507f7587.tar.xz kernel-qcow2-linux-249112cef2f323354be61a27be1d6e94507f7587.zip | |
arm64: dts: marvell: re-order RTC nodes in Marvell CP110 description
In both the CP110 master and slave description, the node describing
the RTC was at the wrong place when taking into account increasing
register addresses. Interestingly, it was not even at the same (wrong)
place in both files.
This commit adjusts that, making the master and slave descriptions
more aligned.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Diffstat (limited to 'arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi')
| -rw-r--r-- | arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi b/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi index 3cd48552d69f..5e559ec88228 100644 --- a/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi +++ b/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi @@ -115,6 +115,13 @@ msi-parent = <&gicp>; }; + cpm_rtc: rtc@284000 { + compatible = "marvell,armada-8k-rtc"; + reg = <0x284000 0x20>, <0x284080 0x24>; + reg-names = "rtc", "rtc-soc"; + interrupts = <ICU_GRP_NSR 77 IRQ_TYPE_LEVEL_HIGH>; + }; + cpm_syscon0: system-controller@440000 { compatible = "syscon", "simple-mfd"; reg = <0x440000 0x1000>; @@ -155,13 +162,6 @@ }; }; - cpm_rtc: rtc@284000 { - compatible = "marvell,armada-8k-rtc"; - reg = <0x284000 0x20>, <0x284080 0x24>; - reg-names = "rtc", "rtc-soc"; - interrupts = <ICU_GRP_NSR 77 IRQ_TYPE_LEVEL_HIGH>; - }; - cpm_sata0: sata@540000 { compatible = "marvell,armada-8k-ahci", "generic-ahci"; |