From: Simon Guinot Date: Tue, 14 Jan 2014 19:10:27 +0000 (+0100) Subject: ARM: mvebu: update the SATA compatible string for Armada 370/XP X-Git-Tag: v3.12.10~47 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=72caa216dc85afa30a26ae0d48a3b30b21e9b506;p=kernel%2Fkernel-generic.git ARM: mvebu: update the SATA compatible string for Armada 370/XP commit a96cc303e42ad7830dde929aad0046e448a05505 upstream. This patch updates the Armada 370/XP SATA node with the new compatible string "marvell,armada-370-sata". Signed-off-by: Simon Guinot Cc: Thomas Petazzoni Cc: Jason Cooper Cc: Andrew Lunn Cc: Gregory Clement Cc: Sebastian Hesselbarth Cc: Lior Amsalem Acked-by: Jason Cooper Signed-off-by: Tejun Heo Signed-off-by: Greg Kroah-Hartman --- diff --git a/arch/arm/boot/dts/armada-370-xp.dtsi b/arch/arm/boot/dts/armada-370-xp.dtsi index b97ab01..364a63d 100644 --- a/arch/arm/boot/dts/armada-370-xp.dtsi +++ b/arch/arm/boot/dts/armada-370-xp.dtsi @@ -143,7 +143,7 @@ }; sata@a0000 { - compatible = "marvell,orion-sata"; + compatible = "marvell,armada-370-sata"; reg = <0xa0000 0x5000>; interrupts = <55>; clocks = <&gateclk 15>, <&gateclk 30>;