diff for duplicates of <20191213135131.GA1822@cnn> diff --git a/a/1.txt b/N1/1.txt index 207ce2c..249c2d7 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -44,7 +44,7 @@ index 0000000..ffd7f4c + stdout-path = &uart5; + }; + -+ memory at 80000000 { ++ memory@80000000 { + reg = <0x80000000 0x20000000>; + }; + @@ -60,7 +60,7 @@ index 0000000..ffd7f4c + +&fmc { + status = "okay"; -+ flash at 0 { ++ flash@0 { + status = "okay"; + m25p,fast-read; +#include "openbmc-flash-layout.dtsi" @@ -71,7 +71,7 @@ index 0000000..ffd7f4c + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_spi1_default>; -+ flash at 0 { ++ flash@0 { + status = "okay"; + m25p,fast-read; + label = "pnor"; @@ -114,7 +114,7 @@ index 0000000..ffd7f4c +&i2c8 { + //FRU EEPROM + status = "okay"; -+ eeprom at 51 { ++ eeprom@51 { + compatible = "atmel,24c64"; + reg = <0x51>; + pagesize = <32>; @@ -124,11 +124,11 @@ index 0000000..ffd7f4c +&i2c9 { + //INLET & OUTLET TEMP + status = "okay"; -+ tmp421 at 4e { ++ tmp421@4e { + compatible = "ti,tmp421"; + reg = <0x4e>; + }; -+ tmp421 at 4f { ++ tmp421@4f { + compatible = "ti,tmp421"; + reg = <0x4f>; + }; @@ -137,7 +137,7 @@ index 0000000..ffd7f4c +&i2c10 { + //HSC + status = "okay"; -+ adm1278 at 40 { ++ adm1278@40 { + compatible = "adi,adm1278"; + reg = <0x40>; + }; @@ -146,7 +146,7 @@ index 0000000..ffd7f4c +&i2c11 { + //MEZZ_TEMP_SENSOR + status = "okay"; -+ tmp421 at 1f { ++ tmp421@1f { + compatible = "ti,tmp421"; + reg = <0x1f>; + }; @@ -155,7 +155,7 @@ index 0000000..ffd7f4c +&i2c12 { + //MEZZ_FRU + status = "okay"; -+ eeprom at 51 { ++ eeprom@51 { + compatible = "atmel,24c64"; + reg = <0x51>; + pagesize = <32>; @@ -167,11 +167,11 @@ index 0000000..ffd7f4c + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_pwm0_default &pinctrl_pwm1_default>; -+ fan at 0 { ++ fan@0 { + reg = <0x00>; + aspeed,fan-tach-ch = /bits/ 8 <0x00>; + }; -+ fan at 1 { ++ fan@1 { + reg = <0x01>; + aspeed,fan-tach-ch = /bits/ 8 <0x01>; + }; diff --git a/a/content_digest b/N1/content_digest index eb9cc2d..45d6646 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,15 @@ "From\0Manikandan Elumalai <manikandan.hcl.ers.epl@gmail.com>\0" "Subject\0[PATCH v5] ARM: dts: aspeed: Adding Facebook Yosemite V2 BMC\0" "Date\0Fri, 13 Dec 2019 19:21:31 +0530\0" - "To\0linux-aspeed@lists.ozlabs.org\0" + "To\0andrew@aj.id.au" + " joel@jms.id.au\0" + "Cc\0sdasari@fb.com" + vijaykhemka@fb.com + linux-kernel@vger.kernel.org + devicetree@vger.kernel.org + linux-aspeed@lists.ozlabs.org + manikandan.e@hcl.com + " openbmc@lists.ozlabs.org\0" "\00:1\0" "b\0" "The Yosemite V2 is a facebook multi-node server\n" @@ -50,7 +58,7 @@ "+\t\tstdout-path = &uart5;\n" "+\t};\n" "+\n" - "+\tmemory at 80000000 {\n" + "+\tmemory@80000000 {\n" "+\t\treg = <0x80000000 0x20000000>;\n" "+\t};\n" "+\n" @@ -66,7 +74,7 @@ "+\n" "+&fmc {\n" "+\tstatus = \"okay\";\n" - "+\tflash at 0 {\n" + "+\tflash@0 {\n" "+\t\tstatus = \"okay\";\n" "+\t\tm25p,fast-read;\n" "+#include \"openbmc-flash-layout.dtsi\"\n" @@ -77,7 +85,7 @@ "+\tstatus = \"okay\";\n" "+\tpinctrl-names = \"default\";\n" "+\tpinctrl-0 = <&pinctrl_spi1_default>;\n" - "+\tflash at 0 {\n" + "+\tflash@0 {\n" "+\t\tstatus = \"okay\";\n" "+\t\tm25p,fast-read;\n" "+\t\tlabel = \"pnor\";\n" @@ -120,7 +128,7 @@ "+&i2c8 {\n" "+\t//FRU EEPROM\n" "+\tstatus = \"okay\";\n" - "+\teeprom at 51 {\n" + "+\teeprom@51 {\n" "+\t\tcompatible = \"atmel,24c64\";\n" "+\t\treg = <0x51>;\n" "+\t\tpagesize = <32>;\n" @@ -130,11 +138,11 @@ "+&i2c9 {\n" "+\t//INLET & OUTLET TEMP\n" "+\tstatus = \"okay\";\n" - "+\ttmp421 at 4e {\n" + "+\ttmp421@4e {\n" "+\t\tcompatible = \"ti,tmp421\";\n" "+\t\treg = <0x4e>;\n" "+\t};\n" - "+\ttmp421 at 4f {\n" + "+\ttmp421@4f {\n" "+\t\tcompatible = \"ti,tmp421\";\n" "+\t\treg = <0x4f>;\n" "+\t};\n" @@ -143,7 +151,7 @@ "+&i2c10 {\n" "+\t//HSC\n" "+\tstatus = \"okay\";\n" - "+\tadm1278 at 40 {\n" + "+\tadm1278@40 {\n" "+\t\tcompatible = \"adi,adm1278\";\n" "+\t\treg = <0x40>;\n" "+\t};\n" @@ -152,7 +160,7 @@ "+&i2c11 {\n" "+\t//MEZZ_TEMP_SENSOR\n" "+\tstatus = \"okay\";\n" - "+\ttmp421 at 1f {\n" + "+\ttmp421@1f {\n" "+\t\tcompatible = \"ti,tmp421\";\n" "+\t\treg = <0x1f>;\n" "+\t};\n" @@ -161,7 +169,7 @@ "+&i2c12 {\n" "+\t//MEZZ_FRU\n" "+\tstatus = \"okay\";\n" - "+\teeprom at 51 {\n" + "+\teeprom@51 {\n" "+\t\tcompatible = \"atmel,24c64\";\n" "+\t\treg = <0x51>;\n" "+\t\tpagesize = <32>;\n" @@ -173,11 +181,11 @@ "+\tstatus = \"okay\";\n" "+\tpinctrl-names = \"default\";\n" "+\tpinctrl-0 = <&pinctrl_pwm0_default &pinctrl_pwm1_default>;\n" - "+\tfan at 0 {\n" + "+\tfan@0 {\n" "+\t\treg = <0x00>;\n" "+\t\taspeed,fan-tach-ch = /bits/ 8 <0x00>;\n" "+\t};\n" - "+\tfan at 1 {\n" + "+\tfan@1 {\n" "+\t\treg = <0x01>;\n" "+\t\taspeed,fan-tach-ch = /bits/ 8 <0x01>;\n" "+\t};\n" @@ -185,4 +193,4 @@ "-- \n" 2.7.4 -a2dc6d6eef740946c54b0bb1661a63528875c6786aa5e7c3df258c02cfa0ed87 +5126edbdc9e13674dbe48e22ed667a6f40f6e76f2648a67ccde4df1b46a8530d
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.