diff for duplicates of <20191125130420.GA24018@cnn> diff --git a/a/1.txt b/N1/1.txt index cf1ce8f..3c86e11 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -35,7 +35,7 @@ index 0000000..09bffcd + bootargs = "console=ttyS4,115200 earlyprintk"; + }; + -+ memory at 80000000 { ++ memory@80000000 { + reg = <0x80000000 0x20000000>; + }; + @@ -51,7 +51,7 @@ index 0000000..09bffcd + +&fmc { + status = "okay"; -+ flash at 0 { ++ flash@0 { + status = "okay"; + m25p,fast-read; +#include "openbmc-flash-layout.dtsi" @@ -62,7 +62,7 @@ index 0000000..09bffcd + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_spi1_default>; -+ flash at 0 { ++ flash@0 { + status = "okay"; + m25p,fast-read; + label = "pnor"; @@ -105,7 +105,7 @@ index 0000000..09bffcd +&i2c8 { + status = "okay"; + //FRU EEPROM -+ eeprom at 51 { ++ eeprom@51 { + compatible = "atmel,24c64"; + reg = <0x51>; + pagesize = <32>; @@ -114,13 +114,13 @@ index 0000000..09bffcd + +&i2c9 { + status = "okay"; -+ tmp421 at 4e { ++ tmp421@4e { + //INLET TEMP + compatible = "ti,tmp421"; + reg = <0x4e>; + }; + //OUTLET TEMP -+ tmp421 at 4f { ++ tmp421@4f { + compatible = "ti,tmp421"; + reg = <0x4f>; + }; @@ -129,7 +129,7 @@ index 0000000..09bffcd +&i2c10 { + status = "okay"; + //HSC -+ adm1278 at 40 { ++ adm1278@40 { + compatible = "adi,adm1278"; + reg = <0x40>; + }; @@ -138,7 +138,7 @@ index 0000000..09bffcd +&i2c11 { + status = "okay"; + //MEZZ_TEMP_SENSOR -+ tmp421 at 1f { ++ tmp421@1f { + compatible = "ti,tmp421"; + reg = <0x1f>; + }; @@ -147,7 +147,7 @@ index 0000000..09bffcd +&i2c12 { + status = "okay"; + //MEZZ_FRU -+ eeprom at 51 { ++ eeprom@51 { + compatible = "atmel,24c64"; + reg = <0x51>; + pagesize = <32>; @@ -159,11 +159,11 @@ index 0000000..09bffcd + //FSC + 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 <0x02>; + }; diff --git a/a/content_digest b/N1/content_digest index 5fa3aaf..d8ac00f 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,13 @@ "From\0manikandan-e <manikandan.hcl.ers.epl@gmail.com>\0" "Subject\0[PATCH v3] ARM: dts: aspeed: Adding Facebook Yosemite V2 BMC\0" "Date\0Mon, 25 Nov 2019 18:34:20 +0530\0" - "To\0linux-aspeed@lists.ozlabs.org\0" + "To\0andrew@aj.id.au\0" + "Cc\0joel@jms.id.au" + vijaykhemka@fb.com + linux-kernel@vger.kernel.org + devicetree@vger.kernel.org + linux-aspeed@lists.ozlabs.org + " manikandan.e@hcl.com\0" "\00:1\0" "b\0" "The Yosemite V2 is a facebook multi-node server\n" @@ -41,7 +47,7 @@ "+\t\tbootargs = \"console=ttyS4,115200 earlyprintk\";\n" "+\t};\n" "+\n" - "+\tmemory at 80000000 {\n" + "+\tmemory@80000000 {\n" "+\t\treg = <0x80000000 0x20000000>;\n" "+\t};\n" "+\n" @@ -57,7 +63,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" @@ -68,7 +74,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" @@ -111,7 +117,7 @@ "+&i2c8 {\n" "+\tstatus = \"okay\";\n" "+\t//FRU EEPROM\n" - "+\teeprom at 51 {\n" + "+\teeprom@51 {\n" "+\t\tcompatible = \"atmel,24c64\";\n" "+\t\treg = <0x51>;\n" "+\t\tpagesize = <32>;\n" @@ -120,13 +126,13 @@ "+\n" "+&i2c9 {\n" "+\tstatus = \"okay\";\n" - "+\ttmp421 at 4e {\n" + "+\ttmp421@4e {\n" "+\t//INLET TEMP\n" "+\t\tcompatible = \"ti,tmp421\";\n" "+\t\treg = <0x4e>;\n" "+\t};\n" "+\t//OUTLET TEMP\n" - "+\ttmp421 at 4f {\n" + "+\ttmp421@4f {\n" "+\t\tcompatible = \"ti,tmp421\";\n" "+\t\treg = <0x4f>;\n" "+\t};\n" @@ -135,7 +141,7 @@ "+&i2c10 {\n" "+\tstatus = \"okay\";\n" "+\t//HSC\n" - "+\tadm1278 at 40 {\n" + "+\tadm1278@40 {\n" "+\t\tcompatible = \"adi,adm1278\";\n" "+\t\treg = <0x40>;\n" "+\t};\n" @@ -144,7 +150,7 @@ "+&i2c11 {\n" "+\tstatus = \"okay\";\n" "+\t//MEZZ_TEMP_SENSOR\n" - "+\ttmp421 at 1f {\n" + "+\ttmp421@1f {\n" "+\t\tcompatible = \"ti,tmp421\";\n" "+\t\treg = <0x1f>;\n" "+\t};\n" @@ -153,7 +159,7 @@ "+&i2c12 {\n" "+\tstatus = \"okay\";\n" "+\t//MEZZ_FRU\n" - "+\teeprom at 51 {\n" + "+\teeprom@51 {\n" "+\t\tcompatible = \"atmel,24c64\";\n" "+\t\treg = <0x51>;\n" "+\t\tpagesize = <32>;\n" @@ -165,11 +171,11 @@ "+\t//FSC\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 <0x02>;\n" "+\t};\n" @@ -177,4 +183,4 @@ "-- \n" 2.7.4 -6cb8d569e0b68851964b09fd30927a0268ed887b3c4a32fc8ad44bfbf8dbc531 +3a38e900d723dd01af406333a5cae3917ddc6932813c265250fe1aa38e1ffec8
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.