diff for duplicates of <87k2ezhqiy.fsf@free-electrons.com> diff --git a/a/1.txt b/N1/1.txt index bdc0ede..b856df2 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,18 +1,18 @@ Hi Arnd, - On ven., ao?t 26 2016, Arnd Bergmann <arnd@arndb.de> wrote: + On ven., août 26 2016, Arnd Bergmann <arnd-r2nGTMty4D4@public.gmane.org> wrote: > The SPI controller in the arch/arm/boot/dts/armada-39x.dtsi file has moved > to a different location in the hierarchy, which breaks the overrides > in the board specific file: > -> Warning (reg_format): "reg" property in /soc/internal-regs/spi at 10680/spi-flash at 1 has invalid length (4 bytes) (#address-cells == 2, #size-cells == 1) -> Warning (avoid_default_addr_size): Relying on default #address-cells value for /soc/internal-regs/spi at 10680/spi-flash at 1 +> Warning (reg_format): "reg" property in /soc/internal-regs/spi@10680/spi-flash@1 has invalid length (4 bytes) (#address-cells == 2, #size-cells == 1) +> Warning (avoid_default_addr_size): Relying on default #address-cells value for /soc/internal-regs/spi@10680/spi-flash@1 > > This changes the board to reference the spi controller by its label > (which has not changed) rather than the full path. > -> Signed-off-by: Arnd Bergmann <arnd@arndb.de> +> Signed-off-by: Arnd Bergmann <arnd-r2nGTMty4D4@public.gmane.org> > Fixes: 0160a4b68987 ("ARM: dts: mvebu: A37x/XP/38x/39x: Move SPI controller nodes into 'soc' node") Applied on mvebu/dt @@ -32,12 +32,12 @@ Gregory > MBUS_ID(0x01, 0x1d) 0 0xfff00000 0x100000>; > > internal-regs { -> - spi at 10680 { +> - spi@10680 { > - status = "okay"; > - pinctrl-0 = <&spi1_pins>; > - pinctrl-names = "default"; > - -> - spi-flash at 1 { +> - spi-flash@1 { > - #address-cells = <1>; > - #size-cells = <1>; > - compatible = "n25q128a13", @@ -50,11 +50,11 @@ Gregory > - #address-cells = <1>; > - #size-cells = <1>; > - -> - partition at 0 { +> - partition@0 { > - label = "U-Boot"; > - reg = <0 0x400000>; > - }; -> - partition at 400000 { +> - partition@400000 { > - label = "Filesystem"; > - reg = <0x400000 0xc00000>; > - }; @@ -62,7 +62,7 @@ Gregory > - }; > - }; > - -> i2c at 11000 { +> i2c@11000 { > status = "okay"; > clock-frequency = <100000>; > @@ -173,3 +143,33 @@ @@ -75,7 +75,7 @@ Gregory > + pinctrl-0 = <&spi1_pins>; > + pinctrl-names = "default"; > + -> + spi-flash at 1 { +> + spi-flash@1 { > + #address-cells = <1>; > + #size-cells = <1>; > + compatible = "n25q128a13", @@ -88,11 +88,11 @@ Gregory > + #address-cells = <1>; > + #size-cells = <1>; > + -> + partition at 0 { +> + partition@0 { > + label = "U-Boot"; > + reg = <0 0x400000>; > + }; -> + partition at 400000 { +> + partition@400000 { > + label = "Filesystem"; > + reg = <0x400000 0xc00000>; > + }; @@ -108,3 +108,7 @@ Gregory Clement, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com +-- +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 26a66c9..8945513 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,25 +1,33 @@ "ref\020160826153925.863488-1-arnd@arndb.de\0" - "From\0gregory.clement@free-electrons.com (Gregory CLEMENT)\0" - "Subject\0[PATCH] ARM: dts: mvebu: fix reference to a390 spi controller\0" + "ref\020160826153925.863488-1-arnd-r2nGTMty4D4@public.gmane.org\0" + "From\0Gregory CLEMENT <gregory.clement-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>\0" + "Subject\0Re: [PATCH] ARM: dts: mvebu: fix reference to a390 spi controller\0" "Date\0Mon, 29 Aug 2016 11:29:25 +0200\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Arnd Bergmann <arnd-r2nGTMty4D4@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> + Stefan Roese <sr-ynQEQJNshbs@public.gmane.org> + linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org + devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + " linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\0" "\00:1\0" "b\0" "Hi Arnd,\n" " \n" - " On ven., ao?t 26 2016, Arnd Bergmann <arnd@arndb.de> wrote:\n" + " On ven., ao\303\273t 26 2016, Arnd Bergmann <arnd-r2nGTMty4D4@public.gmane.org> wrote:\n" "\n" "> The SPI controller in the arch/arm/boot/dts/armada-39x.dtsi file has moved\n" "> to a different location in the hierarchy, which breaks the overrides\n" "> in the board specific file:\n" ">\n" - "> Warning (reg_format): \"reg\" property in /soc/internal-regs/spi at 10680/spi-flash at 1 has invalid length (4 bytes) (#address-cells == 2, #size-cells == 1)\n" - "> Warning (avoid_default_addr_size): Relying on default #address-cells value for /soc/internal-regs/spi at 10680/spi-flash at 1\n" + "> Warning (reg_format): \"reg\" property in /soc/internal-regs/spi@10680/spi-flash@1 has invalid length (4 bytes) (#address-cells == 2, #size-cells == 1)\n" + "> Warning (avoid_default_addr_size): Relying on default #address-cells value for /soc/internal-regs/spi@10680/spi-flash@1\n" ">\n" "> This changes the board to reference the spi controller by its label\n" "> (which has not changed) rather than the full path.\n" ">\n" - "> Signed-off-by: Arnd Bergmann <arnd@arndb.de>\n" + "> Signed-off-by: Arnd Bergmann <arnd-r2nGTMty4D4@public.gmane.org>\n" "> Fixes: 0160a4b68987 (\"ARM: dts: mvebu: A37x/XP/38x/39x: Move SPI controller nodes into 'soc' node\")\n" "\n" "Applied on mvebu/dt\n" @@ -39,12 +47,12 @@ "> \t\t\t MBUS_ID(0x01, 0x1d) 0 0xfff00000 0x100000>;\n" "> \n" "> \t\tinternal-regs {\n" - "> -\t\t\tspi at 10680 {\n" + "> -\t\t\tspi@10680 {\n" "> -\t\t\t\tstatus = \"okay\";\n" "> -\t\t\t\tpinctrl-0 = <&spi1_pins>;\n" "> -\t\t\t\tpinctrl-names = \"default\";\n" "> -\n" - "> -\t\t\t\tspi-flash at 1 {\n" + "> -\t\t\t\tspi-flash@1 {\n" "> -\t\t\t\t\t#address-cells = <1>;\n" "> -\t\t\t\t\t#size-cells = <1>;\n" "> -\t\t\t\t\tcompatible = \"n25q128a13\",\n" @@ -57,11 +65,11 @@ "> -\t\t\t\t\t\t#address-cells = <1>;\n" "> -\t\t\t\t\t\t#size-cells = <1>;\n" "> -\n" - "> -\t\t\t\t\t\tpartition at 0 {\n" + "> -\t\t\t\t\t\tpartition@0 {\n" "> -\t\t\t\t\t\t\tlabel = \"U-Boot\";\n" "> -\t\t\t\t\t\t\treg = <0 0x400000>;\n" "> -\t\t\t\t\t\t};\n" - "> -\t\t\t\t\t\tpartition at 400000 {\n" + "> -\t\t\t\t\t\tpartition@400000 {\n" "> -\t\t\t\t\t\t\tlabel = \"Filesystem\";\n" "> -\t\t\t\t\t\t\treg = <0x400000 0xc00000>;\n" "> -\t\t\t\t\t\t};\n" @@ -69,7 +77,7 @@ "> -\t\t\t\t};\n" "> -\t\t\t};\n" "> -\n" - "> \t\t\ti2c at 11000 {\n" + "> \t\t\ti2c@11000 {\n" "> \t\t\t\tstatus = \"okay\";\n" "> \t\t\t\tclock-frequency = <100000>;\n" "> @@ -173,3 +143,33 @@\n" @@ -82,7 +90,7 @@ "> +\tpinctrl-0 = <&spi1_pins>;\n" "> +\tpinctrl-names = \"default\";\n" "> +\n" - "> +\tspi-flash at 1 {\n" + "> +\tspi-flash@1 {\n" "> +\t\t#address-cells = <1>;\n" "> +\t\t#size-cells = <1>;\n" "> +\t\tcompatible = \"n25q128a13\",\n" @@ -95,11 +103,11 @@ "> +\t\t\t#address-cells = <1>;\n" "> +\t\t\t#size-cells = <1>;\n" "> +\n" - "> +\t\t\tpartition at 0 {\n" + "> +\t\t\tpartition@0 {\n" "> +\t\t\t\tlabel = \"U-Boot\";\n" "> +\t\t\t\treg = <0 0x400000>;\n" "> +\t\t\t};\n" - "> +\t\t\tpartition at 400000 {\n" + "> +\t\t\tpartition@400000 {\n" "> +\t\t\t\tlabel = \"Filesystem\";\n" "> +\t\t\t\treg = <0x400000 0xc00000>;\n" "> +\t\t\t};\n" @@ -114,6 +122,10 @@ "Gregory Clement, Free Electrons\n" "Kernel, drivers, real-time and embedded Linux\n" "development, consulting, training and support.\n" - http://free-electrons.com + "http://free-electrons.com\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 -2c2816f68e658ce55aaef715ea2cf71cbeef1d70057a0f43e01d4894c227998f +d0b7fa631ac823c3ead130c465594cc349b1888237d92c2e1da59148d76f2f10
diff --git a/a/1.txt b/N2/1.txt index bdc0ede..6739ea7 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -1,13 +1,13 @@ Hi Arnd, - On ven., ao?t 26 2016, Arnd Bergmann <arnd@arndb.de> wrote: + On ven., août 26 2016, Arnd Bergmann <arnd@arndb.de> wrote: > The SPI controller in the arch/arm/boot/dts/armada-39x.dtsi file has moved > to a different location in the hierarchy, which breaks the overrides > in the board specific file: > -> Warning (reg_format): "reg" property in /soc/internal-regs/spi at 10680/spi-flash at 1 has invalid length (4 bytes) (#address-cells == 2, #size-cells == 1) -> Warning (avoid_default_addr_size): Relying on default #address-cells value for /soc/internal-regs/spi at 10680/spi-flash at 1 +> Warning (reg_format): "reg" property in /soc/internal-regs/spi@10680/spi-flash@1 has invalid length (4 bytes) (#address-cells == 2, #size-cells == 1) +> Warning (avoid_default_addr_size): Relying on default #address-cells value for /soc/internal-regs/spi@10680/spi-flash@1 > > This changes the board to reference the spi controller by its label > (which has not changed) rather than the full path. @@ -32,12 +32,12 @@ Gregory > MBUS_ID(0x01, 0x1d) 0 0xfff00000 0x100000>; > > internal-regs { -> - spi at 10680 { +> - spi@10680 { > - status = "okay"; > - pinctrl-0 = <&spi1_pins>; > - pinctrl-names = "default"; > - -> - spi-flash at 1 { +> - spi-flash@1 { > - #address-cells = <1>; > - #size-cells = <1>; > - compatible = "n25q128a13", @@ -50,11 +50,11 @@ Gregory > - #address-cells = <1>; > - #size-cells = <1>; > - -> - partition at 0 { +> - partition@0 { > - label = "U-Boot"; > - reg = <0 0x400000>; > - }; -> - partition at 400000 { +> - partition@400000 { > - label = "Filesystem"; > - reg = <0x400000 0xc00000>; > - }; @@ -62,7 +62,7 @@ Gregory > - }; > - }; > - -> i2c at 11000 { +> i2c@11000 { > status = "okay"; > clock-frequency = <100000>; > @@ -173,3 +143,33 @@ @@ -75,7 +75,7 @@ Gregory > + pinctrl-0 = <&spi1_pins>; > + pinctrl-names = "default"; > + -> + spi-flash at 1 { +> + spi-flash@1 { > + #address-cells = <1>; > + #size-cells = <1>; > + compatible = "n25q128a13", @@ -88,11 +88,11 @@ Gregory > + #address-cells = <1>; > + #size-cells = <1>; > + -> + partition at 0 { +> + partition@0 { > + label = "U-Boot"; > + reg = <0 0x400000>; > + }; -> + partition at 400000 { +> + partition@400000 { > + label = "Filesystem"; > + reg = <0x400000 0xc00000>; > + }; diff --git a/a/content_digest b/N2/content_digest index 26a66c9..07d7860 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,20 +1,27 @@ "ref\020160826153925.863488-1-arnd@arndb.de\0" - "From\0gregory.clement@free-electrons.com (Gregory CLEMENT)\0" - "Subject\0[PATCH] ARM: dts: mvebu: fix reference to a390 spi controller\0" + "From\0Gregory CLEMENT <gregory.clement@free-electrons.com>\0" + "Subject\0Re: [PATCH] ARM: dts: mvebu: fix reference to a390 spi controller\0" "Date\0Mon, 29 Aug 2016 11:29:25 +0200\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Arnd Bergmann <arnd@arndb.de>\0" + "Cc\0Jason Cooper <jason@lakedaemon.net>" + Andrew Lunn <andrew@lunn.ch> + Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> + Stefan Roese <sr@denx.de> + linux-arm-kernel@lists.infradead.org + devicetree@vger.kernel.org + " linux-kernel@vger.kernel.org\0" "\00:1\0" "b\0" "Hi Arnd,\n" " \n" - " On ven., ao?t 26 2016, Arnd Bergmann <arnd@arndb.de> wrote:\n" + " On ven., ao\303\273t 26 2016, Arnd Bergmann <arnd@arndb.de> wrote:\n" "\n" "> The SPI controller in the arch/arm/boot/dts/armada-39x.dtsi file has moved\n" "> to a different location in the hierarchy, which breaks the overrides\n" "> in the board specific file:\n" ">\n" - "> Warning (reg_format): \"reg\" property in /soc/internal-regs/spi at 10680/spi-flash at 1 has invalid length (4 bytes) (#address-cells == 2, #size-cells == 1)\n" - "> Warning (avoid_default_addr_size): Relying on default #address-cells value for /soc/internal-regs/spi at 10680/spi-flash at 1\n" + "> Warning (reg_format): \"reg\" property in /soc/internal-regs/spi@10680/spi-flash@1 has invalid length (4 bytes) (#address-cells == 2, #size-cells == 1)\n" + "> Warning (avoid_default_addr_size): Relying on default #address-cells value for /soc/internal-regs/spi@10680/spi-flash@1\n" ">\n" "> This changes the board to reference the spi controller by its label\n" "> (which has not changed) rather than the full path.\n" @@ -39,12 +46,12 @@ "> \t\t\t MBUS_ID(0x01, 0x1d) 0 0xfff00000 0x100000>;\n" "> \n" "> \t\tinternal-regs {\n" - "> -\t\t\tspi at 10680 {\n" + "> -\t\t\tspi@10680 {\n" "> -\t\t\t\tstatus = \"okay\";\n" "> -\t\t\t\tpinctrl-0 = <&spi1_pins>;\n" "> -\t\t\t\tpinctrl-names = \"default\";\n" "> -\n" - "> -\t\t\t\tspi-flash at 1 {\n" + "> -\t\t\t\tspi-flash@1 {\n" "> -\t\t\t\t\t#address-cells = <1>;\n" "> -\t\t\t\t\t#size-cells = <1>;\n" "> -\t\t\t\t\tcompatible = \"n25q128a13\",\n" @@ -57,11 +64,11 @@ "> -\t\t\t\t\t\t#address-cells = <1>;\n" "> -\t\t\t\t\t\t#size-cells = <1>;\n" "> -\n" - "> -\t\t\t\t\t\tpartition at 0 {\n" + "> -\t\t\t\t\t\tpartition@0 {\n" "> -\t\t\t\t\t\t\tlabel = \"U-Boot\";\n" "> -\t\t\t\t\t\t\treg = <0 0x400000>;\n" "> -\t\t\t\t\t\t};\n" - "> -\t\t\t\t\t\tpartition at 400000 {\n" + "> -\t\t\t\t\t\tpartition@400000 {\n" "> -\t\t\t\t\t\t\tlabel = \"Filesystem\";\n" "> -\t\t\t\t\t\t\treg = <0x400000 0xc00000>;\n" "> -\t\t\t\t\t\t};\n" @@ -69,7 +76,7 @@ "> -\t\t\t\t};\n" "> -\t\t\t};\n" "> -\n" - "> \t\t\ti2c at 11000 {\n" + "> \t\t\ti2c@11000 {\n" "> \t\t\t\tstatus = \"okay\";\n" "> \t\t\t\tclock-frequency = <100000>;\n" "> @@ -173,3 +143,33 @@\n" @@ -82,7 +89,7 @@ "> +\tpinctrl-0 = <&spi1_pins>;\n" "> +\tpinctrl-names = \"default\";\n" "> +\n" - "> +\tspi-flash at 1 {\n" + "> +\tspi-flash@1 {\n" "> +\t\t#address-cells = <1>;\n" "> +\t\t#size-cells = <1>;\n" "> +\t\tcompatible = \"n25q128a13\",\n" @@ -95,11 +102,11 @@ "> +\t\t\t#address-cells = <1>;\n" "> +\t\t\t#size-cells = <1>;\n" "> +\n" - "> +\t\t\tpartition at 0 {\n" + "> +\t\t\tpartition@0 {\n" "> +\t\t\t\tlabel = \"U-Boot\";\n" "> +\t\t\t\treg = <0 0x400000>;\n" "> +\t\t\t};\n" - "> +\t\t\tpartition at 400000 {\n" + "> +\t\t\tpartition@400000 {\n" "> +\t\t\t\tlabel = \"Filesystem\";\n" "> +\t\t\t\treg = <0x400000 0xc00000>;\n" "> +\t\t\t};\n" @@ -116,4 +123,4 @@ "development, consulting, training and support.\n" http://free-electrons.com -2c2816f68e658ce55aaef715ea2cf71cbeef1d70057a0f43e01d4894c227998f +76e3575a9757fe0392418de0ac098ade91fa49ed79e9ed259c75afac122ab993
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.