diff for duplicates of <20180831075631.GB16301@Red> diff --git a/a/1.txt b/N1/1.txt index 2daa6c2..2a50def 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -3,8 +3,8 @@ On Fri, Aug 31, 2018 at 09:35:00AM +0200, Maxime Ripard wrote: > > R40 have a sata controller which is the same as A20. > > This patch adds a DT node for it. > > -> > Signed-off-by: Icenowy Zheng <icenowy-h8G6r0blFSE@public.gmane.org> -> > Signed-off-by: Corentin Labbe <clabbe.montjoie-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> +> > Signed-off-by: Icenowy Zheng <icenowy@aosc.io> +> > Signed-off-by: Corentin Labbe <clabbe.montjoie@gmail.com> > > --- > > arch/arm/boot/dts/sun8i-r40.dtsi | 23 +++++++++++++++++++++++ > > 1 file changed, 23 insertions(+) @@ -17,7 +17,7 @@ On Fri, Aug 31, 2018 at 09:35:00AM +0200, Maxime Ripard wrote: > > #size-cells = <0>; > > }; > > -> > + ahci: sata@1c18000 { +> > + ahci: sata at 1c18000 { > > + compatible = "allwinner,sun8i-r40-ahci"; > > + reg = <0x01c18000 0x1000>; > > + interrupts = <GIC_SPI 56 IRQ_TYPE_LEVEL_HIGH>; @@ -28,20 +28,20 @@ On Fri, Aug 31, 2018 at 09:35:00AM +0200, Maxime Ripard wrote: > > + #size-cells = <0>; > > + status = "disabled"; > > + -> > + sata_port: sata-port@0 { +> > + sata_port: sata-port at 0 { > > + reg = <0>; > > + phys = <&sata_phy>; > > + }; > > + }; > > + -> > + sata_phy: sata-phy@1c180c0 { +> > + sata_phy: sata-phy at 1c180c0 { > > + compatible = "allwinner,sun8i-r40-sata-phy"; > > + reg = <0x1c180c0 0x200>; > > Overlapping devices in the DTS is not ok. > -I do the same than arch/arm/boot/dts/berlin2.dtsi (sata@e90000 phy@e900a0) +I do the same than arch/arm/boot/dts/berlin2.dtsi (sata at e90000 phy at e900a0) But since it is not a good justification, it seems that regmap is my only solution ? Regards diff --git a/a/content_digest b/N1/content_digest index 1db72d4..56fc5d3 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,22 +1,10 @@ "ref\020180830190120.722-1-clabbe.montjoie@gmail.com\0" "ref\020180830190120.722-10-clabbe.montjoie@gmail.com\0" "ref\020180831073500.zubqpvar4yhjqrge@flea\0" - "From\0Corentin Labbe <clabbe.montjoie-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\0" - "Subject\0Re: [PATCH v4 09/13] ARM: dts: sun8i: r40: add sata node\0" + "From\0clabbe.montjoie@gmail.com (Corentin Labbe)\0" + "Subject\0[PATCH v4 09/13] ARM: dts: sun8i: r40: add sata node\0" "Date\0Fri, 31 Aug 2018 09:56:31 +0200\0" - "To\0Maxime Ripard <maxime.ripard-LDxbnhwyfcJBDgjK7y7TUQ@public.gmane.org>\0" - "Cc\0axboe-tSWWG44O7X1aa/9Udqfwiw@public.gmane.org" - hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org - kishon-l0cyMroinI0@public.gmane.org - mark.rutland-5wv7dgnIgG8@public.gmane.org - robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org - wens-jdAy2FN1RRM@public.gmane.org - devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org - linux-ide-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - linux-sunxi-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org - " Icenowy Zheng <icenowy-h8G6r0blFSE@public.gmane.org>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Fri, Aug 31, 2018 at 09:35:00AM +0200, Maxime Ripard wrote:\n" @@ -24,8 +12,8 @@ "> > R40 have a sata controller which is the same as A20.\n" "> > This patch adds a DT node for it.\n" "> > \n" - "> > Signed-off-by: Icenowy Zheng <icenowy-h8G6r0blFSE@public.gmane.org>\n" - "> > Signed-off-by: Corentin Labbe <clabbe.montjoie-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\n" + "> > Signed-off-by: Icenowy Zheng <icenowy@aosc.io>\n" + "> > Signed-off-by: Corentin Labbe <clabbe.montjoie@gmail.com>\n" "> > ---\n" "> > arch/arm/boot/dts/sun8i-r40.dtsi | 23 +++++++++++++++++++++++\n" "> > 1 file changed, 23 insertions(+)\n" @@ -38,7 +26,7 @@ "> > \t\t\t#size-cells = <0>;\n" "> > \t\t};\n" "> > \n" - "> > +\t\tahci: sata@1c18000 {\n" + "> > +\t\tahci: sata at 1c18000 {\n" "> > +\t\t\tcompatible = \"allwinner,sun8i-r40-ahci\";\n" "> > +\t\t\treg = <0x01c18000 0x1000>;\n" "> > +\t\t\tinterrupts = <GIC_SPI 56 IRQ_TYPE_LEVEL_HIGH>;\n" @@ -49,22 +37,22 @@ "> > +\t\t\t#size-cells = <0>;\n" "> > +\t\t\tstatus = \"disabled\";\n" "> > +\n" - "> > +\t\t\tsata_port: sata-port@0 {\n" + "> > +\t\t\tsata_port: sata-port at 0 {\n" "> > +\t\t\t\treg = <0>;\n" "> > +\t\t\t\tphys = <&sata_phy>;\n" "> > +\t\t\t};\n" "> > +\t\t};\n" "> > +\n" - "> > +\t\tsata_phy: sata-phy@1c180c0 {\n" + "> > +\t\tsata_phy: sata-phy at 1c180c0 {\n" "> > +\t\t\tcompatible = \"allwinner,sun8i-r40-sata-phy\";\n" "> > +\t\t\treg = <0x1c180c0 0x200>;\n" "> \n" "> Overlapping devices in the DTS is not ok.\n" "> \n" "\n" - "I do the same than arch/arm/boot/dts/berlin2.dtsi (sata@e90000 phy@e900a0)\n" + "I do the same than arch/arm/boot/dts/berlin2.dtsi (sata at e90000 phy at e900a0)\n" "But since it is not a good justification, it seems that regmap is my only solution ?\n" "\n" Regards -3005f63dae24ac23d04fe2ff258a445787745f2496a33ab16ef6119f0bcd91c4 +7c3c292e83dbc01ba3adea79e9282b9caaf40fd153ec04c1fc6f3d72a76d0652
diff --git a/a/1.txt b/N2/1.txt index 2daa6c2..5782ee4 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -3,8 +3,8 @@ On Fri, Aug 31, 2018 at 09:35:00AM +0200, Maxime Ripard wrote: > > R40 have a sata controller which is the same as A20. > > This patch adds a DT node for it. > > -> > Signed-off-by: Icenowy Zheng <icenowy-h8G6r0blFSE@public.gmane.org> -> > Signed-off-by: Corentin Labbe <clabbe.montjoie-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> +> > Signed-off-by: Icenowy Zheng <icenowy@aosc.io> +> > Signed-off-by: Corentin Labbe <clabbe.montjoie@gmail.com> > > --- > > arch/arm/boot/dts/sun8i-r40.dtsi | 23 +++++++++++++++++++++++ > > 1 file changed, 23 insertions(+) diff --git a/a/content_digest b/N2/content_digest index 1db72d4..1e735d4 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,22 +1,22 @@ "ref\020180830190120.722-1-clabbe.montjoie@gmail.com\0" "ref\020180830190120.722-10-clabbe.montjoie@gmail.com\0" "ref\020180831073500.zubqpvar4yhjqrge@flea\0" - "From\0Corentin Labbe <clabbe.montjoie-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\0" + "From\0Corentin Labbe <clabbe.montjoie@gmail.com>\0" "Subject\0Re: [PATCH v4 09/13] ARM: dts: sun8i: r40: add sata node\0" "Date\0Fri, 31 Aug 2018 09:56:31 +0200\0" - "To\0Maxime Ripard <maxime.ripard-LDxbnhwyfcJBDgjK7y7TUQ@public.gmane.org>\0" - "Cc\0axboe-tSWWG44O7X1aa/9Udqfwiw@public.gmane.org" - hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org - kishon-l0cyMroinI0@public.gmane.org - mark.rutland-5wv7dgnIgG8@public.gmane.org - robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org - wens-jdAy2FN1RRM@public.gmane.org - devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org - linux-ide-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - linux-sunxi-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org - " Icenowy Zheng <icenowy-h8G6r0blFSE@public.gmane.org>\0" + "To\0Maxime Ripard <maxime.ripard@bootlin.com>\0" + "Cc\0axboe@kernel.dk" + hdegoede@redhat.com + kishon@ti.com + mark.rutland@arm.com + robh+dt@kernel.org + wens@csie.org + devicetree@vger.kernel.org + linux-arm-kernel@lists.infradead.org + linux-ide@vger.kernel.org + linux-kernel@vger.kernel.org + linux-sunxi@googlegroups.com + " Icenowy Zheng <icenowy@aosc.io>\0" "\00:1\0" "b\0" "On Fri, Aug 31, 2018 at 09:35:00AM +0200, Maxime Ripard wrote:\n" @@ -24,8 +24,8 @@ "> > R40 have a sata controller which is the same as A20.\n" "> > This patch adds a DT node for it.\n" "> > \n" - "> > Signed-off-by: Icenowy Zheng <icenowy-h8G6r0blFSE@public.gmane.org>\n" - "> > Signed-off-by: Corentin Labbe <clabbe.montjoie-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\n" + "> > Signed-off-by: Icenowy Zheng <icenowy@aosc.io>\n" + "> > Signed-off-by: Corentin Labbe <clabbe.montjoie@gmail.com>\n" "> > ---\n" "> > arch/arm/boot/dts/sun8i-r40.dtsi | 23 +++++++++++++++++++++++\n" "> > 1 file changed, 23 insertions(+)\n" @@ -67,4 +67,4 @@ "\n" Regards -3005f63dae24ac23d04fe2ff258a445787745f2496a33ab16ef6119f0bcd91c4 +22207ca387456985c284173cd1861199c1562a1645805f0a97a1ab1cadae0504
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.