arm64: dts: marvell: adjust name of sd-mmc-gop clock in syscon

This commit adjusts the names of gatable clock #18 of the Marvell Armada
CP110 system controller. This clock not only controls SD/MMC, but also
the GOP (Group Of Ports) used for networking. So the clock is renamed to
{cpm,cps}-sd-mmc-gop instead of {cpm,cps}-sd-mmc.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>

diff --git a/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi b/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi
index a5fc201a9ddd1dd31e680867ad3f5baad2cfe15a..3a99c36433d6f9bb0c82c13fd68aa10dfb0f037a 100644 (file)
--- a/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi
@@ -74,7 +74,7 @@
                                        "cpm-gop-dp", "none", "cpm-pcie_x10",
                                        "cpm-pcie_x11", "cpm-pcie_x4", "cpm-pcie-xor",
                                        "cpm-sata", "cpm-sata-usb", "cpm-main",
-                                       "cpm-sd-mmc", "none", "none",
+                                       "cpm-sd-mmc-gop", "none", "none",
                                        "cpm-slow-io", "cpm-usb3h0", "cpm-usb3h1",
                                        "cpm-usb3dev", "cpm-eip150", "cpm-eip197";
                        };

diff --git a/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi b/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi
index f5240745645169d4f85490db3bb074312e33c1aa..9e09c4d3b6bd8412deb29353a6d67a9fbe35beb2 100644 (file)
--- a/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi
@@ -74,7 +74,7 @@
                                        "cps-gop-dp", "none", "cps-pcie_x10",
                                        "cps-pcie_x11", "cps-pcie_x4", "cps-pcie-xor",
                                        "cps-sata", "cps-sata-usb", "cps-main",
-                                       "cps-sd-mmc", "none", "none",
+                                       "cps-sd-mmc-gop", "none", "none",
                                        "cps-slow-io", "cps-usb3h0", "cps-usb3h1",
                                        "cps-usb3dev", "cps-eip150", "cps-eip197";
                        };