* linux-next: manual merge of the libata tree with the arm-soc tree
@ 2014-01-16 0:48 Stephen Rothwell
2014-01-16 12:26 ` Jason Cooper
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2014-01-16 0:48 UTC (permalink / raw)
To: Tejun Heo, Olof Johansson, Arnd Bergmann, linux-arm-kernel
Cc: linux-next, linux-kernel, Simon Guinot, Jason Cooper
[-- Attachment #1: Type: text/plain, Size: 1234 bytes --]
Hi Tejun,
Today's linux-next merge of the libata tree got a conflict in
arch/arm/boot/dts/armada-370-xp.dtsi between commit a095b1c78a35 ("ARM:
mvebu: sort DT nodes by address") from the arm-soc tree and commit
a96cc303e42a ("ARM: mvebu: update the SATA compatible string for Armada
370/XP") from the libata tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/boot/dts/armada-370-xp.dtsi
index b6b253924893,df141a1d6448..000000000000
--- a/arch/arm/boot/dts/armada-370-xp.dtsi
+++ b/arch/arm/boot/dts/armada-370-xp.dtsi
@@@ -236,12 -183,13 +236,12 @@@
status = "disabled";
};
- i2c0: i2c@11000 {
- compatible = "marvell,mv64xxx-i2c";
- #address-cells = <1>;
- #size-cells = <0>;
- interrupts = <31>;
- timeout-ms = <1000>;
- clocks = <&coreclk 0>;
+ sata@a0000 {
- compatible = "marvell,orion-sata";
++ compatible = "marvell,armada-370-sata";
+ reg = <0xa0000 0x5000>;
+ interrupts = <55>;
+ clocks = <&gateclk 15>, <&gateclk 30>;
+ clock-names = "0", "1";
status = "disabled";
};
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the libata tree with the arm-soc tree
2014-01-16 0:48 linux-next: manual merge of the libata tree with the arm-soc tree Stephen Rothwell
@ 2014-01-16 12:26 ` Jason Cooper
0 siblings, 0 replies; 2+ messages in thread
From: Jason Cooper @ 2014-01-16 12:26 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Tejun Heo, Olof Johansson, Arnd Bergmann, linux-arm-kernel,
linux-next, linux-kernel, Simon Guinot, Kevin Hilman
Stephen,
Thanks, this looks good.
Arnd, Olof, Kevin,
This patch is in Tejun's tree because it is part of a patch series
fixing SATA hotplug. That series is marked for stable.
thx,
Jason.
On Thu, Jan 16, 2014 at 11:48:31AM +1100, Stephen Rothwell wrote:
> Hi Tejun,
>
> Today's linux-next merge of the libata tree got a conflict in
> arch/arm/boot/dts/armada-370-xp.dtsi between commit a095b1c78a35 ("ARM:
> mvebu: sort DT nodes by address") from the arm-soc tree and commit
> a96cc303e42a ("ARM: mvebu: update the SATA compatible string for Armada
> 370/XP") from the libata tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
>
> --
> Cheers,
> Stephen Rothwell sfr@canb.auug.org.au
>
> diff --cc arch/arm/boot/dts/armada-370-xp.dtsi
> index b6b253924893,df141a1d6448..000000000000
> --- a/arch/arm/boot/dts/armada-370-xp.dtsi
> +++ b/arch/arm/boot/dts/armada-370-xp.dtsi
> @@@ -236,12 -183,13 +236,12 @@@
> status = "disabled";
> };
>
> - i2c0: i2c@11000 {
> - compatible = "marvell,mv64xxx-i2c";
> - #address-cells = <1>;
> - #size-cells = <0>;
> - interrupts = <31>;
> - timeout-ms = <1000>;
> - clocks = <&coreclk 0>;
> + sata@a0000 {
> - compatible = "marvell,orion-sata";
> ++ compatible = "marvell,armada-370-sata";
> + reg = <0xa0000 0x5000>;
> + interrupts = <55>;
> + clocks = <&gateclk 15>, <&gateclk 30>;
> + clock-names = "0", "1";
> status = "disabled";
> };
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-01-16 12:26 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-01-16 0:48 linux-next: manual merge of the libata tree with the arm-soc tree Stephen Rothwell
2014-01-16 12:26 ` Jason Cooper
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).