diff for duplicates of <20200820161152.22751-6-eajames@linux.ibm.com> diff --git a/a/1.txt b/N1/1.txt index 0e9253f..d0edbe9 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -10,24 +10,24 @@ diff --git a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts b/arch/arm/boot/dts/as index b94421f6cbd5..f121f3c26a3a 100644 --- a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts +++ b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts -@@ -698,6 +698,7 @@ eeprom at 53 { +@@ -698,6 +698,7 @@ eeprom@53 { }; &i2c7 { + multi-master; status = "okay"; - si7021-a20 at 20 { -@@ -831,6 +832,11 @@ gpio at 15 { + si7021-a20@20 { +@@ -831,6 +832,11 @@ gpio@15 { }; }; -+ ibm-panel at 62 { ++ ibm-panel@62 { + compatible = "ibm,op-panel"; + reg = <0x40000062>; /* I2C_OWN_SLAVE_ADDRESS */ + }; + - dps: dps310 at 76 { + dps: dps310@76 { compatible = "infineon,dps310"; reg = <0x76>; -- diff --git a/a/content_digest b/N1/content_digest index de02a6a..a66eca9 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,18 @@ "From\0Eddie James <eajames@linux.ibm.com>\0" "Subject\0[PATCH 5/5] ARM: dts: Aspeed: Rainier: Add IBM Operation Panel I2C device\0" "Date\0Thu, 20 Aug 2020 11:11:52 -0500\0" - "To\0linux-aspeed@lists.ozlabs.org\0" + "To\0linux-input@vger.kernel.org\0" + "Cc\0devicetree@vger.kernel.org" + linux-kernel@vger.kernel.org + linux-aspeed@lists.ozlabs.org + linux-i2c@vger.kernel.org + joel@jms.id.au + andrew@aj.id.au + benh@kernel.crashing.org + brendanhiggins@google.com + dmitry.torokhov@gmail.com + robh+dt@kernel.org + " eajames@linux.ibm.com\0" "\00:1\0" "b\0" "Set I2C bus 7 to multi-master mode and add the panel device that will\n" @@ -17,27 +28,27 @@ "index b94421f6cbd5..f121f3c26a3a 100644\n" "--- a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts\n" "+++ b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts\n" - "@@ -698,6 +698,7 @@ eeprom at 53 {\n" + "@@ -698,6 +698,7 @@ eeprom@53 {\n" " };\n" " \n" " &i2c7 {\n" "+\tmulti-master;\n" " \tstatus = \"okay\";\n" " \n" - " \tsi7021-a20 at 20 {\n" - "@@ -831,6 +832,11 @@ gpio at 15 {\n" + " \tsi7021-a20@20 {\n" + "@@ -831,6 +832,11 @@ gpio@15 {\n" " \t\t};\n" " \t};\n" " \n" - "+\tibm-panel at 62 {\n" + "+\tibm-panel@62 {\n" "+\t\tcompatible = \"ibm,op-panel\";\n" "+\t\treg = <0x40000062>;\t/* I2C_OWN_SLAVE_ADDRESS */\n" "+\t};\n" "+\n" - " \tdps: dps310 at 76 {\n" + " \tdps: dps310@76 {\n" " \t\tcompatible = \"infineon,dps310\";\n" " \t\treg = <0x76>;\n" "-- \n" 2.26.2 -256b1e6d45226a31b3e91eaa7999e9fbf1158ff6c61caac046a9edafa2b50ce1 +ae0728c83a82c5ac447075ae65a61baedfb071bd5684f367b0563219e8632537
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.