diff for duplicates of <53865A4F.7000007@cogentembedded.com> diff --git a/a/1.txt b/N1/1.txt index 1af5fdd..841bcd2 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -30,7 +30,8 @@ On 05/27/2014 04:41 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 @@ -40,14 +41,14 @@ On 05/27/2014 04:41 AM, Magnus Damm wrote: >>>> 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>; @@ -55,7 +56,7 @@ On 05/27/2014 04:41 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 @@ -64,14 +65,14 @@ On 05/27/2014 04:41 AM, Magnus Damm wrote: >>>> 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 f7dfe81..a202de5 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,9 +2,9 @@ "ref\0CANqRtoT+xKmK7wkayiD9yCmUqFNKWxpeSgkGTiCqc+THYE0sVw@mail.gmail.com\0" "ref\05383C439.1080808@cogentembedded.com\0" "ref\0CANqRtoTanAWvEODE99dY-BRU1FOm3V78FM6ePYKtVbK1Ro+79A@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\0Wed, 28 May 2014 21:51:11 +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\0Thu, 29 May 2014 01:51:11 +0400\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -40,7 +40,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\n" @@ -50,14 +51,14 @@ ">>>> 0x1000 0 0 2 &gic 0 108\n" ">>>> 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" @@ -65,7 +66,7 @@ ">>>> + };\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\n" ">>>> IRQ_TYPE_LEVEL_HIGH\n" @@ -74,14 +75,14 @@ ">>>> 0x1000 0 0 2 &gic 0 113\n" ">>>> 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" @@ -148,4 +149,4 @@ "\n" WBR, Sergei -69a78efd8760fc937fef37b60b3cec6cbc9c69ad226e6e59aaee5a90a1b6899a +cb0a375d32cf725396836d854a6423744f2ba38e86f1434f109e3f50b9b511bd
diff --git a/a/1.txt b/N2/1.txt index 1af5fdd..30b4dd0 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -30,7 +30,8 @@ On 05/27/2014 04:41 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 diff --git a/a/content_digest b/N2/content_digest index f7dfe81..cb41da2 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -4,8 +4,18 @@ "ref\0CANqRtoTanAWvEODE99dY-BRU1FOm3V78FM6ePYKtVbK1Ro+79A@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\0Wed, 28 May 2014 21:51:11 +0000\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "Date\0Thu, 29 May 2014 01:51:11 +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" @@ -40,7 +50,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\n" @@ -148,4 +159,4 @@ "\n" WBR, Sergei -69a78efd8760fc937fef37b60b3cec6cbc9c69ad226e6e59aaee5a90a1b6899a +61f1d2bd3a81c2110dc353d1f62b0a157febedd12ac3f1edc1c39f7f2c39e288
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.