diff for duplicates of <54EDD685.1010802@cogentembedded.com> diff --git a/a/1.txt b/N1/1.txt index e3275df..4074773 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -15,11 +15,12 @@ On 2/25/2015 1:11 PM, Laurent Pinchart wrote: >> >> 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 @@ [...] ->> + 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>; @@ -30,7 +31,7 @@ On 2/25/2015 1:11 PM, Laurent Pinchart wrote: > This GPIO block has 26 GPIOs only. [...] ->> + 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>; @@ -45,7 +46,7 @@ On 2/25/2015 1:11 PM, Laurent Pinchart wrote: >> + 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>; diff --git a/a/content_digest b/N1/content_digest index befbea1..364d525 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,9 @@ "ref\06954455.LyoCrfjM8R@wasted.cogentembedded.com\0" "ref\03082195.zNdUtZ8oMM@wasted.cogentembedded.com\0" "ref\02292882.LbM0mNWfOj@avalon\0" - "From\0Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>\0" - "Subject\0Re: [PATCH 2/2] ARM: shmobile: r8a7794: add GPIO DT support\0" - "Date\0Wed, 25 Feb 2015 14:04:53 +0000\0" + "From\0sergei.shtylyov@cogentembedded.com (Sergei Shtylyov)\0" + "Subject\0[PATCH 2/2] ARM: shmobile: r8a7794: add GPIO DT support\0" + "Date\0Wed, 25 Feb 2015 17:04:53 +0300\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -24,11 +24,12 @@ "\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" "[...]\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" @@ -39,7 +40,7 @@ "> This GPIO block has 26 GPIOs only.\n" "\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" @@ -54,7 +55,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" @@ -69,4 +70,4 @@ "\n" WBR, Sergei -2325b4c89bac89919798528cb4aed56136f51b8e84002df7d461ad90cc67a764 +8ea9e735eb48054ff43e0b0b50df61366d3a7630e6946aba400c0d5cd6760f01
diff --git a/a/1.txt b/N2/1.txt index e3275df..c00b4a7 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -15,7 +15,8 @@ On 2/25/2015 1:11 PM, Laurent Pinchart wrote: >> >> 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 @@ [...] diff --git a/a/content_digest b/N2/content_digest index befbea1..c484f24 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -3,8 +3,19 @@ "ref\02292882.LbM0mNWfOj@avalon\0" "From\0Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>\0" "Subject\0Re: [PATCH 2/2] ARM: shmobile: r8a7794: add GPIO DT support\0" - "Date\0Wed, 25 Feb 2015 14:04:53 +0000\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "Date\0Wed, 25 Feb 2015 17:04:53 +0300\0" + "To\0Laurent Pinchart <laurent.pinchart@ideasonboard.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" "Hello.\n" @@ -24,7 +35,8 @@ "\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" "[...]\n" @@ -69,4 +81,4 @@ "\n" WBR, Sergei -2325b4c89bac89919798528cb4aed56136f51b8e84002df7d461ad90cc67a764 +4b2c71f32aa671f8cb5e2fda80ff79ca533cff5308c6e3dc6997c45c0e2a6cb7
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.