diff for duplicates of <20200908200101.64974-6-eajames@linux.ibm.com> diff --git a/a/1.txt b/N1/1.txt index 89b4ca7..e8cc729 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -19,24 +19,24 @@ index b94421f6cbd5..50d528444f5d 100644 #include <dt-bindings/leds/leds-pca955x.h> / { -@@ -698,6 +699,7 @@ eeprom at 53 { +@@ -698,6 +699,7 @@ eeprom@53 { }; &i2c7 { + multi-master; status = "okay"; - si7021-a20 at 20 { -@@ -831,6 +833,11 @@ gpio at 15 { + si7021-a20@20 { +@@ -831,6 +833,11 @@ gpio@15 { }; }; -+ ibm-panel at 62 { ++ ibm-panel@62 { + compatible = "ibm,op-panel"; + reg = <(0x62 | 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 ec5006b..a3dbc0b 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,20 @@ "From\0Eddie James <eajames@linux.ibm.com>\0" "Subject\0[PATCH v2 5/5] ARM: dts: Aspeed: Rainier: Add IBM Operation Panel I2C device\0" "Date\0Tue, 8 Sep 2020 15:01:01 -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 + wsa@kernel.org + rentao.bupt@gmail.com + " ryan_chen@aspeedtech.com\0" "\00:1\0" "b\0" "Set I2C bus 7 to multi-master mode and add the panel device that will\n" @@ -26,27 +39,27 @@ " #include <dt-bindings/leds/leds-pca955x.h>\n" " \n" " / {\n" - "@@ -698,6 +699,7 @@ eeprom at 53 {\n" + "@@ -698,6 +699,7 @@ eeprom@53 {\n" " };\n" " \n" " &i2c7 {\n" "+\tmulti-master;\n" " \tstatus = \"okay\";\n" " \n" - " \tsi7021-a20 at 20 {\n" - "@@ -831,6 +833,11 @@ gpio at 15 {\n" + " \tsi7021-a20@20 {\n" + "@@ -831,6 +833,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 = <(0x62 | 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 -d3d8749a10f289edceaa51ba580a962abe4b73ebae6b72abf56e6887ddb3c1e8 +6414df414afa4d41f943c83df824b558b41ecd2e78b7e58caadecbd57fdeacaa
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.