diff for duplicates of <20150518223935.GM10274@atomide.com> diff --git a/a/1.txt b/N1/1.txt index cb7e749..c2b607d 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -2,7 +2,7 @@ > +&gpmc { > + ranges = <1 0 0x08000000 0x1000000>; /* CS1: 16MB for LAN9221 */ > + -> + ethernet@gpmc { +> + ethernet at gpmc { > + pinctrl-names = "default"; > + pinctrl-0 = <&lan9221_pins>; > + interrupt-parent = <&gpio5>; @@ -139,7 +139,7 @@ Signed-off-by: Tony Lindgren <tony@atomide.com> +&gpmc { + ranges = <1 0 0x08000000 0x1000000>; /* CS1: 16MB for LAN9221 */ + -+ ethernet@gpmc { ++ ethernet at gpmc { + pinctrl-names = "default"; + pinctrl-0 = <&lan9221_pins>; + interrupt-parent = <&gpio5>; @@ -232,7 +232,7 @@ Signed-off-by: Tony Lindgren <tony@atomide.com> + +/ { + cpus { -+ cpu@0 { ++ cpu at 0 { + cpu0-supply = <&vcc>; + }; + }; @@ -261,7 +261,7 @@ Signed-off-by: Tony Lindgren <tony@atomide.com> +&gpmc { + ranges = <0 0 0x00000000 0x1000000>; /* CS0: 16MB for NAND */ + -+ nand@0,0 { ++ nand at 0,0 { + linux,mtd-name = "micron,mt29f4g16abbda3w"; + reg = <0 0 4>; /* CS0, offset 0, IO size 4 */ + nand-bus-width = <16>; @@ -286,27 +286,27 @@ Signed-off-by: Tony Lindgren <tony@atomide.com> + + /* u-boot uses mtdparts=omap2-nand.0:512k(x-loader),1920k(u-boot),128k(u-boot-env),4m(kernel),-(fs) */ + -+ x-loader@0 { ++ x-loader at 0 { + label = "x-loader"; + reg = <0 0x80000>; + }; + -+ bootloaders@80000 { ++ bootloaders at 80000 { + label = "u-boot"; + reg = <0x80000 0x1e0000>; + }; + -+ bootloaders_env@260000 { ++ bootloaders_env at 260000 { + label = "u-boot-env"; + reg = <0x260000 0x20000>; + }; + -+ kernel@280000 { ++ kernel at 280000 { + label = "kernel"; + reg = <0x280000 0x400000>; + }; + -+ filesystem@680000 { ++ filesystem at 680000 { + label = "fs"; + reg = <0x680000 0>; /* 0 = MTDPART_SIZ_FULL */ + }; @@ -316,7 +316,7 @@ Signed-off-by: Tony Lindgren <tony@atomide.com> +&i2c1 { + clock-frequency = <2600000>; + -+ twl: twl@48 { ++ twl: twl at 48 { + reg = <0x48>; + interrupts = <7>; /* SYS_NIRQ cascaded to intc */ + interrupt-parent = <&intc>; @@ -340,7 +340,7 @@ Signed-off-by: Tony Lindgren <tony@atomide.com> + cap-power-off-card; + #address-cells = <1>; + #size-cells = <0>; -+ wlcore: wlcore@2 { ++ wlcore: wlcore at 2 { + compatible = "ti,wl1283"; + reg = <2>; + interrupt-parent = <&gpio5>; diff --git a/a/content_digest b/N1/content_digest index c2908b1..d84c98e 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,18 +1,16 @@ "ref\01430528752-316-1-git-send-email-tony@atomide.com\0" "ref\01430528752-316-3-git-send-email-tony@atomide.com\0" - "From\0Tony Lindgren <tony@atomide.com>\0" - "Subject\0Re: [PATCH 2/2] ARM: dts: Add minimal support for LogicPD Torpedo DM3730 devkit\0" + "From\0tony@atomide.com (Tony Lindgren)\0" + "Subject\0[PATCH 2/2] ARM: dts: Add minimal support for LogicPD Torpedo DM3730 devkit\0" "Date\0Mon, 18 May 2015 15:39:35 -0700\0" - "To\0linux-omap@vger.kernel.org\0" - "Cc\0linux-arm-kernel@lists.infradead.org" - " Tim Nordell <tim.nordell@logicpd.com>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "* Tony Lindgren <tony@atomide.com> [150501 18:07]:\n" "> +&gpmc {\n" "> +\tranges = <1 0 0x08000000 0x1000000>;\t/* CS1: 16MB for LAN9221 */\n" "> +\n" - "> +\tethernet@gpmc {\n" + "> +\tethernet at gpmc {\n" "> +\t\tpinctrl-names = \"default\";\n" "> +\t\tpinctrl-0 = <&lan9221_pins>;\n" "> +\t\tinterrupt-parent = <&gpio5>;\n" @@ -149,7 +147,7 @@ "+&gpmc {\n" "+\tranges = <1 0 0x08000000 0x1000000>;\t/* CS1: 16MB for LAN9221 */\n" "+\n" - "+\tethernet@gpmc {\n" + "+\tethernet at gpmc {\n" "+\t\tpinctrl-names = \"default\";\n" "+\t\tpinctrl-0 = <&lan9221_pins>;\n" "+\t\tinterrupt-parent = <&gpio5>;\n" @@ -242,7 +240,7 @@ "+\n" "+/ {\n" "+\tcpus {\n" - "+\t\tcpu@0 {\n" + "+\t\tcpu at 0 {\n" "+\t\t\tcpu0-supply = <&vcc>;\n" "+\t\t};\n" "+\t};\n" @@ -271,7 +269,7 @@ "+&gpmc {\n" "+\tranges = <0 0 0x00000000 0x1000000>;\t/* CS0: 16MB for NAND */\n" "+\n" - "+\tnand@0,0 {\n" + "+\tnand at 0,0 {\n" "+\t\tlinux,mtd-name = \"micron,mt29f4g16abbda3w\";\n" "+\t\treg = <0 0 4>; /* CS0, offset 0, IO size 4 */\n" "+\t\tnand-bus-width = <16>;\n" @@ -296,27 +294,27 @@ "+\n" "+\t\t/* u-boot uses mtdparts=omap2-nand.0:512k(x-loader),1920k(u-boot),128k(u-boot-env),4m(kernel),-(fs) */\n" "+\n" - "+\t\tx-loader@0 {\n" + "+\t\tx-loader at 0 {\n" "+\t\t\tlabel = \"x-loader\";\n" "+\t\t\treg = <0 0x80000>;\n" "+\t\t};\n" "+\n" - "+\t\tbootloaders@80000 {\n" + "+\t\tbootloaders at 80000 {\n" "+\t\t\tlabel = \"u-boot\";\n" "+\t\t\treg = <0x80000 0x1e0000>;\n" "+\t\t};\n" "+\n" - "+\t\tbootloaders_env@260000 {\n" + "+\t\tbootloaders_env at 260000 {\n" "+\t\t\tlabel = \"u-boot-env\";\n" "+\t\t\treg = <0x260000 0x20000>;\n" "+\t\t};\n" "+\n" - "+\t\tkernel@280000 {\n" + "+\t\tkernel at 280000 {\n" "+\t\t\tlabel = \"kernel\";\n" "+\t\t\treg = <0x280000 0x400000>;\n" "+\t\t};\n" "+\n" - "+\t\tfilesystem@680000 {\n" + "+\t\tfilesystem at 680000 {\n" "+\t\t\tlabel = \"fs\";\n" "+\t\t\treg = <0x680000 0>;\t/* 0 = MTDPART_SIZ_FULL */\n" "+\t\t};\n" @@ -326,7 +324,7 @@ "+&i2c1 {\n" "+\tclock-frequency = <2600000>;\n" "+\n" - "+\ttwl: twl@48 {\n" + "+\ttwl: twl at 48 {\n" "+\t\treg = <0x48>;\n" "+\t\tinterrupts = <7>; /* SYS_NIRQ cascaded to intc */\n" "+\t\tinterrupt-parent = <&intc>;\n" @@ -350,7 +348,7 @@ "+\tcap-power-off-card;\n" "+\t#address-cells = <1>;\n" "+\t#size-cells = <0>;\n" - "+\twlcore: wlcore@2 {\n" + "+\twlcore: wlcore at 2 {\n" "+\t\tcompatible = \"ti,wl1283\";\n" "+\t\treg = <2>;\n" "+\t\tinterrupt-parent = <&gpio5>;\n" @@ -395,4 +393,4 @@ "+\tti,use-leds;\n" +}; -c6fbc2a557b7819ba6d84bcd5c70c184fed2a6964eaf796a9aebcb93cd9c5773 +00fde0e8866463446ada343e716f797fbb059a2f4b2f2f61c06dbc0f976a76d5
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.