diff mbox

[PATCHv2,3/3] arm64: dts: marvell: adjust name of sd-mmc-gop clock in syscon

Message ID 1482316017-22154-4-git-send-email-thomas.petazzoni@free-electrons.com (mailing list archive)
State New, archived
Headers show

Commit Message

Thomas Petazzoni Dec. 21, 2016, 10:26 a.m. UTC
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>
---
 arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi | 2 +-
 arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Comments

Thomas Petazzoni Jan. 31, 2017, 10:44 a.m. UTC | #1
Hello,

On Wed, 21 Dec 2016 11:26:57 +0100, Thomas Petazzoni wrote:
> 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>

Grégory, since patches 1/3 and 2/3 of this series have been applied,
could you take this PATCH 3/3 ?

Thanks!

Thomas
Gregory CLEMENT Jan. 31, 2017, 10:52 a.m. UTC | #2
Hi Thomas,
 
 On mar., janv. 31 2017, Thomas Petazzoni <thomas.petazzoni@free-electrons.com> wrote:

> Hello,
>
> On Wed, 21 Dec 2016 11:26:57 +0100, Thomas Petazzoni wrote:
>> 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>
>
> Grégory, since patches 1/3 and 2/3 of this series have been applied,
> could you take this PATCH 3/3 ?

I completely missed this patch!

Now, applied on mvebu/dt64

Thanks,

Gregory



>
> Thanks!
>
> Thomas
> -- 
> Thomas Petazzoni, CTO, Free Electrons
> Embedded Linux and Kernel engineering
> http://free-electrons.com
diff mbox

Patch

diff --git a/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi b/arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi
index 602e2c2..895babc 100644
--- 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 6bf9e24..db99646 100644
--- 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";
 			};