On Tue, Mar 29, 2016 at 2:54 AM, Rameshwar Prasad Sahu <[email protected]> wrote:
> Fix X-Gene SATA controller compatible string for Merlin board.
>
> Signed-off-by: Rameshwar Prasad Sahu <[email protected]>
> Acked-by: Suman Tripathi <[email protected]>
I will queue this patch into xgene-next tree.
> ---
> arch/arm64/boot/dts/apm/apm-shadowcat.dtsi | 6 +++---
> 1 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/apm/apm-shadowcat.dtsi
> b/arch/arm64/boot/dts/apm/apm-shadowcat.dtsi
> index 5d87a3d..74d971e 100644
> --- a/arch/arm64/boot/dts/apm/apm-shadowcat.dtsi
> +++ b/arch/arm64/boot/dts/apm/apm-shadowcat.dtsi
> @@ -524,7 +524,7 @@
> };
>
> sata1: sata@1a000000 {
> - compatible = "apm,xgene-ahci";
> + compatible = "apm,xgene-ahci-v2";
> reg = <0x0 0x1a000000 0x0 0x1000>,
> <0x0 0x1f200000 0x0 0x1000>,
> <0x0 0x1f20d000 0x0 0x1000>,
> @@ -534,7 +534,7 @@
> };
>
> sata2: sata@1a200000 {
> - compatible = "apm,xgene-ahci";
> + compatible = "apm,xgene-ahci-v2";
> reg = <0x0 0x1a200000 0x0 0x1000>,
> <0x0 0x1f210000 0x0 0x1000>,
> <0x0 0x1f21d000 0x0 0x1000>,
> @@ -544,7 +544,7 @@
> };
>
> sata3: sata@1a400000 {
> - compatible = "apm,xgene-ahci";
> + compatible = "apm,xgene-ahci-v2";
> reg = <0x0 0x1a400000 0x0 0x1000>,
> <0x0 0x1f220000 0x0 0x1000>,
> <0x0 0x1f22d000 0x0 0x1000>,
> --
> 1.7.1
>
Regards,
Duc Dang.
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
