diff for duplicates of <538F7BA7.2010707@cogentembedded.com> diff --git a/a/1.txt b/N1/1.txt index 6deb2eb..c14df6e 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -30,7 +30,8 @@ On 05/29/2014 01:51 AM, Sergei Shtylyov 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/29/2014 01:51 AM, Sergei Shtylyov 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/29/2014 01:51 AM, Sergei Shtylyov 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/29/2014 01:51 AM, Sergei Shtylyov 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 d899280..5b60fae 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,9 +3,9 @@ "ref\05383C439.1080808@cogentembedded.com\0" "ref\0CANqRtoTanAWvEODE99dY-BRU1FOm3V78FM6ePYKtVbK1Ro+79A@mail.gmail.com\0" "ref\053865A4F.7000007@cogentembedded.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, 04 Jun 2014 20:03:51 +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, 05 Jun 2014 00:03:51 +0400\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -41,7 +41,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" @@ -51,14 +52,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" @@ -66,7 +67,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" @@ -75,14 +76,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" @@ -130,4 +131,4 @@ "\n" WBR, Sergei -c4ed91a855491f2964f4068376ce8db3ed3e930ae0b7231d6fb64097bddbb6d3 +bc31fa5901834c8f4a11259a142cb9c977807864fc07b63a4d39ef33fa04e253
diff --git a/a/1.txt b/N2/1.txt index 6deb2eb..4051eda 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -30,7 +30,8 @@ On 05/29/2014 01:51 AM, Sergei Shtylyov 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 d899280..a69651b 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -5,8 +5,18 @@ "ref\053865A4F.7000007@cogentembedded.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, 04 Jun 2014 20:03:51 +0000\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "Date\0Thu, 05 Jun 2014 00:03:51 +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" @@ -41,7 +51,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" @@ -130,4 +141,4 @@ "\n" WBR, Sergei -c4ed91a855491f2964f4068376ce8db3ed3e930ae0b7231d6fb64097bddbb6d3 +944683d5b10879e3cbdb053c0f9a8a168de21bcd7b4c4fec9d0948bbbcc3efee
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.