diff for duplicates of <20240731214737.986010-2-ninad@linux.ibm.com> diff --git a/a/1.txt b/N1/1.txt index e2f475f..1fd7df7 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -9,7 +9,7 @@ diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-system1.dts b/arch/arm/boot index f3efecc7eb8d0..f96b299d743ba 100644 --- a/arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-system1.dts +++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-system1.dts -@@ -764,17 +764,113 @@ regulator at 43 { +@@ -764,17 +764,113 @@ regulator@43 { }; }; @@ -17,13 +17,13 @@ index f3efecc7eb8d0..f96b299d743ba 100644 &i2c6 { status = "okay"; - fan-controller at 52 { + fan-controller@52 { compatible = "maxim,max31785a"; reg = <0x52>; + #address-cells = <1>; + #size-cells = <0>; + -+ fan0: fan at 0 { ++ fan0: fan@0 { + compatible = "pmbus-fan"; + reg = <0>; + tach-pulses = <2>; @@ -36,7 +36,7 @@ index f3efecc7eb8d0..f96b299d743ba 100644 + maxim,fan-fault-pin-mon; + }; + -+ fan1: fan at 1 { ++ fan1: fan@1 { + compatible = "pmbus-fan"; + reg = <1>; + tach-pulses = <2>; @@ -49,7 +49,7 @@ index f3efecc7eb8d0..f96b299d743ba 100644 + maxim,fan-fault-pin-mon; + }; + -+ fan2: fan at 2 { ++ fan2: fan@2 { + compatible = "pmbus-fan"; + reg = <2>; + tach-pulses = <2>; @@ -62,7 +62,7 @@ index f3efecc7eb8d0..f96b299d743ba 100644 + maxim,fan-fault-pin-mon; + }; + -+ fan3: fan at 3 { ++ fan3: fan@3 { + compatible = "pmbus-fan"; + reg = <3>; + tach-pulses = <2>; @@ -75,7 +75,7 @@ index f3efecc7eb8d0..f96b299d743ba 100644 + maxim,fan-fault-pin-mon; + }; + -+ fan4: fan at 4 { ++ fan4: fan@4 { + compatible = "pmbus-fan"; + reg = <4>; + tach-pulses = <2>; @@ -89,13 +89,13 @@ index f3efecc7eb8d0..f96b299d743ba 100644 + }; }; - fan-controller at 54 { + fan-controller@54 { compatible = "maxim,max31785a"; reg = <0x54>; + #address-cells = <1>; + #size-cells = <0>; + -+ fan5: fan at 0 { ++ fan5: fan@0 { + compatible = "pmbus-fan"; + reg = <0>; + tach-pulses = <2>; @@ -108,7 +108,7 @@ index f3efecc7eb8d0..f96b299d743ba 100644 + maxim,fan-fault-pin-mon; + }; + -+ fan6: fan at 1 { ++ fan6: fan@1 { + compatible = "pmbus-fan"; + reg = <1>; + tach-pulses = <2>; @@ -122,6 +122,6 @@ index f3efecc7eb8d0..f96b299d743ba 100644 + }; }; - eeprom at 55 { + eeprom@55 { -- 2.43.0 diff --git a/a/content_digest b/N1/content_digest index a4c7149..ea94284 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,17 @@ "From\0Ninad Palsule <ninad@linux.ibm.com>\0" "Subject\0[PATCH v1 1/1] ARM: dts: aspeed: system1: IBM System1 BMC update\0" "Date\0Wed, 31 Jul 2024 16:47:29 -0500\0" - "To\0linux-aspeed@lists.ozlabs.org\0" + "To\0robh+dt@kernel.org" + krzysztof.kozlowski+dt@linaro.org + conor+dt@kernel.org + joel@jms.id.au + andrew@codeconstruct.com.au + devicetree@vger.kernel.org + linux-arm-kernel@lists.infradead.org + linux-aspeed@lists.ozlabs.org + linux-kernel@vger.kernel.org + " eajames@linux.ibm.com\0" + "Cc\0Ninad Palsule <ninad@linux.ibm.com>\0" "\00:1\0" "b\0" "Updated MAX31785a pmbus based fans in the device tree.\n" @@ -16,7 +26,7 @@ "index f3efecc7eb8d0..f96b299d743ba 100644\n" "--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-system1.dts\n" "+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-system1.dts\n" - "@@ -764,17 +764,113 @@ regulator at 43 {\n" + "@@ -764,17 +764,113 @@ regulator@43 {\n" " \t};\n" " };\n" " \n" @@ -24,13 +34,13 @@ " &i2c6 {\n" " \tstatus = \"okay\";\n" " \n" - " \tfan-controller at 52 {\n" + " \tfan-controller@52 {\n" " \t\tcompatible = \"maxim,max31785a\";\n" " \t\treg = <0x52>;\n" "+\t\t#address-cells = <1>;\n" "+\t\t#size-cells = <0>;\n" "+\n" - "+\t\tfan0: fan at 0 {\n" + "+\t\tfan0: fan@0 {\n" "+\t\t\tcompatible = \"pmbus-fan\";\n" "+\t\t\treg = <0>;\n" "+\t\t\ttach-pulses = <2>;\n" @@ -43,7 +53,7 @@ "+\t\t\tmaxim,fan-fault-pin-mon;\n" "+\t\t};\n" "+\n" - "+\t\tfan1: fan at 1 {\n" + "+\t\tfan1: fan@1 {\n" "+\t\t\tcompatible = \"pmbus-fan\";\n" "+\t\t\treg = <1>;\n" "+\t\t\ttach-pulses = <2>;\n" @@ -56,7 +66,7 @@ "+\t\t\tmaxim,fan-fault-pin-mon;\n" "+\t\t};\n" "+\n" - "+\t\tfan2: fan at 2 {\n" + "+\t\tfan2: fan@2 {\n" "+\t\t\tcompatible = \"pmbus-fan\";\n" "+\t\t\treg = <2>;\n" "+\t\t\ttach-pulses = <2>;\n" @@ -69,7 +79,7 @@ "+\t\t\tmaxim,fan-fault-pin-mon;\n" "+\t\t};\n" "+\n" - "+\t\tfan3: fan at 3 {\n" + "+\t\tfan3: fan@3 {\n" "+\t\t\tcompatible = \"pmbus-fan\";\n" "+\t\t\treg = <3>;\n" "+\t\t\ttach-pulses = <2>;\n" @@ -82,7 +92,7 @@ "+\t\t\tmaxim,fan-fault-pin-mon;\n" "+\t\t};\n" "+\n" - "+\t\tfan4: fan at 4 {\n" + "+\t\tfan4: fan@4 {\n" "+\t\t\tcompatible = \"pmbus-fan\";\n" "+\t\t\treg = <4>;\n" "+\t\t\ttach-pulses = <2>;\n" @@ -96,13 +106,13 @@ "+\t\t};\n" " \t};\n" " \n" - " \tfan-controller at 54 {\n" + " \tfan-controller@54 {\n" " \t\tcompatible = \"maxim,max31785a\";\n" " \t\treg = <0x54>;\n" "+\t\t#address-cells = <1>;\n" "+\t\t#size-cells = <0>;\n" "+\n" - "+\t\tfan5: fan at 0 {\n" + "+\t\tfan5: fan@0 {\n" "+\t\t\tcompatible = \"pmbus-fan\";\n" "+\t\t\treg = <0>;\n" "+\t\t\ttach-pulses = <2>;\n" @@ -115,7 +125,7 @@ "+\t\t\tmaxim,fan-fault-pin-mon;\n" "+\t\t};\n" "+\n" - "+\t\tfan6: fan at 1 {\n" + "+\t\tfan6: fan@1 {\n" "+\t\t\tcompatible = \"pmbus-fan\";\n" "+\t\t\treg = <1>;\n" "+\t\t\ttach-pulses = <2>;\n" @@ -129,8 +139,8 @@ "+\t\t};\n" " \t};\n" " \n" - " \teeprom at 55 {\n" + " \teeprom@55 {\n" "-- \n" 2.43.0 -bac7be9768ba54e58a769c862526b364b35e0c5aa7235c2818a82792153b36bb +e1248a454e03f20c1d77d3b6e10bc1a32db3aca72898b3aaa54fc3cab2b61f29
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.