diff for duplicates of <20210329150020.13632-16-eajames@linux.ibm.com> diff --git a/a/1.txt b/N1/1.txt index b9f83db..5379b95 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -13,7 +13,7 @@ diff --git a/arch/arm/boot/dts/aspeed-bmc-ibm-everest.dts b/arch/arm/boot/dts/as index de2606b416e6..d7f23b74dd4b 100644 --- a/arch/arm/boot/dts/aspeed-bmc-ibm-everest.dts +++ b/arch/arm/boot/dts/aspeed-bmc-ibm-everest.dts -@@ -171,6 +171,37 @@ vga_memory: region at bf000000 { +@@ -171,6 +171,37 @@ vga_memory: region@bf000000 { reg = <0xbf000000 0x01000000>; /* 16M */ }; }; @@ -51,12 +51,12 @@ index de2606b416e6..d7f23b74dd4b 100644 }; &i2c0 { -@@ -567,6 +598,103 @@ fan at 3 { +@@ -567,6 +598,103 @@ fan@3 { maxim,fan-fault-pin-mon; }; }; + -+ pca0: pca9552 at 61 { ++ pca0: pca9552@61 { + compatible = "nxp,pca9552"; + reg = <0x61>; + @@ -72,82 +72,82 @@ index de2606b416e6..d7f23b74dd4b 100644 + "presence-fan1", + "presence-fan0"; + -+ 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>; + }; diff --git a/a/content_digest b/N1/content_digest index 6348bd1..f7bb69b 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,13 @@ "From\0Eddie James <eajames@linux.ibm.com>\0" "Subject\0[PATCH 15/22] ARM: dts: Aspeed: Everest: Add pca9552 fan presence\0" "Date\0Mon, 29 Mar 2021 10:00:13 -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 + Matthew Barth <msbarth@us.ibm.com> + " Eddie James <eajames@linux.ibm.com>\0" "\00:1\0" "b\0" "From: Matthew Barth <msbarth@us.ibm.com>\n" @@ -20,7 +26,7 @@ "index de2606b416e6..d7f23b74dd4b 100644\n" "--- a/arch/arm/boot/dts/aspeed-bmc-ibm-everest.dts\n" "+++ b/arch/arm/boot/dts/aspeed-bmc-ibm-everest.dts\n" - "@@ -171,6 +171,37 @@ vga_memory: region at bf000000 {\n" + "@@ -171,6 +171,37 @@ vga_memory: region@bf000000 {\n" " \t\t\treg = <0xbf000000 0x01000000>; /* 16M */\n" " \t\t};\n" " \t};\n" @@ -58,12 +64,12 @@ " };\n" " \n" " &i2c0 {\n" - "@@ -567,6 +598,103 @@ fan at 3 {\n" + "@@ -567,6 +598,103 @@ fan@3 {\n" " \t\t\t\t\tmaxim,fan-fault-pin-mon;\n" " \t\t\t\t};\n" " \t\t\t};\n" "+\n" - "+\t\t\tpca0: pca9552 at 61 {\n" + "+\t\t\tpca0: pca9552@61 {\n" "+\t\t\t\tcompatible = \"nxp,pca9552\";\n" "+\t\t\t\treg = <0x61>;\n" "+\n" @@ -79,82 +85,82 @@ "+\t\t\t\t\t\"presence-fan1\",\n" "+\t\t\t\t\t\"presence-fan0\";\n" "+\n" - "+\t\t\t\tgpio at 0 {\n" + "+\t\t\t\tgpio@0 {\n" "+\t\t\t\t\treg = <0>;\n" "+\t\t\t\t\ttype = <PCA955X_TYPE_GPIO>;\n" "+\t\t\t\t};\n" "+\n" - "+\t\t\t\tgpio at 1 {\n" + "+\t\t\t\tgpio@1 {\n" "+\t\t\t\t\treg = <1>;\n" "+\t\t\t\t\ttype = <PCA955X_TYPE_GPIO>;\n" "+\t\t\t\t};\n" "+\n" - "+\t\t\t\tgpio at 2 {\n" + "+\t\t\t\tgpio@2 {\n" "+\t\t\t\t\treg = <2>;\n" "+\t\t\t\t\ttype = <PCA955X_TYPE_GPIO>;\n" "+\t\t\t\t};\n" "+\n" - "+\t\t\t\tgpio at 3 {\n" + "+\t\t\t\tgpio@3 {\n" "+\t\t\t\t\treg = <3>;\n" "+\t\t\t\t\ttype = <PCA955X_TYPE_GPIO>;\n" "+\t\t\t\t};\n" "+\n" - "+\t\t\t\tgpio at 4 {\n" + "+\t\t\t\tgpio@4 {\n" "+\t\t\t\t\treg = <4>;\n" "+\t\t\t\t\ttype = <PCA955X_TYPE_GPIO>;\n" "+\t\t\t\t};\n" "+\n" - "+\t\t\t\tgpio at 5 {\n" + "+\t\t\t\tgpio@5 {\n" "+\t\t\t\t\treg = <5>;\n" "+\t\t\t\t\ttype = <PCA955X_TYPE_GPIO>;\n" "+\t\t\t\t};\n" "+\n" - "+\t\t\t\tgpio at 6 {\n" + "+\t\t\t\tgpio@6 {\n" "+\t\t\t\t\treg = <6>;\n" "+\t\t\t\t\ttype = <PCA955X_TYPE_GPIO>;\n" "+\t\t\t\t};\n" "+\n" - "+\t\t\t\tgpio at 7 {\n" + "+\t\t\t\tgpio@7 {\n" "+\t\t\t\t\treg = <7>;\n" "+\t\t\t\t\ttype = <PCA955X_TYPE_GPIO>;\n" "+\t\t\t\t};\n" "+\n" - "+\t\t\t\tgpio at 8 {\n" + "+\t\t\t\tgpio@8 {\n" "+\t\t\t\t\treg = <8>;\n" "+\t\t\t\t\ttype = <PCA955X_TYPE_GPIO>;\n" "+\t\t\t\t};\n" "+\n" - "+\t\t\t\tgpio at 9 {\n" + "+\t\t\t\tgpio@9 {\n" "+\t\t\t\t\treg = <9>;\n" "+\t\t\t\t\ttype = <PCA955X_TYPE_GPIO>;\n" "+\t\t\t\t};\n" "+\n" - "+\t\t\t\tgpio at 10 {\n" + "+\t\t\t\tgpio@10 {\n" "+\t\t\t\t\treg = <10>;\n" "+\t\t\t\t\ttype = <PCA955X_TYPE_GPIO>;\n" "+\t\t\t\t};\n" "+\n" - "+\t\t\t\tgpio at 11 {\n" + "+\t\t\t\tgpio@11 {\n" "+\t\t\t\t\treg = <11>;\n" "+\t\t\t\t\ttype = <PCA955X_TYPE_GPIO>;\n" "+\t\t\t\t};\n" "+\n" - "+\t\t\t\tgpio at 12 {\n" + "+\t\t\t\tgpio@12 {\n" "+\t\t\t\t\treg = <12>;\n" "+\t\t\t\t\ttype = <PCA955X_TYPE_GPIO>;\n" "+\t\t\t\t};\n" "+\n" - "+\t\t\t\tgpio at 13 {\n" + "+\t\t\t\tgpio@13 {\n" "+\t\t\t\t\treg = <13>;\n" "+\t\t\t\t\ttype = <PCA955X_TYPE_GPIO>;\n" "+\t\t\t\t};\n" "+\n" - "+\t\t\t\tgpio at 14 {\n" + "+\t\t\t\tgpio@14 {\n" "+\t\t\t\t\treg = <14>;\n" "+\t\t\t\t\ttype = <PCA955X_TYPE_GPIO>;\n" "+\t\t\t\t};\n" "+\n" - "+\t\t\t\tgpio at 15 {\n" + "+\t\t\t\tgpio@15 {\n" "+\t\t\t\t\treg = <15>;\n" "+\t\t\t\t\ttype = <PCA955X_TYPE_GPIO>;\n" "+\t\t\t\t};\n" @@ -165,4 +171,4 @@ "-- \n" 2.27.0 -8e2a5205a5d0b902fdcc234f2a3dd990c6227f74feb7501556c5d6bd58dfb159 +1ca7e0ec21c0000a0db43b0b2cc703cd0aa83af4070365d51fe4d5d4771d8559
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.