diff for duplicates of <20141216163714.GE20170@anne> diff --git a/a/1.txt b/N1/1.txt index f11a5e7..a7865de 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -111,8 +111,8 @@ I will do that. I will fix this. > > + -> > + ocp at f1000000 { -> > + pinctrl: pin-controller at 10000 { +> > + ocp@f1000000 { +> > + pinctrl: pin-controller@10000 { > > + pinctrl-0 = < &pmx_uart0 > > + &pmx_button_reset > > + &pmx_button_power @@ -145,18 +145,18 @@ I will fix this. > > + }; > > + }; > > + -> > + serial at 12000 { +> > + serial@12000 { > > + status = "okay"; > > + }; > > + -> > + sata at 80000 { +> > + sata@80000 { > > + nr-ports = <2>; > > + status = "okay"; > > + }; > > + -> > + i2c at 11000 { +> > + i2c@11000 { > > + status = "okay"; -> > + adt7476: adt7476a at 2e { +> > + adt7476: adt7476a@2e { > > + compatible = "adi,adt7476"; > > + reg = <0x2e>; > > + }; @@ -171,12 +171,12 @@ I will fix this. > > + gpio_keys { > > + compatible = "gpio-keys"; > > + -> > + button at 1{ +> > + button@1{ > > + label = "Reset push button"; > > + linux,code = <KEY_POWER>; > > + gpios = <&gpio0 29 GPIO_ACTIVE_HIGH>; > > + }; -> > + button at 2{ +> > + button@2{ > > + label = "Power push button"; > > + linux,code = <KEY_SLEEP>; > > + gpios = <&gpio0 26 GPIO_ACTIVE_LOW>; @@ -200,7 +200,7 @@ I will fix this. > > + pinctrl-0 = <&pmx_power_sata0 &pmx_power_sata1>; > > + pinctrl-names = "default"; > > + -> > + sata0_power: regulator at 1 { +> > + sata0_power: regulator@1 { > > + compatible = "regulator-fixed"; > > + reg = <1>; > > + regulator-name = "SATA0 Power"; @@ -212,7 +212,7 @@ I will fix this. > > + gpio = <&gpio0 24 0>; > > + }; > > + -> > + sata1_power: regulator at 2 { +> > + sata1_power: regulator@2 { > > + compatible = "regulator-fixed"; > > + reg = <2>; > > + regulator-name = "SATA1 Power"; @@ -228,13 +228,13 @@ I will fix this. > > + > > +&nand { > > + status = "okay"; -> > + partition at 0 { +> > + partition@0 { > > + label = "uboot"; > > + reg = <0x0 0xa0000>; > > + read-only; > > + }; > > + -> > + partition at a0000 { +> > + partition@a0000 { > > + label = "env"; > > + reg = <0xa0000 0x010000>; > > + }; @@ -253,12 +253,12 @@ prefer to remove the layout and leave it for the user to decide. What would you recommend? > > + -> > + partition at c0000 { +> > + partition@c0000 { > > + label = "uimage"; > > + reg = <0xc0000 0x500000>; > > + }; > > + -> > + partition at 5c0000 { +> > + partition@5c0000 { > > + label = "rootfs"; > > + reg = <0x5c0000 0x1a40000>; > > + }; @@ -266,14 +266,14 @@ What would you recommend? > > + > > +&mdio { > > + status = "okay"; -> > + ethphy0: ethernet-phy at 8 { +> > + ethphy0: ethernet-phy@8 { > > + reg = <8>; > > + }; > > +}; > > + > > +ð0 { > > + status = "okay"; -> > + ethernet0-port at 0 { +> > + ethernet0-port@0 { > > + phy-handle = <ðphy0>; > > + }; > > +}; diff --git a/a/content_digest b/N1/content_digest index 68a5634..9693db6 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,15 @@ "ref\020141215203855.GA28940@anne\0" "ref\020141216085645.GB1450@lunn.ch\0" - "From\0evgeni@studio-punkt.com (Evgeni Dobrev)\0" - "Subject\0[PATCH 2/2] ARM: dts: kirkwood: add dts support for Seagate BlackArmor NAS220\0" + "From\0Evgeni Dobrev <evgeni@studio-punkt.com>\0" + "Subject\0Re: [PATCH 2/2] ARM: dts: kirkwood: add dts support for Seagate BlackArmor NAS220\0" "Date\0Tue, 16 Dec 2014 17:37:14 +0100\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Andrew Lunn <andrew@lunn.ch>\0" + "Cc\0devicetree@vger.kernel.org" + linux-kernel@vger.kernel.org + linux-arm-kernel@lists.infradead.org + Jason Cooper <jason@lakedaemon.net> + Gregory Clement <gregory.clement@free-electrons.com> + " Sebastian Hesselbarth <sebastian.hesselbarth@googlemail.com>\0" "\00:1\0" "b\0" "Hi Andrew,\n" @@ -119,8 +125,8 @@ "I will fix this.\n" "\n" "> > +\n" - "> > +\tocp at f1000000 {\n" - "> > +\t\tpinctrl: pin-controller at 10000 {\n" + "> > +\tocp@f1000000 {\n" + "> > +\t\tpinctrl: pin-controller@10000 {\n" "> > +\t\t\tpinctrl-0 = < &pmx_uart0\n" "> > +\t\t\t\t&pmx_button_reset\n" "> > +\t\t\t\t&pmx_button_power\n" @@ -153,18 +159,18 @@ "> > + };\n" "> > +\t\t};\n" "> > +\n" - "> > +\t\tserial at 12000 {\n" + "> > +\t\tserial@12000 {\n" "> > +\t\t\tstatus = \"okay\";\n" "> > +\t\t};\n" "> > +\n" - "> > + sata at 80000 {\n" + "> > + sata@80000 {\n" "> > + nr-ports = <2>;\n" "> > + status = \"okay\";\n" "> > + };\n" "> > +\n" - "> > +\t\ti2c at 11000 {\n" + "> > +\t\ti2c@11000 {\n" "> > +\t\t\tstatus = \"okay\";\n" - "> > +\t\t\tadt7476: adt7476a at 2e {\n" + "> > +\t\t\tadt7476: adt7476a@2e {\n" "> > +\t\t\t\tcompatible = \"adi,adt7476\";\n" "> > +\t\t\t\treg = <0x2e>;\n" "> > +\t\t\t};\n" @@ -179,12 +185,12 @@ "> > +\tgpio_keys {\n" "> > +\t\tcompatible = \"gpio-keys\";\n" "> > +\n" - "> > +\t\tbutton at 1{\n" + "> > +\t\tbutton@1{\n" "> > +\t\t\tlabel = \"Reset push button\";\n" "> > +\t\t\tlinux,code = <KEY_POWER>;\n" "> > +\t\t\tgpios = <&gpio0 29 GPIO_ACTIVE_HIGH>;\n" "> > +\t\t};\n" - "> > +\t\tbutton at 2{\n" + "> > +\t\tbutton@2{\n" "> > +\t\t\tlabel = \"Power push button\";\n" "> > +\t\t\tlinux,code = <KEY_SLEEP>;\n" "> > +\t\t\tgpios = <&gpio0 26 GPIO_ACTIVE_LOW>;\n" @@ -208,7 +214,7 @@ "> > + pinctrl-0 = <&pmx_power_sata0 &pmx_power_sata1>;\n" "> > + pinctrl-names = \"default\";\n" "> > +\n" - "> > + sata0_power: regulator at 1 {\n" + "> > + sata0_power: regulator@1 {\n" "> > + compatible = \"regulator-fixed\";\n" "> > + reg = <1>;\n" "> > + regulator-name = \"SATA0 Power\";\n" @@ -220,7 +226,7 @@ "> > + gpio = <&gpio0 24 0>;\n" "> > + };\n" "> > +\n" - "> > + sata1_power: regulator at 2 {\n" + "> > + sata1_power: regulator@2 {\n" "> > + compatible = \"regulator-fixed\";\n" "> > + reg = <2>;\n" "> > + regulator-name = \"SATA1 Power\";\n" @@ -236,13 +242,13 @@ "> > +\n" "> > +&nand {\n" "> > +\tstatus = \"okay\";\n" - "> > +\tpartition at 0 {\n" + "> > +\tpartition@0 {\n" "> > +\t\tlabel = \"uboot\";\n" "> > +\t\treg = <0x0 0xa0000>;\n" "> > +\t\tread-only;\n" "> > +\t};\n" "> > +\n" - "> > +\tpartition at a0000 {\n" + "> > +\tpartition@a0000 {\n" "> > +\t\tlabel = \"env\";\n" "> > +\t\treg = <0xa0000 0x010000>;\n" "> > +\t};\n" @@ -261,12 +267,12 @@ "What would you recommend?\n" "\n" "> > +\n" - "> > +\tpartition at c0000 {\n" + "> > +\tpartition@c0000 {\n" "> > +\t\tlabel = \"uimage\";\n" "> > +\t\treg = <0xc0000 0x500000>;\n" "> > +\t};\n" "> > +\n" - "> > +\tpartition at 5c0000 {\n" + "> > +\tpartition@5c0000 {\n" "> > +\t\tlabel = \"rootfs\";\n" "> > +\t\treg = <0x5c0000 0x1a40000>;\n" "> > +\t};\n" @@ -274,14 +280,14 @@ "> > +\n" "> > +&mdio {\n" "> > + status = \"okay\";\n" - "> > + ethphy0: ethernet-phy at 8 {\n" + "> > + ethphy0: ethernet-phy@8 {\n" "> > + reg = <8>;\n" "> > + };\n" "> > +};\n" "> > +\n" "> > +ð0 {\n" "> > + status = \"okay\";\n" - "> > + ethernet0-port at 0 {\n" + "> > + ethernet0-port@0 {\n" "> > + phy-handle = <ðphy0>;\n" "> > + };\n" "> > +};\n" @@ -295,4 +301,4 @@ "\n" evgeni -cbc97462711de3c7f2efbdc2a29da15ce7bca41c0bfe3744d5090a40e805bb66 +57de052df2df33a72589bdbacff7dbe51bb88ccd4a2a10872ed8988047a14514
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.