diff for duplicates of <20210329150020.13632-14-eajames@linux.ibm.com> diff --git a/a/1.txt b/N1/1.txt index df1b5e7..ddfae93 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -29,20 +29,20 @@ index ab7be4d511a5..cc45608b0cbc 100644 serial4 = &uart5; -@@ -457,6 +458,68 @@ eeprom at 50 { +@@ -457,6 +458,68 @@ eeprom@50 { reg = <0x50>; }; }; + -+ i2c14mux0chn3: i2c at 3 { ++ i2c14mux0chn3: i2c@3 { + #address-cells = <1>; + #size-cells = <0>; + reg = <3>; -+ max31785 at 52 { ++ max31785@52 { + compatible = "maxim,max31785a"; + reg = <0x52>; + -+ fan at 0 { ++ fan@0 { + compatible = "pmbus-fan"; + reg = <0>; + tach-pulses = <2>; @@ -55,7 +55,7 @@ index ab7be4d511a5..cc45608b0cbc 100644 + maxim,fan-fault-pin-mon; + }; + -+ fan at 1 { ++ fan@1 { + compatible = "pmbus-fan"; + reg = <1>; + tach-pulses = <2>; @@ -68,7 +68,7 @@ index ab7be4d511a5..cc45608b0cbc 100644 + maxim,fan-fault-pin-mon; + }; + -+ fan at 2 { ++ fan@2 { + compatible = "pmbus-fan"; + reg = <2>; + tach-pulses = <2>; @@ -81,7 +81,7 @@ index ab7be4d511a5..cc45608b0cbc 100644 + maxim,fan-fault-pin-mon; + }; + -+ fan at 3 { ++ fan@3 { + compatible = "pmbus-fan"; + reg = <3>; + tach-pulses = <2>; @@ -97,6 +97,6 @@ index ab7be4d511a5..cc45608b0cbc 100644 + }; }; - i2c-switch at 71 { + i2c-switch@71 { -- 2.27.0 diff --git a/a/content_digest b/N1/content_digest index 426cdce..628ea36 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,13 @@ "From\0Eddie James <eajames@linux.ibm.com>\0" "Subject\0[PATCH 13/22] ARM: dts: Aspeed: Everest: Add max31785 fan controller device\0" "Date\0Mon, 29 Mar 2021 10:00:11 -0500\0" - "To\0linux-aspeed@lists.ozlabs.org\0" + "To\0joel@jms.id.au\0" + "Cc\0andrew@aj.id.au" + robh+dt@kernel.org + devicetree@vger.kernel.org + linux-aspeed@lists.ozlabs.org + Matthew Barth <msbarth@us.ibm.com> + " Eddie James <eajames@linux.ibm.com>\0" "\00:1\0" "b\0" "From: Matthew Barth <msbarth@us.ibm.com>\n" @@ -36,20 +42,20 @@ " \n" " \t\tserial4 = &uart5;\n" " \n" - "@@ -457,6 +458,68 @@ eeprom at 50 {\n" + "@@ -457,6 +458,68 @@ eeprom@50 {\n" " \t\t\t\treg = <0x50>;\n" " \t\t\t};\n" " \t\t};\n" "+\n" - "+\t\ti2c14mux0chn3: i2c at 3 {\n" + "+\t\ti2c14mux0chn3: i2c@3 {\n" "+\t\t\t#address-cells = <1>;\n" "+\t\t\t#size-cells = <0>;\n" "+\t\t\treg = <3>;\n" - "+\t\t\tmax31785 at 52 {\n" + "+\t\t\tmax31785@52 {\n" "+\t\t\t\tcompatible = \"maxim,max31785a\";\n" "+\t\t\t\treg = <0x52>;\n" "+\n" - "+\t\t\t\tfan at 0 {\n" + "+\t\t\t\tfan@0 {\n" "+\t\t\t\t\tcompatible = \"pmbus-fan\";\n" "+\t\t\t\t\treg = <0>;\n" "+\t\t\t\t\ttach-pulses = <2>;\n" @@ -62,7 +68,7 @@ "+\t\t\t\t\tmaxim,fan-fault-pin-mon;\n" "+\t\t\t\t};\n" "+\n" - "+\t\t\t\tfan at 1 {\n" + "+\t\t\t\tfan@1 {\n" "+\t\t\t\t\tcompatible = \"pmbus-fan\";\n" "+\t\t\t\t\treg = <1>;\n" "+\t\t\t\t\ttach-pulses = <2>;\n" @@ -75,7 +81,7 @@ "+\t\t\t\t\tmaxim,fan-fault-pin-mon;\n" "+\t\t\t\t};\n" "+\n" - "+\t\t\t\tfan at 2 {\n" + "+\t\t\t\tfan@2 {\n" "+\t\t\t\t\tcompatible = \"pmbus-fan\";\n" "+\t\t\t\t\treg = <2>;\n" "+\t\t\t\t\ttach-pulses = <2>;\n" @@ -88,7 +94,7 @@ "+\t\t\t\t\tmaxim,fan-fault-pin-mon;\n" "+\t\t\t\t};\n" "+\n" - "+\t\t\t\tfan at 3 {\n" + "+\t\t\t\tfan@3 {\n" "+\t\t\t\t\tcompatible = \"pmbus-fan\";\n" "+\t\t\t\t\treg = <3>;\n" "+\t\t\t\t\ttach-pulses = <2>;\n" @@ -104,8 +110,8 @@ "+\t\t};\n" " \t};\n" " \n" - " \ti2c-switch at 71 {\n" + " \ti2c-switch@71 {\n" "-- \n" 2.27.0 -d6e014464912d3ddd297094443fada78d37294564156524f4485d57bba6aea6a +e3b8537bcc48a89abd86b05f3f6f556ca748298057f84414a7565767a596d2f8
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.