diff for duplicates of <565D25E6.4070206@ti.com> diff --git a/a/content_digest b/N1/content_digest index 569676b..b3a898f 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -9,13 +9,13 @@ Mark Brown <broonie@kernel.org> Rob Herring <robh+dt@kernel.org> Russell King <linux@arm.linux.org.uk> - <hramrach@gmail.com> - <devicetree@vger.kernel.org> - <linux-kernel@vger.kernel.org> - <linux-omap@vger.kernel.org> - <linux-arm-kernel@lists.infradead.org> - <linux-mtd@lists.infradead.org> - " <linux-spi@vger.kernel.org>\0" + hramrach@gmail.com + devicetree@vger.kernel.org + linux-kernel@vger.kernel.org + linux-omap@vger.kernel.org + linux-arm-kernel@lists.infradead.org + linux-mtd@lists.infradead.org + " linux-spi@vger.kernel.org\0" "\00:1\0" "b\0" "\n" @@ -96,4 +96,4 @@ "Regards\n" Vignesh -33c23be075a1f050613327bd3a4c42237e2a3d308b0aa090c78b4bda47149602 +b8cd8b89fc3367ab000039af29a70f99b45c700610052ac49cb70065ffc52047
diff --git a/a/1.txt b/N2/1.txt index 30b6b01..a2e849b 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -10,13 +10,13 @@ On 12/01/2015 04:04 AM, Tony Lindgren wrote: > ... >> --- a/Documentation/devicetree/bindings/spi/ti_qspi.txt >> +++ b/Documentation/devicetree/bindings/spi/ti_qspi.txt ->> @@ -26,3 +26,17 @@ qspi: qspi@4b300000 { +>> @@ -26,3 +26,17 @@ qspi: qspi at 4b300000 { >> spi-max-frequency = <25000000>; >> ti,hwmods = "qspi"; >> }; >> + >> +For dra7xx: ->> +qspi: qspi@4b300000 { +>> +qspi: qspi at 4b300000 { >> + compatible = "ti,dra7xxx-qspi"; >> + reg = <0x4b300000 0x100>, >> + <0x5c000000 0x4000000>, diff --git a/a/content_digest b/N2/content_digest index 569676b..ef088b9 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,21 +1,10 @@ "ref\01448860515-28336-1-git-send-email-vigneshr@ti.com\0" "ref\01448860515-28336-5-git-send-email-vigneshr@ti.com\0" "ref\020151130223408.GJ23396@atomide.com\0" - "From\0Vignesh R <vigneshr@ti.com>\0" - "Subject\0Re: [PATCH v4 4/5] ARM: dts: DRA7: add entry for qspi mmap region\0" + "From\0vigneshr@ti.com (Vignesh R)\0" + "Subject\0[PATCH v4 4/5] ARM: dts: DRA7: add entry for qspi mmap region\0" "Date\0Tue, 1 Dec 2015 10:15:26 +0530\0" - "To\0Tony Lindgren <tony@atomide.com>\0" - "Cc\0Brian Norris <computersforpeace@gmail.com>" - Mark Brown <broonie@kernel.org> - Rob Herring <robh+dt@kernel.org> - Russell King <linux@arm.linux.org.uk> - <hramrach@gmail.com> - <devicetree@vger.kernel.org> - <linux-kernel@vger.kernel.org> - <linux-omap@vger.kernel.org> - <linux-arm-kernel@lists.infradead.org> - <linux-mtd@lists.infradead.org> - " <linux-spi@vger.kernel.org>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "\n" @@ -30,13 +19,13 @@ "> ...\n" ">> --- a/Documentation/devicetree/bindings/spi/ti_qspi.txt\n" ">> +++ b/Documentation/devicetree/bindings/spi/ti_qspi.txt\n" - ">> @@ -26,3 +26,17 @@ qspi: qspi@4b300000 {\n" + ">> @@ -26,3 +26,17 @@ qspi: qspi at 4b300000 {\n" ">> \tspi-max-frequency = <25000000>;\n" ">> \tti,hwmods = \"qspi\";\n" ">> };\n" ">> +\n" ">> +For dra7xx:\n" - ">> +qspi: qspi@4b300000 {\n" + ">> +qspi: qspi at 4b300000 {\n" ">> +\tcompatible = \"ti,dra7xxx-qspi\";\n" ">> +\treg = <0x4b300000 0x100>,\n" ">> +\t <0x5c000000 0x4000000>,\n" @@ -96,4 +85,4 @@ "Regards\n" Vignesh -33c23be075a1f050613327bd3a4c42237e2a3d308b0aa090c78b4bda47149602 +38ddd4d5c40c6e49c3499b54a3ac7f0f0ef855bbc905e2ad90f3aa985c7619cf
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.