diff for duplicates of <20210329150020.13632-2-eajames@linux.ibm.com> diff --git a/a/1.txt b/N1/1.txt index 61b6f7a..78f0ec1 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -14,7 +14,7 @@ diff --git a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts b/arch/arm/boot/dts/as index 6c9804d2f3b4..e775ad026d8b 100644 --- a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts +++ b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts -@@ -131,6 +131,38 @@ i2c2mux3: i2c at 3 { +@@ -131,6 +131,38 @@ i2c2mux3: i2c@3 { reg = <3>; }; }; @@ -53,11 +53,11 @@ index 6c9804d2f3b4..e775ad026d8b 100644 }; &ehci1 { -@@ -849,6 +881,56 @@ ibm-panel at 62 { +@@ -849,6 +881,56 @@ ibm-panel@62 { reg = <(0x62 | I2C_OWN_SLAVE_ADDRESS)>; }; -+ pca_oppanel: pca9551 at 60 { ++ pca_oppanel: pca9551@60 { + compatible = "nxp,pca9551"; + reg = <0x60>; + #address-cells = <1>; @@ -66,48 +66,48 @@ index 6c9804d2f3b4..e775ad026d8b 100644 + gpio-controller; + #gpio-cells = <2>; + -+ gpio at 0 { ++ gpio@0 { + reg = <0>; + type = <PCA955X_TYPE_GPIO>; + }; + -+ gpio at 1 { ++ gpio@1 { + reg = <1>; + type = <PCA955X_TYPE_GPIO>; + }; + -+ gpio at 2 { ++ gpio@2 { + reg = <2>; + type = <PCA955X_TYPE_GPIO>; + }; + -+ gpio at 3 { ++ gpio@3 { + reg = <3>; + type = <PCA955X_TYPE_GPIO>; + }; + -+ gpio at 4 { ++ gpio@4 { + reg = <4>; + type = <PCA955X_TYPE_GPIO>; + }; + -+ gpio at 5 { ++ gpio@5 { + reg = <5>; + type = <PCA955X_TYPE_GPIO>; + }; + -+ gpio at 6 { ++ gpio@6 { + reg = <6>; + type = <PCA955X_TYPE_GPIO>; + }; + -+ gpio at 7 { ++ gpio@7 { + reg = <7>; + type = <PCA955X_TYPE_GPIO>; + }; + }; + - dps: dps310 at 76 { + dps: dps310@76 { compatible = "infineon,dps310"; reg = <0x76>; -- diff --git a/a/content_digest b/N1/content_digest index 9b90986..f954bfb 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,13 @@ "From\0Eddie James <eajames@linux.ibm.com>\0" "Subject\0[PATCH 01/22] ARM: dts: aspeed: rainier: Add Operator Panel LEDs\0" "Date\0Mon, 29 Mar 2021 09:59:59 -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 + Vishwanatha Subbanna <vishwa@linux.ibm.com> + " Eddie James <eajames@linux.ibm.com>\0" "\00:1\0" "b\0" "From: Vishwanatha Subbanna <vishwa@linux.ibm.com>\n" @@ -21,7 +27,7 @@ "index 6c9804d2f3b4..e775ad026d8b 100644\n" "--- a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts\n" "+++ b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts\n" - "@@ -131,6 +131,38 @@ i2c2mux3: i2c at 3 {\n" + "@@ -131,6 +131,38 @@ i2c2mux3: i2c@3 {\n" " \t\t\treg = <3>;\n" " \t\t};\n" " \t};\n" @@ -60,11 +66,11 @@ " };\n" " \n" " &ehci1 {\n" - "@@ -849,6 +881,56 @@ ibm-panel at 62 {\n" + "@@ -849,6 +881,56 @@ ibm-panel@62 {\n" " \t\treg = <(0x62 | I2C_OWN_SLAVE_ADDRESS)>;\n" " \t};\n" " \n" - "+\tpca_oppanel: pca9551 at 60 {\n" + "+\tpca_oppanel: pca9551@60 {\n" "+\t\tcompatible = \"nxp,pca9551\";\n" "+\t\treg = <0x60>;\n" "+\t\t#address-cells = <1>;\n" @@ -73,51 +79,51 @@ "+\t\tgpio-controller;\n" "+\t\t#gpio-cells = <2>;\n" "+\n" - "+\t\tgpio at 0 {\n" + "+\t\tgpio@0 {\n" "+\t\t\treg = <0>;\n" "+\t\t\ttype = <PCA955X_TYPE_GPIO>;\n" "+\t\t};\n" "+\n" - "+\t\tgpio at 1 {\n" + "+\t\tgpio@1 {\n" "+\t\t\treg = <1>;\n" "+\t\t\ttype = <PCA955X_TYPE_GPIO>;\n" "+\t\t};\n" "+\n" - "+\t\tgpio at 2 {\n" + "+\t\tgpio@2 {\n" "+\t\t\treg = <2>;\n" "+\t\t\ttype = <PCA955X_TYPE_GPIO>;\n" "+\t\t};\n" "+\n" - "+\t\tgpio at 3 {\n" + "+\t\tgpio@3 {\n" "+\t\t\treg = <3>;\n" "+\t\t\ttype = <PCA955X_TYPE_GPIO>;\n" "+\t\t};\n" "+\n" - "+\t\tgpio at 4 {\n" + "+\t\tgpio@4 {\n" "+\t\t\treg = <4>;\n" "+\t\t\ttype = <PCA955X_TYPE_GPIO>;\n" "+\t\t};\n" "+\n" - "+\t\tgpio at 5 {\n" + "+\t\tgpio@5 {\n" "+\t\t\treg = <5>;\n" "+\t\t\ttype = <PCA955X_TYPE_GPIO>;\n" "+\t\t};\n" "+\n" - "+\t\tgpio at 6 {\n" + "+\t\tgpio@6 {\n" "+\t\t\treg = <6>;\n" "+\t\t\ttype = <PCA955X_TYPE_GPIO>;\n" "+\t\t};\n" "+\n" - "+\t\tgpio at 7 {\n" + "+\t\tgpio@7 {\n" "+\t\t\treg = <7>;\n" "+\t\t\ttype = <PCA955X_TYPE_GPIO>;\n" "+\t\t};\n" "+\t};\n" "+\n" - " \tdps: dps310 at 76 {\n" + " \tdps: dps310@76 {\n" " \t\tcompatible = \"infineon,dps310\";\n" " \t\treg = <0x76>;\n" "-- \n" 2.27.0 -6bf92d188ce1e6d3c9d8c6a98fe5ad5a0671d429d3ea9eb6c1365f3b5806a1cc +e88afcdf50b07eef02e9488c43fd0a0a6f21e436e44c382287e203c5bd577e91
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.