diff for duplicates of <20180831092934.GC16301@Red> diff --git a/a/1.txt b/N1/1.txt index 6fbd646..40cb08f 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,14 +1,14 @@ On Fri, Aug 31, 2018 at 03:58:34PM +0800, Chen-Yu Tsai wrote: > On Fri, Aug 31, 2018 at 3:56 PM Corentin Labbe -> <clabbe.montjoie-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> wrote: +> <clabbe.montjoie@gmail.com> wrote: > > > > On Fri, Aug 31, 2018 at 09:35:00AM +0200, Maxime Ripard wrote: > > > On Thu, Aug 30, 2018 at 09:01:16PM +0200, Corentin Labbe 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(+) @@ -21,7 +21,7 @@ On Fri, Aug 31, 2018 at 03:58:34PM +0800, Chen-Yu Tsai 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>; @@ -32,20 +32,20 @@ On Fri, Aug 31, 2018 at 03:58:34PM +0800, Chen-Yu Tsai 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 ? > > Since you are effectively splitting one device node into two, you should diff --git a/a/content_digest b/N1/content_digest index acf7b8f..45e2108 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,36 +3,23 @@ "ref\020180831073500.zubqpvar4yhjqrge@flea\0" "ref\020180831075631.GB16301@Red\0" "ref\0CAGb2v65dWmFxacx16taTdDf0WO4vCJfJLrf=7Vh6RtJEjHdH5A@mail.gmail.com\0" - "ref\0CAGb2v65dWmFxacx16taTdDf0WO4vCJfJLrf=7Vh6RtJEjHdH5A-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org\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 11:29:34 +0200\0" - "To\0Chen-Yu Tsai <wens-jdAy2FN1RRM@public.gmane.org>\0" - "Cc\0Maxime Ripard <maxime.ripard-LDxbnhwyfcJBDgjK7y7TUQ@public.gmane.org>" - axboe-tSWWG44O7X1aa/9Udqfwiw@public.gmane.org - Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> - Kishon Vijay Abraham I <kishon-l0cyMroinI0@public.gmane.org> - Mark Rutland <mark.rutland-5wv7dgnIgG8@public.gmane.org> - Rob Herring <robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> - devicetree <devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> - linux-arm-kernel <linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org> - linux-ide-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - linux-kernel <linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> - linux-sunxi <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 03:58:34PM +0800, Chen-Yu Tsai wrote:\n" "> On Fri, Aug 31, 2018 at 3:56 PM Corentin Labbe\n" - "> <clabbe.montjoie-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> wrote:\n" + "> <clabbe.montjoie@gmail.com> wrote:\n" "> >\n" "> > On Fri, Aug 31, 2018 at 09:35:00AM +0200, Maxime Ripard wrote:\n" "> > > On Thu, Aug 30, 2018 at 09:01:16PM +0200, Corentin Labbe wrote:\n" "> > > > 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" @@ -45,7 +32,7 @@ "> > > > #size-cells = <0>;\n" "> > > > };\n" "> > > >\n" - "> > > > + ahci: sata@1c18000 {\n" + "> > > > + ahci: sata at 1c18000 {\n" "> > > > + compatible = \"allwinner,sun8i-r40-ahci\";\n" "> > > > + reg = <0x01c18000 0x1000>;\n" "> > > > + interrupts = <GIC_SPI 56 IRQ_TYPE_LEVEL_HIGH>;\n" @@ -56,20 +43,20 @@ "> > > > + #size-cells = <0>;\n" "> > > > + status = \"disabled\";\n" "> > > > +\n" - "> > > > + sata_port: sata-port@0 {\n" + "> > > > + sata_port: sata-port at 0 {\n" "> > > > + reg = <0>;\n" "> > > > + phys = <&sata_phy>;\n" "> > > > + };\n" "> > > > + };\n" "> > > > +\n" - "> > > > + sata_phy: sata-phy@1c180c0 {\n" + "> > > > + sata_phy: sata-phy at 1c180c0 {\n" "> > > > + compatible = \"allwinner,sun8i-r40-sata-phy\";\n" "> > > > + reg = <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" "> Since you are effectively splitting one device node into two, you should\n" @@ -78,4 +65,4 @@ "\n" I cannot do that if I remove patch 13, iow If I keep phy init code in both place as you requested. -5bea7cd155b1367e8187d0d970ed136e7f1dc6a9b0f48e23d1e258efd65583c1 +bd6cb30b14c38648aa04461b4f01edb75822cdd5fdf2f6400373d6381aae73f9
diff --git a/a/1.txt b/N2/1.txt index 6fbd646..2d21c1c 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -1,14 +1,14 @@ On Fri, Aug 31, 2018 at 03:58:34PM +0800, Chen-Yu Tsai wrote: > On Fri, Aug 31, 2018 at 3:56 PM Corentin Labbe -> <clabbe.montjoie-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> wrote: +> <clabbe.montjoie@gmail.com> wrote: > > > > On Fri, Aug 31, 2018 at 09:35:00AM +0200, Maxime Ripard wrote: > > > On Thu, Aug 30, 2018 at 09:01:16PM +0200, Corentin Labbe 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 acf7b8f..354e3d3 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -3,36 +3,35 @@ "ref\020180831073500.zubqpvar4yhjqrge@flea\0" "ref\020180831075631.GB16301@Red\0" "ref\0CAGb2v65dWmFxacx16taTdDf0WO4vCJfJLrf=7Vh6RtJEjHdH5A@mail.gmail.com\0" - "ref\0CAGb2v65dWmFxacx16taTdDf0WO4vCJfJLrf=7Vh6RtJEjHdH5A-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org\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 11:29:34 +0200\0" - "To\0Chen-Yu Tsai <wens-jdAy2FN1RRM@public.gmane.org>\0" - "Cc\0Maxime Ripard <maxime.ripard-LDxbnhwyfcJBDgjK7y7TUQ@public.gmane.org>" - axboe-tSWWG44O7X1aa/9Udqfwiw@public.gmane.org - Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> - Kishon Vijay Abraham I <kishon-l0cyMroinI0@public.gmane.org> - Mark Rutland <mark.rutland-5wv7dgnIgG8@public.gmane.org> - Rob Herring <robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> - devicetree <devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> - linux-arm-kernel <linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org> - linux-ide-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - linux-kernel <linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> - linux-sunxi <linux-sunxi-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org> - " Icenowy Zheng <icenowy-h8G6r0blFSE@public.gmane.org>\0" + "To\0Chen-Yu Tsai <wens@csie.org>\0" + "Cc\0Maxime Ripard <maxime.ripard@bootlin.com>" + axboe@kernel.dk + Hans de Goede <hdegoede@redhat.com> + Kishon Vijay Abraham I <kishon@ti.com> + Mark Rutland <mark.rutland@arm.com> + Rob Herring <robh+dt@kernel.org> + devicetree <devicetree@vger.kernel.org> + linux-arm-kernel <linux-arm-kernel@lists.infradead.org> + linux-ide@vger.kernel.org + linux-kernel <linux-kernel@vger.kernel.org> + linux-sunxi <linux-sunxi@googlegroups.com> + " Icenowy Zheng <icenowy@aosc.io>\0" "\00:1\0" "b\0" "On Fri, Aug 31, 2018 at 03:58:34PM +0800, Chen-Yu Tsai wrote:\n" "> On Fri, Aug 31, 2018 at 3:56 PM Corentin Labbe\n" - "> <clabbe.montjoie-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> wrote:\n" + "> <clabbe.montjoie@gmail.com> wrote:\n" "> >\n" "> > On Fri, Aug 31, 2018 at 09:35:00AM +0200, Maxime Ripard wrote:\n" "> > > On Thu, Aug 30, 2018 at 09:01:16PM +0200, Corentin Labbe wrote:\n" "> > > > 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" @@ -78,4 +77,4 @@ "\n" I cannot do that if I remove patch 13, iow If I keep phy init code in both place as you requested. -5bea7cd155b1367e8187d0d970ed136e7f1dc6a9b0f48e23d1e258efd65583c1 +b1b8114b151970e3fa1a03e1a9a6d5add12b55316ffbebc9acee2e9e686b3f4b
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.