diff for duplicates of <20210329150020.13632-10-eajames@linux.ibm.com> diff --git a/a/1.txt b/N1/1.txt index 6dc617d..ecee492 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -13,12 +13,12 @@ diff --git a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts b/arch/arm/boot/dts/as index 78238ffc8997..1d66dc995797 100644 --- a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts +++ b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts -@@ -1538,20 +1538,64 @@ eeprom at 51 { +@@ -1538,20 +1538,64 @@ eeprom@51 { reg = <0x51>; }; -- tca9554 at 40 { -+ tca_pres1: tca9554 at 20{ +- tca9554@40 { ++ tca_pres1: tca9554@20{ compatible = "ti,tca9554"; - reg = <0x40>; + reg = <0x20>; @@ -42,43 +42,43 @@ index 78238ffc8997..1d66dc995797 100644 + "DASD_BP1_PRESENT_N", + "DASD_BP0_PRESENT_N"; + -+ 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>; + }; @@ -86,12 +86,12 @@ index 78238ffc8997..1d66dc995797 100644 }; &i2c1 { -@@ -1574,6 +1618,104 @@ power-supply at 69 { +@@ -1574,6 +1618,104 @@ power-supply@69 { compatible = "ibm,cffps"; reg = <0x69>; }; + -+ pca_pres1: pca9552 at 61 { ++ pca_pres1: pca9552@61 { + compatible = "nxp,pca9552"; + reg = <0x61>; + #address-cells = <1>; @@ -108,82 +108,82 @@ index 78238ffc8997..1d66dc995797 100644 + "SLOT3_EXPANDER_PRSNT_N", "SLOT4_EXPANDER_PRSNT_N", + "", "", "", "", "", ""; + -+ 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>; + }; + -+ gpio at 8 { ++ gpio@8 { + reg = <8>; + type = <PCA955X_TYPE_GPIO>; + }; + -+ gpio at 9 { ++ gpio@9 { + reg = <9>; + type = <PCA955X_TYPE_GPIO>; + }; + -+ gpio at 10 { ++ gpio@10 { + reg = <10>; + type = <PCA955X_TYPE_GPIO>; + }; + -+ gpio at 11 { ++ gpio@11 { + reg = <11>; + type = <PCA955X_TYPE_GPIO>; + }; + -+ gpio at 12 { ++ gpio@12 { + reg = <12>; + type = <PCA955X_TYPE_GPIO>; + }; + -+ gpio at 13 { ++ gpio@13 { + reg = <13>; + type = <PCA955X_TYPE_GPIO>; + }; + -+ gpio at 14 { ++ gpio@14 { + reg = <14>; + type = <PCA955X_TYPE_GPIO>; + }; + -+ gpio at 15 { ++ gpio@15 { + reg = <15>; + type = <PCA955X_TYPE_GPIO>; + }; @@ -191,16 +191,16 @@ index 78238ffc8997..1d66dc995797 100644 }; &i2c4 { -@@ -2423,7 +2565,7 @@ eeprom at 51 { +@@ -2423,7 +2565,7 @@ eeprom@51 { reg = <0x51>; }; -- pca1: pca9552 at 61 { -+ pca_pres3: pca9552 at 61 { +- pca1: pca9552@61 { ++ pca_pres3: pca9552@61 { compatible = "nxp,pca9552"; reg = <0x61>; #address-cells = <1>; -@@ -2431,6 +2573,15 @@ pca1: pca9552 at 61 { +@@ -2431,6 +2573,15 @@ pca1: pca9552@61 { gpio-controller; #gpio-cells = <2>; @@ -213,7 +213,7 @@ index 78238ffc8997..1d66dc995797 100644 + "SLOT10_EXPANDER_PRSNT_N", "SLOT11_EXPANDER_PRSNT_N", + "", "", "", ""; + - gpio at 0 { + gpio@0 { reg = <0>; type = <PCA955X_TYPE_GPIO>; -- diff --git a/a/content_digest b/N1/content_digest index 64c5ff0..494132b 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,13 @@ "From\0Eddie James <eajames@linux.ibm.com>\0" "Subject\0[PATCH 09/22] ARM: dts: aspeed: rainier: Add presence GPIOs\0" "Date\0Mon, 29 Mar 2021 10:00:07 -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 + Alpana Kumari <alpankum@in.ibm.com> + " Eddie James <eajames@linux.ibm.com>\0" "\00:1\0" "b\0" "From: Alpana Kumari <alpankum@in.ibm.com>\n" @@ -20,12 +26,12 @@ "index 78238ffc8997..1d66dc995797 100644\n" "--- a/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts\n" "+++ b/arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts\n" - "@@ -1538,20 +1538,64 @@ eeprom at 51 {\n" + "@@ -1538,20 +1538,64 @@ eeprom@51 {\n" " \t\treg = <0x51>;\n" " \t};\n" " \n" - "-\ttca9554 at 40 {\n" - "+\ttca_pres1: tca9554 at 20{\n" + "-\ttca9554@40 {\n" + "+\ttca_pres1: tca9554@20{\n" " \t\tcompatible = \"ti,tca9554\";\n" "-\t\treg = <0x40>;\n" "+\t\treg = <0x20>;\n" @@ -49,43 +55,43 @@ "+\t\t\t\"DASD_BP1_PRESENT_N\",\n" "+\t\t\t\"DASD_BP0_PRESENT_N\";\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" "-\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" @@ -93,12 +99,12 @@ " };\n" " \n" " &i2c1 {\n" - "@@ -1574,6 +1618,104 @@ power-supply at 69 {\n" + "@@ -1574,6 +1618,104 @@ power-supply@69 {\n" " \t\tcompatible = \"ibm,cffps\";\n" " \t\treg = <0x69>;\n" " \t};\n" "+\n" - "+\tpca_pres1: pca9552 at 61 {\n" + "+\tpca_pres1: pca9552@61 {\n" "+\t\tcompatible = \"nxp,pca9552\";\n" "+\t\treg = <0x61>;\n" "+\t\t#address-cells = <1>;\n" @@ -115,82 +121,82 @@ "+\t\t\t\"SLOT3_EXPANDER_PRSNT_N\", \"SLOT4_EXPANDER_PRSNT_N\",\n" "+\t\t\t\"\", \"\", \"\", \"\", \"\", \"\";\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" "+\n" - "+\t\tgpio at 8 {\n" + "+\t\tgpio@8 {\n" "+\t\t\treg = <8>;\n" "+\t\t\ttype = <PCA955X_TYPE_GPIO>;\n" "+\t\t};\n" "+\n" - "+\t\tgpio at 9 {\n" + "+\t\tgpio@9 {\n" "+\t\t\treg = <9>;\n" "+\t\t\ttype = <PCA955X_TYPE_GPIO>;\n" "+\t\t};\n" "+\n" - "+\t\tgpio at 10 {\n" + "+\t\tgpio@10 {\n" "+\t\t\treg = <10>;\n" "+\t\t\ttype = <PCA955X_TYPE_GPIO>;\n" "+\t\t};\n" "+\n" - "+\t\tgpio at 11 {\n" + "+\t\tgpio@11 {\n" "+\t\t\treg = <11>;\n" "+\t\t\ttype = <PCA955X_TYPE_GPIO>;\n" "+\t\t};\n" "+\n" - "+\t\tgpio at 12 {\n" + "+\t\tgpio@12 {\n" "+\t\t\treg = <12>;\n" "+\t\t\ttype = <PCA955X_TYPE_GPIO>;\n" "+\t\t};\n" "+\n" - "+\t\tgpio at 13 {\n" + "+\t\tgpio@13 {\n" "+\t\t\treg = <13>;\n" "+\t\t\ttype = <PCA955X_TYPE_GPIO>;\n" "+\t\t};\n" "+\n" - "+\t\tgpio at 14 {\n" + "+\t\tgpio@14 {\n" "+\t\t\treg = <14>;\n" "+\t\t\ttype = <PCA955X_TYPE_GPIO>;\n" "+\t\t};\n" "+\n" - "+\t\tgpio at 15 {\n" + "+\t\tgpio@15 {\n" "+\t\t\treg = <15>;\n" "+\t\t\ttype = <PCA955X_TYPE_GPIO>;\n" "+\t\t};\n" @@ -198,16 +204,16 @@ " };\n" " \n" " &i2c4 {\n" - "@@ -2423,7 +2565,7 @@ eeprom at 51 {\n" + "@@ -2423,7 +2565,7 @@ eeprom@51 {\n" " \t\treg = <0x51>;\n" " \t};\n" " \n" - "-\tpca1: pca9552 at 61 {\n" - "+\tpca_pres3: pca9552 at 61 {\n" + "-\tpca1: pca9552@61 {\n" + "+\tpca_pres3: pca9552@61 {\n" " \t\tcompatible = \"nxp,pca9552\";\n" " \t\treg = <0x61>;\n" " \t\t#address-cells = <1>;\n" - "@@ -2431,6 +2573,15 @@ pca1: pca9552 at 61 {\n" + "@@ -2431,6 +2573,15 @@ pca1: pca9552@61 {\n" " \t\tgpio-controller;\n" " \t\t#gpio-cells = <2>;\n" " \n" @@ -220,10 +226,10 @@ "+\t\t\t\"SLOT10_EXPANDER_PRSNT_N\", \"SLOT11_EXPANDER_PRSNT_N\",\n" "+\t\t\t\"\", \"\", \"\", \"\";\n" "+\n" - " \t\tgpio at 0 {\n" + " \t\tgpio@0 {\n" " \t\t\treg = <0>;\n" " \t\t\ttype = <PCA955X_TYPE_GPIO>;\n" "-- \n" 2.27.0 -9f0f8631da09ddaae56823e10662323dcfc6269e1d8f968943c6510e45a601e5 +5837fe95c58b5b1e49d03dc581739b5c91e1a577f0181aa5535f6b1dcb683a03
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.