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 s...@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";
> };
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
