]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
arm64: dts: marvell: add RTC description for Armada 7K/8K
authorGregory CLEMENT <gregory.clement@free-electrons.com>
Mon, 20 Feb 2017 17:38:50 +0000 (18:38 +0100)
committerGregory CLEMENT <gregory.clement@free-electrons.com>
Wed, 8 Mar 2017 09:14:01 +0000 (10:14 +0100)
This RTC IP is found in the CP110 master and slave which are part of the
Armada 8K SoCs and of the subset family the Armada 7K.

There is one RTC in each CP but the RTC requires an external
oscillator. However on the Armada 80x0, the RTC clock in CP master is not
connected (by package) to the oscillator. So this one is disabled for the
Armada 8020 and the Armada 8040.

As the RTC clock in CP slave is connected to the oscillator this one is
let enabled. and will be used on these SoCs (80x0).

Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
arch/arm64/boot/dts/marvell/armada-8020.dtsi
arch/arm64/boot/dts/marvell/armada-8040.dtsi
arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi
arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi

index 048e5cf5160e9740896e3057b08120163cc78e1c..7c08f1f28d9e05ab95c388b6aec41193970f52c1 100644 (file)
@@ -54,3 +54,13 @@ / {
        compatible = "marvell,armada8020", "marvell,armada-ap806-dual",
                     "marvell,armada-ap806";
 };
+
+/* The RTC requires external oscillator. But on Aramda 80x0, the RTC clock
+ * in CP master is not connected (by package) to the oscillator. So
+ * disable it. However, the RTC clock in CP slave is connected to the
+ * oscillator so this one is let enabled.
+ */
+
+&cpm_rtc {
+       status = "disabled";
+};
index 9c1b28c476838fc20009b35740d825627b0ff5c3..33813a75bc309032cff84b51f97269c1c15abddc 100644 (file)
@@ -54,3 +54,12 @@ / {
        compatible = "marvell,armada8040", "marvell,armada-ap806-quad",
                     "marvell,armada-ap806";
 };
+
+/* The RTC requires external oscillator. But on Aramda 80x0, the RTC clock
+ * in CP master is not connected (by package) to the oscillator. So
+ * disable it. However, the RTC clock in CP slave is connected to the
+ * oscillator so this one is let enabled.
+ */
+&cpm_rtc {
+       status = "disabled";
+};
index 3a99c36433d6f9bb0c82c13fd68aa10dfb0f037a..d12741414009411526416d5e5e71df135757f42b 100644 (file)
@@ -79,6 +79,13 @@ cpm_syscon0: system-controller@440000 {
                                        "cpm-usb3dev", "cpm-eip150", "cpm-eip197";
                        };
 
+                       cpm_rtc: rtc@284000 {
+                               compatible = "marvell,armada-8k-rtc";
+                               reg = <0x284000 0x20>, <0x284080 0x24>;
+                               reg-names = "rtc", "rtc-soc";
+                               interrupts = <GIC_SPI 71 IRQ_TYPE_LEVEL_HIGH>;
+                       };
+
                        cpm_sata0: sata@540000 {
                                compatible = "marvell,armada-8k-ahci",
                                             "generic-ahci";
index 9e09c4d3b6bd8412deb29353a6d67a9fbe35beb2..d51eb2db6df74328d37a74f5c2529fb06a26ca14 100644 (file)
@@ -59,6 +59,13 @@ config-space@f4000000 {
                        interrupt-parent = <&gic>;
                        ranges = <0x0 0x0 0xf4000000 0x2000000>;
 
+                       cps_rtc: rtc@284000 {
+                               compatible = "marvell,armada-8k-rtc";
+                               reg = <0x284000 0x20>, <0x284080 0x24>;
+                               reg-names = "rtc", "rtc-soc";
+                               interrupts = <GIC_SPI 71 IRQ_TYPE_LEVEL_HIGH>;
+                       };
+
                        cps_syscon0: system-controller@440000 {
                                compatible = "marvell,cp110-system-controller0",
                                             "syscon";