diff for duplicates of <1521518336-5467-3-git-send-email-sricharan@codeaurora.org> diff --git a/a/1.txt b/N1/1.txt index 0d6f1f8..8bfe839 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -44,7 +44,7 @@ index 10d112a..3a7127c 100644 + status = "disabled"; + }; + -+ spi_1: spi@78b6000 { /* BLSP1 QUP2 */ ++ spi_1: spi at 78b6000 { /* BLSP1 QUP2 */ + compatible = "qcom,spi-qup-v2.2.1"; + reg = <0x78b6000 0x600>; + interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>; @@ -67,7 +67,7 @@ index 10d112a..3a7127c 100644 status = "disabled"; }; -+ i2c_1: i2c@78b8000 { /* BLSP1 QUP4 */ ++ i2c_1: i2c at 78b8000 { /* BLSP1 QUP4 */ + compatible = "qcom,i2c-qup-v2.2.1"; + reg = <0x78b8000 0x600>; + interrupts = <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>; @@ -81,13 +81,13 @@ index 10d112a..3a7127c 100644 + status = "disabled"; + }; - cryptobam: dma@8e04000 { + cryptobam: dma at 8e04000 { compatible = "qcom,bam-v1.7.0"; @@ -293,6 +332,101 @@ reg = <0x4ab000 0x4>; }; -+ pcie0: pci@40000000 { ++ pcie0: pci at 40000000 { + compatible = "qcom,pcie-ipq4019", "snps,dw-pcie"; + reg = <0x40000000 0xf1d + 0x40000f20 0xa8 @@ -147,7 +147,7 @@ index 10d112a..3a7127c 100644 + status = "disabled"; + }; + -+ qpic_bam: dma@7984000 { ++ qpic_bam: dma at 7984000 { + compatible = "qcom,bam-v1.7.0"; + reg = <0x7984000 0x1a000>; + interrupts = <GIC_SPI 101 IRQ_TYPE_LEVEL_HIGH>; @@ -158,7 +158,7 @@ index 10d112a..3a7127c 100644 + status = "disabled"; + }; + -+ nand: qpic-nand@79b0000 { ++ nand: qpic-nand at 79b0000 { + compatible = "qcom,ipq4019-nand"; + reg = <0x79b0000 0x1000>; + #address-cells = <1>; @@ -173,7 +173,7 @@ index 10d112a..3a7127c 100644 + dma-names = "tx", "rx", "cmd"; + status = "disabled"; + -+ nand@0 { ++ nand at 0 { + reg = <0>; + + nand-ecc-strength = <4>; @@ -182,7 +182,7 @@ index 10d112a..3a7127c 100644 + }; + }; + - wifi0: wifi@a000000 { + wifi0: wifi at a000000 { compatible = "qcom,ipq4019-wifi"; reg = <0xa000000 0x200000>; -- diff --git a/a/content_digest b/N1/content_digest index 66487b8..37d171a 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,25 +1,8 @@ "ref\01521518336-5467-1-git-send-email-sricharan@codeaurora.org\0" - "From\0Sricharan R <sricharan@codeaurora.org>\0" + "From\0sricharan@codeaurora.org (Sricharan R)\0" "Subject\0[PATCH v3 02/13] ARM: dts: ipq4019: Add a few peripheral nodes\0" "Date\0Tue, 20 Mar 2018 09:28:45 +0530\0" - "To\0robh+dt@kernel.org" - robh@kernel.org - mark.rutland@arm.com - linux@armlinux.org.uk - andy.gross@linaro.org - david.brown@linaro.org - catalin.marinas@arm.com - will.deacon@arm.com - sboyd@codeaurora.org - bjorn.andersson@linaro.org - devicetree@vger.kernel.org - linux-kernel@vger.kernel.org - linux-arm-kernel@lists.infradead.org - linux-arm-msm@vger.kernel.org - linux-soc@vger.kernel.org - absahu@codeaurora.org - " marc.zyngier@arm.com\0" - "Cc\0sricharan@codeaurora.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Now with the driver updates for some peripherals being there,\n" @@ -68,7 +51,7 @@ "+\t\t\tstatus = \"disabled\";\n" "+\t\t};\n" "+\n" - "+\t\tspi_1: spi@78b6000 { /* BLSP1 QUP2 */\n" + "+\t\tspi_1: spi at 78b6000 { /* BLSP1 QUP2 */\n" "+\t\t\tcompatible = \"qcom,spi-qup-v2.2.1\";\n" "+\t\t\treg = <0x78b6000 0x600>;\n" "+\t\t\tinterrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>;\n" @@ -91,7 +74,7 @@ " \t\t\tstatus = \"disabled\";\n" " \t\t};\n" " \n" - "+\t\ti2c_1: i2c@78b8000 { /* BLSP1 QUP4 */\n" + "+\t\ti2c_1: i2c at 78b8000 { /* BLSP1 QUP4 */\n" "+\t\t\tcompatible = \"qcom,i2c-qup-v2.2.1\";\n" "+\t\t\treg = <0x78b8000 0x600>;\n" "+\t\t\tinterrupts = <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>;\n" @@ -105,13 +88,13 @@ "+\t\t\tstatus = \"disabled\";\n" "+\t\t};\n" " \n" - " \t\tcryptobam: dma@8e04000 {\n" + " \t\tcryptobam: dma at 8e04000 {\n" " \t\t\tcompatible = \"qcom,bam-v1.7.0\";\n" "@@ -293,6 +332,101 @@\n" " \t\t\treg = <0x4ab000 0x4>;\n" " \t\t};\n" " \n" - "+\t\tpcie0: pci@40000000 {\n" + "+\t\tpcie0: pci at 40000000 {\n" "+\t\t\tcompatible = \"qcom,pcie-ipq4019\", \"snps,dw-pcie\";\n" "+\t\t\treg = <0x40000000 0xf1d\n" "+\t\t\t\t0x40000f20 0xa8\n" @@ -171,7 +154,7 @@ "+\t\t\tstatus = \"disabled\";\n" "+\t\t};\n" "+\n" - "+\t\tqpic_bam: dma@7984000 {\n" + "+\t\tqpic_bam: dma at 7984000 {\n" "+\t\t\tcompatible = \"qcom,bam-v1.7.0\";\n" "+\t\t\treg = <0x7984000 0x1a000>;\n" "+\t\t\tinterrupts = <GIC_SPI 101 IRQ_TYPE_LEVEL_HIGH>;\n" @@ -182,7 +165,7 @@ "+\t\t\tstatus = \"disabled\";\n" "+\t\t};\n" "+\n" - "+\t\tnand: qpic-nand@79b0000 {\n" + "+\t\tnand: qpic-nand at 79b0000 {\n" "+\t\t\tcompatible = \"qcom,ipq4019-nand\";\n" "+\t\t\treg = <0x79b0000 0x1000>;\n" "+\t\t\t#address-cells = <1>;\n" @@ -197,7 +180,7 @@ "+\t\t\tdma-names = \"tx\", \"rx\", \"cmd\";\n" "+\t\t\tstatus = \"disabled\";\n" "+\n" - "+\t\t\tnand@0 {\n" + "+\t\t\tnand at 0 {\n" "+\t\t\t\treg = <0>;\n" "+\n" "+\t\t\t\tnand-ecc-strength = <4>;\n" @@ -206,10 +189,10 @@ "+\t\t\t};\n" "+\t\t};\n" "+\n" - " \t\twifi0: wifi@a000000 {\n" + " \t\twifi0: wifi at a000000 {\n" " \t\t\tcompatible = \"qcom,ipq4019-wifi\";\n" " \t\t\treg = <0xa000000 0x200000>;\n" "-- \n" QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation -01373927bb62cd77358d98bf020cf2c6f40c5ad663c0add527c4ac229782e566 +2a05c1971c8d3f9f61038f26cfdc670658a9766ee055f25588da5a06b00ffc73
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.