diff for duplicates of <20240910215929.823913-1-robh@kernel.org> diff --git a/a/1.txt b/N1/1.txt index 999da32..52aeccd 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -11,12 +11,12 @@ diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-quanta-s6q.dts b/arch/arm/boot/ index 983853eedaef..fd361cf073c2 100644 --- a/arch/arm/boot/dts/aspeed/aspeed-bmc-quanta-s6q.dts +++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-quanta-s6q.dts -@@ -381,7 +381,7 @@ SMB_IPMB_3V3AUX_SCL: i2c at 5 { +@@ -381,7 +381,7 @@ SMB_IPMB_3V3AUX_SCL: i2c@5 { #size-cells = <0>; reg = <5>; -- U190_fru at 51 { -+ eeprom at 51 { +- U190_fru@51 { ++ eeprom@51 { compatible = "atmel,24c128"; reg = <0x51>; pagesize = <32>; @@ -24,17 +24,17 @@ index 983853eedaef..fd361cf073c2 100644 status = "okay"; /* MB FRU (U173) @ 0xA2 */ -- mb_fru: mb_fru at 51 { -+ mb_fru: eeprom at 51 { +- mb_fru: mb_fru@51 { ++ mb_fru: eeprom@51 { compatible = "atmel,24c128"; reg = <0x51>; pagesize = <32>; -@@ -472,7 +472,7 @@ FP_U1_tmp75 at 4a { +@@ -472,7 +472,7 @@ FP_U1_tmp75@4a { reg = <0x4a>; }; -- FP_U4_fru at 52 { -+ eeprom at 52 { +- FP_U4_fru@52 { ++ eeprom@52 { compatible = "atmel,24c02"; reg = <0x52>; pagesize = <16>; @@ -42,8 +42,8 @@ index 983853eedaef..fd361cf073c2 100644 status = "okay"; /* SCM FRU (U19) @ 0xA2 */ -- scm_fru: scm_fru at 51 { -+ scm_fru: eeprom at 51 { +- scm_fru: scm_fru@51 { ++ scm_fru: eeprom@51 { compatible = "atmel,24c128"; reg = <0x51>; pagesize = <32>; @@ -51,30 +51,30 @@ diff --git a/arch/arm/boot/dts/aspeed/aspeed-bmc-vegman-rx20.dts b/arch/arm/boot index b8f0b08018a3..98f3e0437704 100644 --- a/arch/arm/boot/dts/aspeed/aspeed-bmc-vegman-rx20.dts +++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-vegman-rx20.dts -@@ -154,7 +154,7 @@ i2c at 7 { +@@ -154,7 +154,7 @@ i2c@7 { #address-cells = <1>; #size-cells = <0>; reg = <7>; -- at24 at 50 { -+ eeprom at 50 { +- at24@50 { ++ eeprom@50 { compatible = "atmel,24c64"; reg = <0x50>; pagesize = <32>; -@@ -196,7 +196,7 @@ i2c at 7 { +@@ -196,7 +196,7 @@ i2c@7 { #address-cells = <1>; #size-cells = <0>; reg = <7>; -- at24 at 50 { -+ eeprom at 50 { +- at24@50 { ++ eeprom@50 { compatible = "atmel,24c64"; reg = <0x50>; pagesize = <32>; -@@ -205,7 +205,7 @@ at24 at 50 { +@@ -205,7 +205,7 @@ at24@50 { }; }; }; -- at24 at 50 { -+ eeprom at 50 { +- at24@50 { ++ eeprom@50 { compatible = "atmel,24c64"; reg = <0x50>; pagesize = <32>; @@ -86,8 +86,8 @@ index 1a5b25b2ea29..16815eede710 100644 /* SMB_BMC_MGMT_LVC3 */ status = "okay"; -- at24 at 50 { -+ eeprom at 50 { +- at24@50 { ++ eeprom@50 { compatible = "atmel,24c64"; reg = <0x50>; pagesize = <32>; diff --git a/a/content_digest b/N1/content_digest index aec00fc..51f11dd 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,14 @@ "From\0Rob Herring (Arm) <robh@kernel.org>\0" "Subject\0[PATCH] ARM: dts: aspeed: Fix at24 EEPROM node names\0" "Date\0Tue, 10 Sep 2024 16:59:29 -0500\0" - "To\0linux-aspeed@lists.ozlabs.org\0" + "To\0Krzysztof Kozlowski <krzk+dt@kernel.org>" + Conor Dooley <conor+dt@kernel.org> + Joel Stanley <joel@jms.id.au> + " Andrew Jeffery <andrew@codeconstruct.com.au>\0" + "Cc\0devicetree@vger.kernel.org" + linux-arm-kernel@lists.infradead.org + linux-aspeed@lists.ozlabs.org + " linux-kernel@vger.kernel.org\0" "\00:1\0" "b\0" "at24.yaml defines the node name for at24 EEPROMs as 'eeprom'.\n" @@ -17,12 +24,12 @@ "index 983853eedaef..fd361cf073c2 100644\n" "--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-quanta-s6q.dts\n" "+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-quanta-s6q.dts\n" - "@@ -381,7 +381,7 @@ SMB_IPMB_3V3AUX_SCL: i2c at 5 {\n" + "@@ -381,7 +381,7 @@ SMB_IPMB_3V3AUX_SCL: i2c@5 {\n" " \t\t\t#size-cells = <0>;\n" " \t\t\treg = <5>;\n" " \n" - "-\t\t\tU190_fru at 51 {\n" - "+\t\t\teeprom at 51 {\n" + "-\t\t\tU190_fru@51 {\n" + "+\t\t\teeprom@51 {\n" " \t\t\t\tcompatible = \"atmel,24c128\";\n" " \t\t\t\treg = <0x51>;\n" " \t\t\t\tpagesize = <32>;\n" @@ -30,17 +37,17 @@ " \tstatus = \"okay\";\n" " \n" " \t/* MB FRU (U173) @ 0xA2 */\n" - "-\tmb_fru: mb_fru at 51 {\n" - "+\tmb_fru: eeprom at 51 {\n" + "-\tmb_fru: mb_fru@51 {\n" + "+\tmb_fru: eeprom@51 {\n" " \t\tcompatible = \"atmel,24c128\";\n" " \t\treg = <0x51>;\n" " \t\tpagesize = <32>;\n" - "@@ -472,7 +472,7 @@ FP_U1_tmp75 at 4a {\n" + "@@ -472,7 +472,7 @@ FP_U1_tmp75@4a {\n" " \t\treg = <0x4a>;\n" " \t};\n" " \n" - "-\tFP_U4_fru at 52 {\n" - "+\teeprom at 52 {\n" + "-\tFP_U4_fru@52 {\n" + "+\teeprom@52 {\n" " \t\tcompatible = \"atmel,24c02\";\n" " \t\treg = <0x52>;\n" " \t\tpagesize = <16>;\n" @@ -48,8 +55,8 @@ " \tstatus = \"okay\";\n" " \n" " \t/* SCM FRU (U19) @ 0xA2 */\n" - "-\tscm_fru: scm_fru at 51 {\n" - "+\tscm_fru: eeprom at 51 {\n" + "-\tscm_fru: scm_fru@51 {\n" + "+\tscm_fru: eeprom@51 {\n" " \t\tcompatible = \"atmel,24c128\";\n" " \t\treg = <0x51>;\n" " \t\tpagesize = <32>;\n" @@ -57,30 +64,30 @@ "index b8f0b08018a3..98f3e0437704 100644\n" "--- a/arch/arm/boot/dts/aspeed/aspeed-bmc-vegman-rx20.dts\n" "+++ b/arch/arm/boot/dts/aspeed/aspeed-bmc-vegman-rx20.dts\n" - "@@ -154,7 +154,7 @@ i2c at 7 {\n" + "@@ -154,7 +154,7 @@ i2c@7 {\n" " \t\t\t\t\t#address-cells = <1>;\n" " \t\t\t\t\t#size-cells = <0>;\n" " \t\t\t\t\treg = <7>;\n" - "-\t\t\t\t\tat24 at 50 {\n" - "+\t\t\t\t\teeprom at 50 {\n" + "-\t\t\t\t\tat24@50 {\n" + "+\t\t\t\t\teeprom@50 {\n" " \t\t\t\t\t\tcompatible = \"atmel,24c64\";\n" " \t\t\t\t\t\treg = <0x50>;\n" " \t\t\t\t\t\tpagesize = <32>;\n" - "@@ -196,7 +196,7 @@ i2c at 7 {\n" + "@@ -196,7 +196,7 @@ i2c@7 {\n" " \t\t\t\t\t#address-cells = <1>;\n" " \t\t\t\t\t#size-cells = <0>;\n" " \t\t\t\t\treg = <7>;\n" - "-\t\t\t\t\tat24 at 50 {\n" - "+\t\t\t\t\teeprom at 50 {\n" + "-\t\t\t\t\tat24@50 {\n" + "+\t\t\t\t\teeprom@50 {\n" " \t\t\t\t\t\tcompatible = \"atmel,24c64\";\n" " \t\t\t\t\t\treg = <0x50>;\n" " \t\t\t\t\t\tpagesize = <32>;\n" - "@@ -205,7 +205,7 @@ at24 at 50 {\n" + "@@ -205,7 +205,7 @@ at24@50 {\n" " \t\t\t\t\t};\n" " \t\t\t\t};\n" " \t\t\t};\n" - "-\t\t\tat24 at 50 {\n" - "+\t\t\teeprom at 50 {\n" + "-\t\t\tat24@50 {\n" + "+\t\t\teeprom@50 {\n" " \t\t\t\tcompatible = \"atmel,24c64\";\n" " \t\t\t\treg = <0x50>;\n" " \t\t\t\tpagesize = <32>;\n" @@ -92,12 +99,12 @@ " \t/* SMB_BMC_MGMT_LVC3 */\n" " \tstatus = \"okay\";\n" " \n" - "-\tat24 at 50 {\n" - "+\teeprom at 50 {\n" + "-\tat24@50 {\n" + "+\teeprom@50 {\n" " \t\tcompatible = \"atmel,24c64\";\n" " \t\treg = <0x50>;\n" " \t\tpagesize = <32>;\n" "-- \n" 2.45.2 -f379af694b20f4f50dc81191d3811a92a06d36be0842025a7fc7fb2aa9f8236b +f287b3f730ee9356f6331976e9cf0bc7bfbc772b816047465868263ed87b8d02
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.