diff for duplicates of <10927620.1TFu7PRvi4@wasted.cogentembedded.com> diff --git a/a/1.txt b/N1/1.txt index 2cf1dcc..4750938 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -12,21 +12,22 @@ arch/arm/boot/dts/r8a7794.dtsi | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 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 @@ -667,6 +667,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 = <&usb0 0>; + phy-names = "usb"; + }; + -+ usb@0,2 { ++ usb at 0,2 { + reg = <0x1000 0 0 0 0>; + device_type = "pci"; + phys = <&usb0 0>; @@ -34,20 +35,20 @@ Index: renesas/arch/arm/boot/dts/r8a7794.dtsi + }; }; - pci1: pci@ee0d0000 { + pci1: pci at ee0d0000 { @@ -688,6 +702,20 @@ 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 = <&usb2 0>; + phy-names = "usb"; + }; + -+ usb@0,2 { ++ usb at 0,2 { + reg = <0x1000 0 0 0 0>; + device_type = "pci"; + phys = <&usb2 0>; @@ -55,4 +56,4 @@ Index: renesas/arch/arm/boot/dts/r8a7794.dtsi + }; }; - usbphy: usb-phy@e6590100 { + usbphy: usb-phy at e6590100 { diff --git a/a/content_digest b/N1/content_digest index 3fd2eaa..d81515a 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ - "From\0Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>\0" + "From\0sergei.shtylyov@cogentembedded.com (Sergei Shtylyov)\0" "Subject\0[PATCH] ARM: shmobile: r8a7794: link PCI USB devices to USB PHY\0" - "Date\0Sat, 12 Sep 2015 23:00:19 +0000\0" + "Date\0Sun, 13 Sep 2015 02:00:19 +0300\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -18,21 +18,22 @@ " 1 file changed, 28 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" "@@ -667,6 +667,20 @@\n" " \t\tinterrupt-map = <0x0000 0 0 1 &gic 0 108 IRQ_TYPE_LEVEL_HIGH\n" " \t\t\t\t 0x0800 0 0 1 &gic 0 108 IRQ_TYPE_LEVEL_HIGH\n" " \t\t\t\t 0x1000 0 0 2 &gic 0 108 IRQ_TYPE_LEVEL_HIGH>;\n" "+\n" - "+\t\tusb@0,1 {\n" + "+\t\tusb at 0,1 {\n" "+\t\t\treg = <0x800 0 0 0 0>;\n" "+\t\t\tdevice_type = \"pci\";\n" "+\t\t\tphys = <&usb0 0>;\n" "+\t\t\tphy-names = \"usb\";\n" "+\t\t};\n" "+\n" - "+\t\tusb@0,2 {\n" + "+\t\tusb at 0,2 {\n" "+\t\t\treg = <0x1000 0 0 0 0>;\n" "+\t\t\tdevice_type = \"pci\";\n" "+\t\t\tphys = <&usb0 0>;\n" @@ -40,20 +41,20 @@ "+\t\t};\n" " \t};\n" " \n" - " \tpci1: pci@ee0d0000 {\n" + " \tpci1: pci at ee0d0000 {\n" "@@ -688,6 +702,20 @@\n" " \t\tinterrupt-map = <0x0000 0 0 1 &gic 0 113 IRQ_TYPE_LEVEL_HIGH\n" " \t\t\t\t 0x0800 0 0 1 &gic 0 113 IRQ_TYPE_LEVEL_HIGH\n" " \t\t\t\t 0x1000 0 0 2 &gic 0 113 IRQ_TYPE_LEVEL_HIGH>;\n" "+\n" - "+\t\tusb@0,1 {\n" + "+\t\tusb at 0,1 {\n" "+\t\t\treg = <0x800 0 0 0 0>;\n" "+\t\t\tdevice_type = \"pci\";\n" "+\t\t\tphys = <&usb2 0>;\n" "+\t\t\tphy-names = \"usb\";\n" "+\t\t};\n" "+\n" - "+\t\tusb@0,2 {\n" + "+\t\tusb at 0,2 {\n" "+\t\t\treg = <0x1000 0 0 0 0>;\n" "+\t\t\tdevice_type = \"pci\";\n" "+\t\t\tphys = <&usb2 0>;\n" @@ -61,6 +62,6 @@ "+\t\t};\n" " \t};\n" " \n" - " \tusbphy: usb-phy@e6590100 {" + " \tusbphy: usb-phy at e6590100 {" -654d43e6d413c8f0aa896f9e1832a68f79672be06a4097d6cc93b3873f3e9193 +1326742cee2223d0c3ede30a19c806ae615a4e81ef2f397908ead5f183239b7a
diff --git a/a/1.txt b/N2/1.txt index 2cf1dcc..6e8bff8 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -12,7 +12,8 @@ arch/arm/boot/dts/r8a7794.dtsi | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 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 @@ -667,6 +667,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 3fd2eaa..36e9658 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,7 +1,17 @@ "From\0Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>\0" "Subject\0[PATCH] ARM: shmobile: r8a7794: link PCI USB devices to USB PHY\0" - "Date\0Sat, 12 Sep 2015 23:00:19 +0000\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "Date\0Sun, 13 Sep 2015 02:00:19 +0300\0" + "To\0horms@verge.net.au" + linux-sh@vger.kernel.org + devicetree@vger.kernel.org + robh+dt@kernel.org + pawel.moll@arm.com + mark.rutland@arm.com + ijc+devicetree@hellion.org.uk + " galak@codeaurora.org\0" + "Cc\0magnus.damm@gmail.com" + linux@arm.linux.org.uk + " linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Describe the PCI USB devices that are behind the PCI bridges, adding necessary\n" @@ -18,7 +28,8 @@ " 1 file changed, 28 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" "@@ -667,6 +667,20 @@\n" " \t\tinterrupt-map = <0x0000 0 0 1 &gic 0 108 IRQ_TYPE_LEVEL_HIGH\n" @@ -63,4 +74,4 @@ " \n" " \tusbphy: usb-phy@e6590100 {" -654d43e6d413c8f0aa896f9e1832a68f79672be06a4097d6cc93b3873f3e9193 +c0f2aa21fc5fe439bc02d2e7eff3aaab42cdad8e82c3d0a453f8ccc712d0f8fa
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.