diff for duplicates of <20191118123707.GA5560@cnn> diff --git a/a/1.txt b/N1/1.txt index 951d754..80e465a 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -37,7 +37,7 @@ index 0000000..46a285a + bootargs = "console=ttyS4,115200 earlyprintk"; + }; + -+ memory at 80000000 { ++ memory@80000000 { + reg = <0x80000000 0x20000000>; + }; + @@ -53,7 +53,7 @@ index 0000000..46a285a + +&fmc { + status = "okay"; -+ flash at 0 { ++ flash@0 { + status = "okay"; + m25p,fast-read; +#include "openbmc-flash-layout.dtsi" @@ -64,7 +64,7 @@ index 0000000..46a285a + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_spi1_default>; -+ flash at 0 { ++ flash@0 { + status = "okay"; + m25p,fast-read; + label = "pnor"; @@ -124,7 +124,7 @@ index 0000000..46a285a +&i2c8 { + status = "okay"; + //FRU EEPROM -+ eeprom at 51 { ++ eeprom@51 { + compatible = "atmel,24c64"; + reg = <0x51>; + pagesize = <32>; @@ -133,13 +133,13 @@ index 0000000..46a285a + +&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>; + }; @@ -148,7 +148,7 @@ index 0000000..46a285a +&i2c10 { + status = "okay"; + //HSC -+ adm1278 at 40 { ++ adm1278@40 { + compatible = "adi,adm1278"; + reg = <0x40>; + }; @@ -157,7 +157,7 @@ index 0000000..46a285a +&i2c11 { + status = "okay"; + //MEZZ_TEMP_SENSOR -+ tmp421 at 1f { ++ tmp421@1f { + compatible = "ti,tmp421"; + reg = <0x1f>; + }; @@ -166,7 +166,7 @@ index 0000000..46a285a +&i2c12 { + status = "okay"; + //MEZZ_FRU -+ eeprom at 51 { ++ eeprom@51 { + compatible = "atmel,24c64"; + reg = <0x51>; + pagesize = <32>; @@ -178,11 +178,11 @@ index 0000000..46a285a + //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 dade940..661520c 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,12 @@ "From\0manikandan-e <manikandan.hcl.ers.epl@gmail.com>\0" "Subject\0[PATCH] ARM: dts: aspeed: Adding Facebook Yosemite V2 BMC\0" "Date\0Mon, 18 Nov 2019 18:07:07 +0530\0" - "To\0linux-aspeed@lists.ozlabs.org\0" + "To\0joel@jms.id.au" + " andrew@aj.id.au\0" + "Cc\0linux-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" @@ -43,7 +48,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" @@ -59,7 +64,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" @@ -70,7 +75,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" @@ -130,7 +135,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" @@ -139,13 +144,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" @@ -154,7 +159,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" @@ -163,7 +168,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" @@ -172,7 +177,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" @@ -184,11 +189,11 @@ "+ //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" @@ -196,4 +201,4 @@ "-- \n" 2.7.4 -7388ada2c9db797530754f27b4024e2433732ff2d9d04ab6dccb8dabbad2db2c +a04c802e450b08bee411d6d9014e10601061df54a5c3a6297fb7ac373719a97b
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.