diff for duplicates of <20141215203855.GA28940@anne> diff --git a/a/1.txt b/N1/1.txt index b93f20c..fa952db 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -60,8 +60,8 @@ index 0000000..1de2ac3 + stdout-path = &uart0; + }; + -+ ocp at f1000000 { -+ pinctrl: pin-controller at 10000 { ++ ocp@f1000000 { ++ pinctrl: pin-controller@10000 { + pinctrl-0 = < &pmx_uart0 + &pmx_button_reset + &pmx_button_power @@ -94,18 +94,18 @@ index 0000000..1de2ac3 + }; + }; + -+ 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>; + }; @@ -120,12 +120,12 @@ index 0000000..1de2ac3 + 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>; @@ -149,7 +149,7 @@ index 0000000..1de2ac3 + 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"; @@ -161,7 +161,7 @@ index 0000000..1de2ac3 + gpio = <&gpio0 24 0>; + }; + -+ sata1_power: regulator at 2 { ++ sata1_power: regulator@2 { + compatible = "regulator-fixed"; + reg = <2>; + regulator-name = "SATA1 Power"; @@ -177,23 +177,23 @@ index 0000000..1de2ac3 + +&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>; + }; + -+ partition at c0000 { ++ partition@c0000 { + label = "uimage"; + reg = <0xc0000 0x500000>; + }; + -+ partition at 5c0000 { ++ partition@5c0000 { + label = "rootfs"; + reg = <0x5c0000 0x1a40000>; + }; @@ -201,14 +201,14 @@ index 0000000..1de2ac3 + +&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 c9420c3..7386365 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,9 @@ - "From\0evgeni@studio-punkt.com (Evgeni Dobrev)\0" + "From\0Evgeni Dobrev <evgeni@studio-punkt.com>\0" "Subject\0[PATCH 2/2] ARM: dts: kirkwood: add dts support for Seagate BlackArmor NAS220\0" "Date\0Mon, 15 Dec 2014 21:38:55 +0100\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0devicetree@vger.kernel.org\0" + "Cc\0linux-kernel@vger.kernel.org" + " linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "This patch adds support for Seagate BlackArmor NAS220.\n" @@ -66,8 +68,8 @@ "+\t\tstdout-path = &uart0;\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" @@ -100,18 +102,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" @@ -126,12 +128,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" @@ -155,7 +157,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" @@ -167,7 +169,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" @@ -183,23 +185,23 @@ "+\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" "+\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" @@ -207,14 +209,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" @@ -222,4 +224,4 @@ "-- \n" 1.7.10.4 -65a993ba82fb5fb4e087a2dc39243403b3db22a3adf81e66631fa9d943af94dc +941e1e101a73b2ddd8db25ca7faa7b2b8619333fb4eabf9b9e23c325417afc9a
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.