diff for duplicates of <5383C439.1080808@cogentembedded.com> diff --git a/a/1.txt b/N1/1.txt index fc1ed3c..0afa276 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -25,21 +25,22 @@ On 05/27/2014 02:36 AM, Magnus Damm wrote: >> 1 file changed, 28 insertions(+) >> Index: renesas/arch/arm/boot/dts/r8a7790.dtsi ->> =================================>> --- renesas.orig/arch/arm/boot/dts/r8a7790.dtsi +>> =================================================================== +>> --- renesas.orig/arch/arm/boot/dts/r8a7790.dtsi >> +++ renesas/arch/arm/boot/dts/r8a7790.dtsi >> @@ -919,6 +919,20 @@ >> interrupt-map = <0x0000 0 0 1 &gic 0 108 IRQ_TYPE_LEVEL_HIGH >> 0x0800 0 0 1 &gic 0 108 IRQ_TYPE_LEVEL_HIGH >> 0x1000 0 0 2 &gic 0 108 IRQ_TYPE_LEVEL_HIGH>; >> + ->> + usb@0,1 { +>> + usb at 0,1 { >> + reg = <0x800 0 0 0 0>; >> + device_type = "pci"; >> + phys = <&usbphy 0 0>; >> + phy-names = "usb"; >> + }; >> + ->> + usb@0,2 { +>> + usb at 0,2 { >> + reg = <0x1000 0 0 0 0>; >> + device_type = "pci"; >> + phys = <&usbphy 0 0>; @@ -47,20 +48,20 @@ On 05/27/2014 02:36 AM, Magnus Damm wrote: >> + }; >> }; >> ->> pci1: pci@ee0b0000 { +>> pci1: pci at ee0b0000 { >> @@ -955,5 +969,19 @@ >> interrupt-map = <0x0000 0 0 1 &gic 0 113 IRQ_TYPE_LEVEL_HIGH >> 0x0800 0 0 1 &gic 0 113 IRQ_TYPE_LEVEL_HIGH >> 0x1000 0 0 2 &gic 0 113 IRQ_TYPE_LEVEL_HIGH>; >> + ->> + usb@0,1 { +>> + usb at 0,1 { >> + reg = <0x800 0 0 0 0>; >> + device_type = "pci"; >> + phys = <&usbphy 1 0>; >> + phy-names = "usb"; >> + }; >> + ->> + usb@0,2 { +>> + usb at 0,2 { >> + reg = <0x1000 0 0 0 0>; >> + device_type = "pci"; >> + phys = <&usbphy 1 0>; diff --git a/a/content_digest b/N1/content_digest index ded7e34..df09607 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,8 @@ "ref\0201405270217.33057.sergei.shtylyov@cogentembedded.com\0" "ref\0CANqRtoT+xKmK7wkayiD9yCmUqFNKWxpeSgkGTiCqc+THYE0sVw@mail.gmail.com\0" - "From\0Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>\0" - "Subject\0Re: [PATCH v2] ARM: shmobile: r8a7790: link PCI USB devices to USB PHY\0" - "Date\0Mon, 26 May 2014 22:46:17 +0000\0" + "From\0sergei.shtylyov@cogentembedded.com (Sergei Shtylyov)\0" + "Subject\0[PATCH v2] ARM: shmobile: r8a7790: link PCI USB devices to USB PHY\0" + "Date\0Tue, 27 May 2014 02:46:17 +0400\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -33,21 +33,22 @@ ">> 1 file changed, 28 insertions(+)\n" "\n" ">> Index: renesas/arch/arm/boot/dts/r8a7790.dtsi\n" - ">> =================================>> --- renesas.orig/arch/arm/boot/dts/r8a7790.dtsi\n" + ">> ===================================================================\n" + ">> --- renesas.orig/arch/arm/boot/dts/r8a7790.dtsi\n" ">> +++ renesas/arch/arm/boot/dts/r8a7790.dtsi\n" ">> @@ -919,6 +919,20 @@\n" ">> interrupt-map = <0x0000 0 0 1 &gic 0 108 IRQ_TYPE_LEVEL_HIGH\n" ">> 0x0800 0 0 1 &gic 0 108 IRQ_TYPE_LEVEL_HIGH\n" ">> 0x1000 0 0 2 &gic 0 108 IRQ_TYPE_LEVEL_HIGH>;\n" ">> +\n" - ">> + usb@0,1 {\n" + ">> + usb at 0,1 {\n" ">> + reg = <0x800 0 0 0 0>;\n" ">> + device_type = \"pci\";\n" ">> + phys = <&usbphy 0 0>;\n" ">> + phy-names = \"usb\";\n" ">> + };\n" ">> +\n" - ">> + usb@0,2 {\n" + ">> + usb at 0,2 {\n" ">> + reg = <0x1000 0 0 0 0>;\n" ">> + device_type = \"pci\";\n" ">> + phys = <&usbphy 0 0>;\n" @@ -55,20 +56,20 @@ ">> + };\n" ">> };\n" ">>\n" - ">> pci1: pci@ee0b0000 {\n" + ">> pci1: pci at ee0b0000 {\n" ">> @@ -955,5 +969,19 @@\n" ">> interrupt-map = <0x0000 0 0 1 &gic 0 113 IRQ_TYPE_LEVEL_HIGH\n" ">> 0x0800 0 0 1 &gic 0 113 IRQ_TYPE_LEVEL_HIGH\n" ">> 0x1000 0 0 2 &gic 0 113 IRQ_TYPE_LEVEL_HIGH>;\n" ">> +\n" - ">> + usb@0,1 {\n" + ">> + usb at 0,1 {\n" ">> + reg = <0x800 0 0 0 0>;\n" ">> + device_type = \"pci\";\n" ">> + phys = <&usbphy 1 0>;\n" ">> + phy-names = \"usb\";\n" ">> + };\n" ">> +\n" - ">> + usb@0,2 {\n" + ">> + usb at 0,2 {\n" ">> + reg = <0x1000 0 0 0 0>;\n" ">> + device_type = \"pci\";\n" ">> + phys = <&usbphy 1 0>;\n" @@ -95,4 +96,4 @@ "\n" WBR, Sergei -94ecb3fd9b986e93960b56736a9b903bcdebe8c47370238b2aae256923777768 +3bc28c4c088d9f412e6b793799af720c08a71aad01d357d7acd36ad43543aa51
diff --git a/a/1.txt b/N2/1.txt index fc1ed3c..89c5419 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -25,7 +25,8 @@ On 05/27/2014 02:36 AM, Magnus Damm wrote: >> 1 file changed, 28 insertions(+) >> Index: renesas/arch/arm/boot/dts/r8a7790.dtsi ->> =================================>> --- renesas.orig/arch/arm/boot/dts/r8a7790.dtsi +>> =================================================================== +>> --- renesas.orig/arch/arm/boot/dts/r8a7790.dtsi >> +++ renesas/arch/arm/boot/dts/r8a7790.dtsi >> @@ -919,6 +919,20 @@ >> interrupt-map = <0x0000 0 0 1 &gic 0 108 IRQ_TYPE_LEVEL_HIGH diff --git a/a/content_digest b/N2/content_digest index ded7e34..17fe66f 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -2,8 +2,18 @@ "ref\0CANqRtoT+xKmK7wkayiD9yCmUqFNKWxpeSgkGTiCqc+THYE0sVw@mail.gmail.com\0" "From\0Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>\0" "Subject\0Re: [PATCH v2] ARM: shmobile: r8a7790: link PCI USB devices to USB PHY\0" - "Date\0Mon, 26 May 2014 22:46:17 +0000\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "Date\0Tue, 27 May 2014 02:46:17 +0400\0" + "To\0Magnus Damm <magnus.damm@gmail.com>\0" + "Cc\0Simon Horman [Horms] <horms@verge.net.au>" + SH-Linux <linux-sh@vger.kernel.org> + devicetree@vger.kernel.org <devicetree@vger.kernel.org> + Rob Herring <robh+dt@kernel.org> + Pawel Moll <pawel.moll@arm.com> + Mark Rutland <mark.rutland@arm.com> + ijc+devicetree@hellion.org.uk + Kumar Gala <galak@codeaurora.org> + Russell King - ARM Linux <linux@arm.linux.org.uk> + " linux-arm-kernel@lists.infradead.org <linux-arm-kernel@lists.infradead.org>\0" "\00:1\0" "b\0" "Hello.\n" @@ -33,7 +43,8 @@ ">> 1 file changed, 28 insertions(+)\n" "\n" ">> Index: renesas/arch/arm/boot/dts/r8a7790.dtsi\n" - ">> =================================>> --- renesas.orig/arch/arm/boot/dts/r8a7790.dtsi\n" + ">> ===================================================================\n" + ">> --- renesas.orig/arch/arm/boot/dts/r8a7790.dtsi\n" ">> +++ renesas/arch/arm/boot/dts/r8a7790.dtsi\n" ">> @@ -919,6 +919,20 @@\n" ">> interrupt-map = <0x0000 0 0 1 &gic 0 108 IRQ_TYPE_LEVEL_HIGH\n" @@ -95,4 +106,4 @@ "\n" WBR, Sergei -94ecb3fd9b986e93960b56736a9b903bcdebe8c47370238b2aae256923777768 +90315352c509eb14892d58df51f938afa76ceae594381bcba3807903ecfa5ffe
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.