diff for duplicates of <2292882.LbM0mNWfOj@avalon> diff --git a/a/1.txt b/N1/1.txt index 32b3d2b..a5f8be3 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -15,13 +15,14 @@ On Sunday 22 February 2015 01:12:31 Sergei Shtylyov wrote: > 1 file changed, 84 insertions(+) > > Index: renesas/arch/arm/boot/dts/r8a7794.dtsi -> =================================> --- renesas.orig/arch/arm/boot/dts/r8a7794.dtsi +> =================================================================== +> --- renesas.orig/arch/arm/boot/dts/r8a7794.dtsi > +++ renesas/arch/arm/boot/dts/r8a7794.dtsi > @@ -50,6 +50,90 @@ > interrupts = <1 9 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_HIGH)>; > }; > -> + gpio0: gpio@e6050000 { +> + gpio0: gpio at e6050000 { > + compatible = "renesas,gpio-r8a7794", "renesas,gpio-rcar"; > + reg = <0 0xe6050000 0 0x50>; > + interrupts = <0 4 IRQ_TYPE_LEVEL_HIGH>; @@ -33,7 +34,7 @@ On Sunday 22 February 2015 01:12:31 Sergei Shtylyov wrote: > + clocks = <&mstp9_clks R8A7794_CLK_GPIO0>; > + }; > + -> + gpio1: gpio@e6051000 { +> + gpio1: gpio at e6051000 { > + compatible = "renesas,gpio-r8a7794", "renesas,gpio-rcar"; > + reg = <0 0xe6051000 0 0x50>; > + interrupts = <0 5 IRQ_TYPE_LEVEL_HIGH>; @@ -48,7 +49,7 @@ This GPIO block has 26 GPIOs only. > + clocks = <&mstp9_clks R8A7794_CLK_GPIO1>; > + }; > + -> + gpio2: gpio@e6052000 { +> + gpio2: gpio at e6052000 { > + compatible = "renesas,gpio-r8a7794", "renesas,gpio-rcar"; > + reg = <0 0xe6052000 0 0x50>; > + interrupts = <0 6 IRQ_TYPE_LEVEL_HIGH>; @@ -60,7 +61,7 @@ This GPIO block has 26 GPIOs only. > + clocks = <&mstp9_clks R8A7794_CLK_GPIO2>; > + }; > + -> + gpio3: gpio@e6053000 { +> + gpio3: gpio at e6053000 { > + compatible = "renesas,gpio-r8a7794", "renesas,gpio-rcar"; > + reg = <0 0xe6053000 0 0x50>; > + interrupts = <0 7 IRQ_TYPE_LEVEL_HIGH>; @@ -72,7 +73,7 @@ This GPIO block has 26 GPIOs only. > + clocks = <&mstp9_clks R8A7794_CLK_GPIO3>; > + }; > + -> + gpio4: gpio@e6054000 { +> + gpio4: gpio at e6054000 { > + compatible = "renesas,gpio-r8a7794", "renesas,gpio-rcar"; > + reg = <0 0xe6054000 0 0x50>; > + interrupts = <0 8 IRQ_TYPE_LEVEL_HIGH>; @@ -84,7 +85,7 @@ This GPIO block has 26 GPIOs only. > + clocks = <&mstp9_clks R8A7794_CLK_GPIO4>; > + }; > + -> + gpio5: gpio@e6055000 { +> + gpio5: gpio at e6055000 { > + compatible = "renesas,gpio-r8a7794", "renesas,gpio-rcar"; > + reg = <0 0xe6055000 0 0x50>; > + interrupts = <0 9 IRQ_TYPE_LEVEL_HIGH>; @@ -99,7 +100,7 @@ This GPIO block has 28 GPIOs only. > + clocks = <&mstp9_clks R8A7794_CLK_GPIO5>; > + }; > + -> + gpio6: gpio@e6055400 { +> + gpio6: gpio at e6055400 { > + compatible = "renesas,gpio-r8a7794", "renesas,gpio-rcar"; > + reg = <0 0xe6055400 0 0x50>; > + interrupts = <0 10 IRQ_TYPE_LEVEL_HIGH>; @@ -114,7 +115,7 @@ This GPIO block has 26 GPIOs only. > + clocks = <&mstp9_clks R8A7794_CLK_GPIO6>; > + }; > + -> cmt0: timer@ffca0000 { +> cmt0: timer at ffca0000 { > compatible = "renesas,cmt-48-gen2"; > reg = <0 0xffca0000 0 0x1004>; diff --git a/a/content_digest b/N1/content_digest index 7a7304d..113a2fd 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,8 @@ "ref\06954455.LyoCrfjM8R@wasted.cogentembedded.com\0" "ref\03082195.zNdUtZ8oMM@wasted.cogentembedded.com\0" - "From\0Laurent Pinchart <laurent.pinchart@ideasonboard.com>\0" - "Subject\0Re: [PATCH 2/2] ARM: shmobile: r8a7794: add GPIO DT support\0" - "Date\0Wed, 25 Feb 2015 10:11:35 +0000\0" + "From\0laurent.pinchart@ideasonboard.com (Laurent Pinchart)\0" + "Subject\0[PATCH 2/2] ARM: shmobile: r8a7794: add GPIO DT support\0" + "Date\0Wed, 25 Feb 2015 12:11:35 +0200\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -23,13 +23,14 @@ "> 1 file changed, 84 insertions(+)\n" "> \n" "> Index: renesas/arch/arm/boot/dts/r8a7794.dtsi\n" - "> =================================> --- renesas.orig/arch/arm/boot/dts/r8a7794.dtsi\n" + "> ===================================================================\n" + "> --- renesas.orig/arch/arm/boot/dts/r8a7794.dtsi\n" "> +++ renesas/arch/arm/boot/dts/r8a7794.dtsi\n" "> @@ -50,6 +50,90 @@\n" "> \t\tinterrupts = <1 9 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_HIGH)>;\n" "> \t};\n" "> \n" - "> +\tgpio0: gpio@e6050000 {\n" + "> +\tgpio0: gpio at e6050000 {\n" "> +\t\tcompatible = \"renesas,gpio-r8a7794\", \"renesas,gpio-rcar\";\n" "> +\t\treg = <0 0xe6050000 0 0x50>;\n" "> +\t\tinterrupts = <0 4 IRQ_TYPE_LEVEL_HIGH>;\n" @@ -41,7 +42,7 @@ "> +\t\tclocks = <&mstp9_clks R8A7794_CLK_GPIO0>;\n" "> +\t};\n" "> +\n" - "> +\tgpio1: gpio@e6051000 {\n" + "> +\tgpio1: gpio at e6051000 {\n" "> +\t\tcompatible = \"renesas,gpio-r8a7794\", \"renesas,gpio-rcar\";\n" "> +\t\treg = <0 0xe6051000 0 0x50>;\n" "> +\t\tinterrupts = <0 5 IRQ_TYPE_LEVEL_HIGH>;\n" @@ -56,7 +57,7 @@ "> +\t\tclocks = <&mstp9_clks R8A7794_CLK_GPIO1>;\n" "> +\t};\n" "> +\n" - "> +\tgpio2: gpio@e6052000 {\n" + "> +\tgpio2: gpio at e6052000 {\n" "> +\t\tcompatible = \"renesas,gpio-r8a7794\", \"renesas,gpio-rcar\";\n" "> +\t\treg = <0 0xe6052000 0 0x50>;\n" "> +\t\tinterrupts = <0 6 IRQ_TYPE_LEVEL_HIGH>;\n" @@ -68,7 +69,7 @@ "> +\t\tclocks = <&mstp9_clks R8A7794_CLK_GPIO2>;\n" "> +\t};\n" "> +\n" - "> +\tgpio3: gpio@e6053000 {\n" + "> +\tgpio3: gpio at e6053000 {\n" "> +\t\tcompatible = \"renesas,gpio-r8a7794\", \"renesas,gpio-rcar\";\n" "> +\t\treg = <0 0xe6053000 0 0x50>;\n" "> +\t\tinterrupts = <0 7 IRQ_TYPE_LEVEL_HIGH>;\n" @@ -80,7 +81,7 @@ "> +\t\tclocks = <&mstp9_clks R8A7794_CLK_GPIO3>;\n" "> +\t};\n" "> +\n" - "> +\tgpio4: gpio@e6054000 {\n" + "> +\tgpio4: gpio at e6054000 {\n" "> +\t\tcompatible = \"renesas,gpio-r8a7794\", \"renesas,gpio-rcar\";\n" "> +\t\treg = <0 0xe6054000 0 0x50>;\n" "> +\t\tinterrupts = <0 8 IRQ_TYPE_LEVEL_HIGH>;\n" @@ -92,7 +93,7 @@ "> +\t\tclocks = <&mstp9_clks R8A7794_CLK_GPIO4>;\n" "> +\t};\n" "> +\n" - "> +\tgpio5: gpio@e6055000 {\n" + "> +\tgpio5: gpio at e6055000 {\n" "> +\t\tcompatible = \"renesas,gpio-r8a7794\", \"renesas,gpio-rcar\";\n" "> +\t\treg = <0 0xe6055000 0 0x50>;\n" "> +\t\tinterrupts = <0 9 IRQ_TYPE_LEVEL_HIGH>;\n" @@ -107,7 +108,7 @@ "> +\t\tclocks = <&mstp9_clks R8A7794_CLK_GPIO5>;\n" "> +\t};\n" "> +\n" - "> +\tgpio6: gpio@e6055400 {\n" + "> +\tgpio6: gpio at e6055400 {\n" "> +\t\tcompatible = \"renesas,gpio-r8a7794\", \"renesas,gpio-rcar\";\n" "> +\t\treg = <0 0xe6055400 0 0x50>;\n" "> +\t\tinterrupts = <0 10 IRQ_TYPE_LEVEL_HIGH>;\n" @@ -122,7 +123,7 @@ "> +\t\tclocks = <&mstp9_clks R8A7794_CLK_GPIO6>;\n" "> +\t};\n" "> +\n" - "> \tcmt0: timer@ffca0000 {\n" + "> \tcmt0: timer at ffca0000 {\n" "> \t\tcompatible = \"renesas,cmt-48-gen2\";\n" "> \t\treg = <0 0xffca0000 0 0x1004>;\n" "\n" @@ -131,4 +132,4 @@ "\n" Laurent Pinchart -cb0e692146019843e2b347dba497660817d39f56120b19a282fcae2176bbbb98 +ce8066a62ec4eb0e531a207a1502a27df5a0e2ad70ddc36157f22edcb0173dd6
diff --git a/a/1.txt b/N2/1.txt index 32b3d2b..d41aaac 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -15,7 +15,8 @@ On Sunday 22 February 2015 01:12:31 Sergei Shtylyov wrote: > 1 file changed, 84 insertions(+) > > Index: renesas/arch/arm/boot/dts/r8a7794.dtsi -> =================================> --- renesas.orig/arch/arm/boot/dts/r8a7794.dtsi +> =================================================================== +> --- renesas.orig/arch/arm/boot/dts/r8a7794.dtsi > +++ renesas/arch/arm/boot/dts/r8a7794.dtsi > @@ -50,6 +50,90 @@ > interrupts = <1 9 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_HIGH)>; diff --git a/a/content_digest b/N2/content_digest index 7a7304d..5db0786 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -2,8 +2,19 @@ "ref\03082195.zNdUtZ8oMM@wasted.cogentembedded.com\0" "From\0Laurent Pinchart <laurent.pinchart@ideasonboard.com>\0" "Subject\0Re: [PATCH 2/2] ARM: shmobile: r8a7794: add GPIO DT support\0" - "Date\0Wed, 25 Feb 2015 10:11:35 +0000\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "Date\0Wed, 25 Feb 2015 12:11:35 +0200\0" + "To\0Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>\0" + "Cc\0horms@verge.net.au" + linux-sh@vger.kernel.org + robh+dt@kernel.org + pawel.moll@arm.com + mark.rutland@arm.com + ijc+devicetree@hellion.org.uk + galak@codeaurora.org + devicetree@vger.kernel.org + magnus.damm@gmail.com + linux@arm.linux.org.uk + " linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Hi Sergei,\n" @@ -23,7 +34,8 @@ "> 1 file changed, 84 insertions(+)\n" "> \n" "> Index: renesas/arch/arm/boot/dts/r8a7794.dtsi\n" - "> =================================> --- renesas.orig/arch/arm/boot/dts/r8a7794.dtsi\n" + "> ===================================================================\n" + "> --- renesas.orig/arch/arm/boot/dts/r8a7794.dtsi\n" "> +++ renesas/arch/arm/boot/dts/r8a7794.dtsi\n" "> @@ -50,6 +50,90 @@\n" "> \t\tinterrupts = <1 9 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_HIGH)>;\n" @@ -131,4 +143,4 @@ "\n" Laurent Pinchart -cb0e692146019843e2b347dba497660817d39f56120b19a282fcae2176bbbb98 +405c6d41ac4fe9e55e037948c8d263bfa3ddbdef31bb2f02df4c89713b73c55a
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.