diff for duplicates of <53AB89B3.9020207@renesas.com> diff --git a/a/1.txt b/N1/1.txt index da18b84..1cd6532 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -39,13 +39,14 @@ Yoshihiro Shimoda > 1 file changed, 60 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 > @@ -930,6 +930,66 @@ > status = "disabled"; > }; > -> + pci0: pci@ee090000 { +> + pci0: pci at ee090000 { > + compatible = "renesas,pci-r8a7790"; > + device_type = "pci"; > + clocks = <&mstp7_clks R8A7790_CLK_EHCI>; @@ -65,7 +66,7 @@ Yoshihiro Shimoda > + 0x1000 0 0 2 &gic 0 108 IRQ_TYPE_LEVEL_HIGH>; > + }; > + -> + pci1: pci@ee0b0000 { +> + pci1: pci at ee0b0000 { > + compatible = "renesas,pci-r8a7790"; > + device_type = "pci"; > + clocks = <&mstp7_clks R8A7790_CLK_EHCI>; @@ -85,7 +86,7 @@ Yoshihiro Shimoda > + 0x1000 0 0 2 &gic 0 112 IRQ_TYPE_LEVEL_HIGH>; > + }; > + -> + pci2: pci@ee0d0000 { +> + pci2: pci at ee0d0000 { > + compatible = "renesas,pci-r8a7790"; > + device_type = "pci"; > + clocks = <&mstp7_clks R8A7790_CLK_EHCI>; @@ -105,11 +106,11 @@ Yoshihiro Shimoda > + 0x1000 0 0 2 &gic 0 113 IRQ_TYPE_LEVEL_HIGH>; > + }; > + -> pciec: pcie@fe000000 { +> pciec: pcie at fe000000 { > compatible = "renesas,pcie-r8a7790"; > reg = <0 0xfe000000 0 0x80000>; > -- > To unsubscribe from this list: send the line "unsubscribe devicetree" in -> the body of a message to majordomo@vger.kernel.org +> the body of a message to majordomo at vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > diff --git a/a/content_digest b/N1/content_digest index 2b0a3b4..261b631 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,8 @@ "ref\0201406242157.05973.sergei.shtylyov@cogentembedded.com\0" "ref\0201406242159.55373.sergei.shtylyov@cogentembedded.com\0" - "From\0Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>\0" - "Subject\0Re: [PATCH v5 1/2] ARM: shmobile: r8a7790: add internal PCI bridge nodes\0" - "Date\0Thu, 26 Jun 2014 02:47:15 +0000\0" + "From\0yoshihiro.shimoda.uh@renesas.com (Yoshihiro Shimoda)\0" + "Subject\0[PATCH v5 1/2] ARM: shmobile: r8a7790: add internal PCI bridge nodes\0" + "Date\0Thu, 26 Jun 2014 11:47:15 +0900\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -47,13 +47,14 @@ "> 1 file changed, 60 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" "> @@ -930,6 +930,66 @@\n" "> \t\tstatus = \"disabled\";\n" "> \t};\n" "> \n" - "> +\tpci0: pci@ee090000 {\n" + "> +\tpci0: pci at ee090000 {\n" "> +\t\tcompatible = \"renesas,pci-r8a7790\";\n" "> +\t\tdevice_type = \"pci\";\n" "> +\t\tclocks = <&mstp7_clks R8A7790_CLK_EHCI>;\n" @@ -73,7 +74,7 @@ "> +\t\t\t \t 0x1000 0 0 2 &gic 0 108 IRQ_TYPE_LEVEL_HIGH>;\n" "> +\t};\n" "> +\n" - "> +\tpci1: pci@ee0b0000 {\n" + "> +\tpci1: pci at ee0b0000 {\n" "> +\t\tcompatible = \"renesas,pci-r8a7790\";\n" "> +\t\tdevice_type = \"pci\";\n" "> +\t\tclocks = <&mstp7_clks R8A7790_CLK_EHCI>;\n" @@ -93,7 +94,7 @@ "> +\t\t\t \t 0x1000 0 0 2 &gic 0 112 IRQ_TYPE_LEVEL_HIGH>;\n" "> +\t};\n" "> +\n" - "> +\tpci2: pci@ee0d0000 {\n" + "> +\tpci2: pci at ee0d0000 {\n" "> +\t\tcompatible = \"renesas,pci-r8a7790\";\n" "> +\t\tdevice_type = \"pci\";\n" "> +\t\tclocks = <&mstp7_clks R8A7790_CLK_EHCI>;\n" @@ -113,13 +114,13 @@ "> +\t\t\t \t 0x1000 0 0 2 &gic 0 113 IRQ_TYPE_LEVEL_HIGH>;\n" "> +\t};\n" "> +\n" - "> \tpciec: pcie@fe000000 {\n" + "> \tpciec: pcie at fe000000 {\n" "> \t\tcompatible = \"renesas,pcie-r8a7790\";\n" "> \t\treg = <0 0xfe000000 0 0x80000>;\n" "> --\n" "> To unsubscribe from this list: send the line \"unsubscribe devicetree\" in\n" - "> the body of a message to majordomo@vger.kernel.org\n" + "> the body of a message to majordomo at vger.kernel.org\n" "> More majordomo info at http://vger.kernel.org/majordomo-info.html\n" > -ca3a392fb0512709a53aa1af911502071109868accab9a3e048b24ba20dd950c +cd039815c6d2e9226eadc835031a42dca55ffb549293ad43349eb49daea5b6a8
diff --git a/a/1.txt b/N2/1.txt index da18b84..379dceb 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -39,7 +39,8 @@ Yoshihiro Shimoda > 1 file changed, 60 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 > @@ -930,6 +930,66 @@ > status = "disabled"; diff --git a/a/content_digest b/N2/content_digest index 2b0a3b4..f61fae9 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -2,8 +2,20 @@ "ref\0201406242159.55373.sergei.shtylyov@cogentembedded.com\0" "From\0Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>\0" "Subject\0Re: [PATCH v5 1/2] ARM: shmobile: r8a7790: add internal PCI bridge nodes\0" - "Date\0Thu, 26 Jun 2014 02:47:15 +0000\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "Date\0Thu, 26 Jun 2014 11:47:15 +0900\0" + "To\0Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>" + horms@verge.net.au <horms@verge.net.au> + linux-sh@vger.kernel.org <linux-sh@vger.kernel.org> + robh+dt@kernel.org <robh+dt@kernel.org> + pawel.moll@arm.com <pawel.moll@arm.com> + mark.rutland@arm.com <mark.rutland@arm.com> + ijc+devicetree@hellion.org.uk <ijc+devicetree@hellion.org.uk> + galak@codeaurora.org <galak@codeaurora.org> + " devicetree@vger.kernel.org <devicetree@vger.kernel.org>\0" + "Cc\0magnus.damm@gmail.com <magnus.damm@gmail.com>" + linux@arm.linux.org.uk <linux@arm.linux.org.uk> + linux-arm-kernel@lists.infradead.org <linux-arm-kernel@lists.infradead.org> + " ben.dooks@codethink.co.uk <ben.dooks@codethink.co.uk>\0" "\00:1\0" "b\0" "Hi Sergei,\n" @@ -47,7 +59,8 @@ "> 1 file changed, 60 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" "> @@ -930,6 +930,66 @@\n" "> \t\tstatus = \"disabled\";\n" @@ -122,4 +135,4 @@ "> More majordomo info at http://vger.kernel.org/majordomo-info.html\n" > -ca3a392fb0512709a53aa1af911502071109868accab9a3e048b24ba20dd950c +70b7600e9d9b0e1fb65fd4c5214e61428fb140eb2dcd1e2c81fe53cdc675578b
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.