diff for duplicates of <1495615189.14589.3.camel@baylibre.com> diff --git a/a/content_digest b/N1/content_digest index 39d9046..56ec422 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,7 +3,7 @@ "From\0jbrunet@baylibre.com (Jerome Brunet)\0" "Subject\0[PATCH 2/3] ARM64: dts: Fix GXL periphs pinctrl pull-enable register base\0" "Date\0Wed, 24 May 2017 10:39:49 +0200\0" - "To\0linus-amlogic@lists.infradead.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Tue, 2017-05-23 at 16:21 +0200, Neil Armstrong wrote:\n" @@ -34,4 +34,4 @@ "> ?\t\t\treg-names = \"mux\", \"pull\", \"pull-enable\", \"gpio\";\n" "> ?\t\t\tgpio-controller;" -b51c55bd58eb9805a1718e2a9d825b9ad6792b86df8218aaedcf1b4383378fe7 +d80dc6f0865ff14c67ddc0ee020c5c3dca1551cf4044cce5d700c3cf853853bb
diff --git a/a/1.txt b/N2/1.txt index 563256a..f8c52c9 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -8,8 +8,8 @@ Reviewed-by: Jerome Brunet <jbrunet@baylibre.com> > Fixes: fb0fe92294a9 ("ARM64: dts: meson-gxl: Add pinctrl nodes") > Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> > --- -> ?arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 2 +- -> ?1 file changed, 1 insertion(+), 1 deletion(-) +> arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 2 +- +> 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi > b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi @@ -17,11 +17,11 @@ Reviewed-by: Jerome Brunet <jbrunet@baylibre.com> > --- a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi > +++ b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi > @@ -239,7 +239,7 @@ -> ? gpio: bank at 4b0 { -> ? reg = <0x0 0x004b0 0x0 0x28>, -> ? ??????<0x0 0x004e8 0x0 0x14>, -> - ??????<0x0 0x00120 0x0 0x14>, -> + ??????<0x0 0x00520 0x0 0x14>, -> ? ??????<0x0 0x00430 0x0 0x40>; -> ? reg-names = "mux", "pull", "pull-enable", "gpio"; -> ? gpio-controller; +> gpio: bank@4b0 { +> reg = <0x0 0x004b0 0x0 0x28>, +> <0x0 0x004e8 0x0 0x14>, +> - <0x0 0x00120 0x0 0x14>, +> + <0x0 0x00520 0x0 0x14>, +> <0x0 0x00430 0x0 0x40>; +> reg-names = "mux", "pull", "pull-enable", "gpio"; +> gpio-controller; diff --git a/a/content_digest b/N2/content_digest index 39d9046..2077562 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,9 +1,14 @@ "ref\01495549311-23660-1-git-send-email-narmstrong@baylibre.com\0" "ref\01495549311-23660-3-git-send-email-narmstrong@baylibre.com\0" - "From\0jbrunet@baylibre.com (Jerome Brunet)\0" - "Subject\0[PATCH 2/3] ARM64: dts: Fix GXL periphs pinctrl pull-enable register base\0" + "From\0Jerome Brunet <jbrunet@baylibre.com>\0" + "Subject\0Re: [PATCH 2/3] ARM64: dts: Fix GXL periphs pinctrl pull-enable register base\0" "Date\0Wed, 24 May 2017 10:39:49 +0200\0" - "To\0linus-amlogic@lists.infradead.org\0" + "To\0Neil Armstrong <narmstrong@baylibre.com>" + " khilman@baylibre.com\0" + "Cc\0linux-amlogic@lists.infradead.org" + linux-arm-kernel@lists.infradead.org + linux-kernel@vger.kernel.org + " devicetree@vger.kernel.org\0" "\00:1\0" "b\0" "On Tue, 2017-05-23 at 16:21 +0200, Neil Armstrong wrote:\n" @@ -16,8 +21,8 @@ "> Fixes: fb0fe92294a9 (\"ARM64: dts: meson-gxl: Add pinctrl nodes\")\n" "> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>\n" "> ---\n" - "> ?arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 2 +-\n" - "> ?1 file changed, 1 insertion(+), 1 deletion(-)\n" + "> \302\240arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 2 +-\n" + "> \302\2401 file changed, 1 insertion(+), 1 deletion(-)\n" "> \n" "> diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi\n" "> b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi\n" @@ -25,13 +30,13 @@ "> --- a/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi\n" "> +++ b/arch/arm64/boot/dts/amlogic/meson-gxl.dtsi\n" "> @@ -239,7 +239,7 @@\n" - "> ?\t\tgpio: bank at 4b0 {\n" - "> ?\t\t\treg = <0x0 0x004b0 0x0 0x28>,\n" - "> ?\t\t\t??????<0x0 0x004e8 0x0 0x14>,\n" - "> -\t\t\t??????<0x0 0x00120 0x0 0x14>,\n" - "> +\t\t\t??????<0x0 0x00520 0x0 0x14>,\n" - "> ?\t\t\t??????<0x0 0x00430 0x0 0x40>;\n" - "> ?\t\t\treg-names = \"mux\", \"pull\", \"pull-enable\", \"gpio\";\n" - "> ?\t\t\tgpio-controller;" + "> \302\240\t\tgpio: bank@4b0 {\n" + "> \302\240\t\t\treg = <0x0 0x004b0 0x0 0x28>,\n" + "> \302\240\t\t\t\302\240\302\240\302\240\302\240\302\240\302\240<0x0 0x004e8 0x0 0x14>,\n" + "> -\t\t\t\302\240\302\240\302\240\302\240\302\240\302\240<0x0 0x00120 0x0 0x14>,\n" + "> +\t\t\t\302\240\302\240\302\240\302\240\302\240\302\240<0x0 0x00520 0x0 0x14>,\n" + "> \302\240\t\t\t\302\240\302\240\302\240\302\240\302\240\302\240<0x0 0x00430 0x0 0x40>;\n" + "> \302\240\t\t\treg-names = \"mux\", \"pull\", \"pull-enable\", \"gpio\";\n" + "> \302\240\t\t\tgpio-controller;" -b51c55bd58eb9805a1718e2a9d825b9ad6792b86df8218aaedcf1b4383378fe7 +0a2e05f52df0d7effe5ca450b8d14c8d0b274e40f7592db528d79db786126063
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.