diff for duplicates of <20141222125750.GA29163@anne> diff --git a/a/1.txt b/N1/1.txt index 5c22bcf..fb42f87 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -66,8 +66,8 @@ index 0000000..8175f3d + 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>; @@ -107,18 +107,18 @@ index 0000000..8175f3d + * pin 4 - RX + * pin 6 - GND + */ -+ serial at 12000 { ++ serial@12000 { + status = "okay"; + }; + -+ sata at 80000 { ++ sata@80000 { + status = "okay"; + nr-ports = <2>; + }; + -+ i2c at 11000 { ++ i2c@11000 { + status = "okay"; -+ adt7476: adt7476a at 2e { ++ adt7476: adt7476a@2e { + compatible = "adi,adt7476"; + reg = <0x2e>; + }; @@ -132,12 +132,12 @@ index 0000000..8175f3d + + 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>; @@ -160,7 +160,7 @@ index 0000000..8175f3d + 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"; @@ -172,7 +172,7 @@ index 0000000..8175f3d + gpio = <&gpio0 24 0>; + }; + -+ sata1_power: regulator at 2 { ++ sata1_power: regulator@2 { + compatible = "regulator-fixed"; + reg = <2>; + regulator-name = "SATA1 Power"; @@ -192,14 +192,14 @@ index 0000000..8175f3d + +&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 eb807e7..481694a 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,14 @@ "ref\020141215203855.GA28940@anne\0" - "From\0evgeni@studio-punkt.com (Evgeni Dobrev)\0" + "From\0Evgeni Dobrev <evgeni@studio-punkt.com>\0" "Subject\0[PATCH v3 1/1] add support for Seagate BlackArmor NAS220\0" "Date\0Mon, 22 Dec 2014 13:57:50 +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 + Jason Cooper <jason@lakedaemon.net> + Sebastian Hesselbarth <sebastian.hesselbarth@googlemail.com> + Gregory Clement <gregory.clement@free-electrons.com> + " Andrew Lunn <andrew@lunn.ch>\0" "\00:1\0" "b\0" "This patch adds support for Seagate BlackArmor NAS220.\n" @@ -73,8 +79,8 @@ "+\t\tstdout-path = &uart0;\n" "+\t};\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" @@ -114,18 +120,18 @@ "+\t\t * pin 4 - RX\n" "+\t\t * pin 6 - GND\n" "+\t\t */\n" - "+\t\tserial at 12000 {\n" + "+\t\tserial@12000 {\n" "+\t\t\tstatus = \"okay\";\n" "+\t\t};\n" "+\n" - "+\t\tsata at 80000 {\n" + "+\t\tsata@80000 {\n" "+\t\t\tstatus = \"okay\";\n" "+\t\t\tnr-ports = <2>;\n" "+\t\t};\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" @@ -139,12 +145,12 @@ "+\n" "+\tgpio_keys {\n" "+\t\tcompatible = \"gpio-keys\";\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" @@ -167,7 +173,7 @@ "+\t\tpinctrl-0 = <&pmx_power_sata0 &pmx_power_sata1>;\n" "+\t\tpinctrl-names = \"default\";\n" "+\n" - "+\t\tsata0_power: regulator at 1 {\n" + "+\t\tsata0_power: regulator@1 {\n" "+\t\t\tcompatible = \"regulator-fixed\";\n" "+\t\t\treg = <1>;\n" "+\t\t\tregulator-name = \"SATA0 Power\";\n" @@ -179,7 +185,7 @@ "+\t\t\tgpio = <&gpio0 24 0>;\n" "+\t\t};\n" "+\n" - "+\t\tsata1_power: regulator at 2 {\n" + "+\t\tsata1_power: regulator@2 {\n" "+\t\t\tcompatible = \"regulator-fixed\";\n" "+\t\t\treg = <2>;\n" "+\t\t\tregulator-name = \"SATA1 Power\";\n" @@ -199,18 +205,18 @@ "+\n" "+&mdio {\n" "+\tstatus = \"okay\";\n" - "+\tethphy0: ethernet-phy at 8 {\n" + "+\tethphy0: ethernet-phy@8 {\n" "+\t\t reg = <8>;\n" "+\t };\n" "+};\n" "+\n" "+ð0 {\n" "+\tstatus = \"okay\";\n" - "+\tethernet0-port at 0 {\n" + "+\tethernet0-port@0 {\n" "+\t\tphy-handle = <ðphy0>;\n" "+\t};\n" "+};\n" "-- \n" 1.7.10.4 -2c3c851df58a5c05f117a1c9c80f62da4d591cb69f2c2bfe5162a89d5b268f87 +a1877029467c12a4e3b7b2e99da7780d3f24c171102f26b606005f76293f4e9a
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.