diff for duplicates of <E1cS72h-0004nc-Rr@rmk-PC.armlinux.org.uk> diff --git a/a/1.txt b/N1/1.txt index 376c2d5..6a255be 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -6,7 +6,7 @@ with the standard register layout. Add this compatible. -Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> +Signed-off-by: Russell King <rmk+kernel-I+IVW8TIWO2tmTQ+vhA3Yw@public.gmane.org> --- arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi | 3 ++- arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi | 3 ++- @@ -19,7 +19,7 @@ index 464b491c7291..65ad781d7910 100644 @@ -128,7 +128,8 @@ }; - cpm_sata0: sata at 540000 { + cpm_sata0: sata@540000 { - compatible = "marvell,armada-8k-ahci"; + compatible = "marvell,armada-8k-ahci", + "generic-ahci"; @@ -33,7 +33,7 @@ index b10f4781d8fb..168d667d50a3 100644 @@ -128,7 +128,8 @@ }; - cps_sata0: sata at 540000 { + cps_sata0: sata@540000 { - compatible = "marvell,armada-8k-ahci"; + compatible = "marvell,armada-8k-ahci", + "generic-ahci"; @@ -42,3 +42,8 @@ index b10f4781d8fb..168d667d50a3 100644 clocks = <&cps_syscon0 1 15>; -- 2.7.4 + +-- +To unsubscribe from this list: send the line "unsubscribe devicetree" in +the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/a/content_digest b/N1/content_digest index fb3d272..5876047 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,16 @@ - "From\0rmk+kernel@armlinux.org.uk (Russell King)\0" + "From\0Russell King <rmk+kernel-I+IVW8TIWO2tmTQ+vhA3Yw@public.gmane.org>\0" "Subject\0[PATCH] arm64: dts: marvell: add generic-ahci compatibles for CP110 ahci\0" "Date\0Fri, 13 Jan 2017 18:57:39 +0000\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Gregory Clement <gregory.clement-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>\0" + "Cc\0Jason Cooper <jason-NLaQJdtUoK4Be96aLqz0jA@public.gmane.org>" + Andrew Lunn <andrew-g2DYL2Zd6BY@public.gmane.org> + Sebastian Hesselbarth <sebastian.hesselbarth-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> + Rob Herring <robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> + Mark Rutland <mark.rutland-5wv7dgnIgG8@public.gmane.org> + Catalin Marinas <catalin.marinas-5wv7dgnIgG8@public.gmane.org> + Will Deacon <will.deacon-5wv7dgnIgG8@public.gmane.org> + linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org + " devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\0" "\00:1\0" "b\0" "Testing with an Armada 8040 board shows that adding the generic-ahci\n" @@ -12,7 +21,7 @@ "\n" "Add this compatible.\n" "\n" - "Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>\n" + "Signed-off-by: Russell King <rmk+kernel-I+IVW8TIWO2tmTQ+vhA3Yw@public.gmane.org>\n" "---\n" " arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi | 3 ++-\n" " arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi | 3 ++-\n" @@ -25,7 +34,7 @@ "@@ -128,7 +128,8 @@\n" " \t\t\t};\n" " \n" - " \t\t\tcpm_sata0: sata at 540000 {\n" + " \t\t\tcpm_sata0: sata@540000 {\n" "-\t\t\t\tcompatible = \"marvell,armada-8k-ahci\";\n" "+\t\t\t\tcompatible = \"marvell,armada-8k-ahci\",\n" "+\t\t\t\t\t \"generic-ahci\";\n" @@ -39,7 +48,7 @@ "@@ -128,7 +128,8 @@\n" " \t\t\t};\n" " \n" - " \t\t\tcps_sata0: sata at 540000 {\n" + " \t\t\tcps_sata0: sata@540000 {\n" "-\t\t\t\tcompatible = \"marvell,armada-8k-ahci\";\n" "+\t\t\t\tcompatible = \"marvell,armada-8k-ahci\",\n" "+\t\t\t\t\t \"generic-ahci\";\n" @@ -47,6 +56,11 @@ " \t\t\t\tinterrupts = <ICU_GRP_NSR 107 IRQ_TYPE_LEVEL_HIGH>;\n" " \t\t\t\tclocks = <&cps_syscon0 1 15>;\n" "-- \n" - 2.7.4 + "2.7.4\n" + "\n" + "--\n" + "To unsubscribe from this list: send the line \"unsubscribe devicetree\" in\n" + "the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\n" + More majordomo info at http://vger.kernel.org/majordomo-info.html -6002819d991117954950f8c6dced63627099ce6a510c87573f7d64b95043f2e6 +6918a9e5f58b1f1af7bab27020be389ce51b247a4eddcc826dbcafacc4184253
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.