diff for duplicates of <53D234BD.2040005@suse.de> diff --git a/a/1.txt b/N1/1.txt index ea49813..c12dde0 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -2,19 +2,19 @@ Hi Harini, Am 25.07.2014 12:31, schrieb Harini Katakam: >> -----Original Message----- ->> From: Michal Simek [mailto:michal.simek at xilinx.com] +>> From: Michal Simek [mailto:michal.simek-gjFFaj9aHVfQT0dZR+AlfA@public.gmane.org] >> Sent: Friday, July 25, 2014 3:08 PM ->> To: Andreas F?rber; monstr at monstr.eu; Soren Brinkmann +>> To: Andreas Färber; monstr-pSz03upnqPeHXe+LvDLADg@public.gmane.org; Soren Brinkmann >> Cc: Harini Katakam; Michal Simek; Andreas Olofsson; Matteo Vit; Sean ->> Rickerd; devicetree at vger.kernel.org; linux-arm-kernel at lists.infradead.org; ->> linux-kernel at vger.kernel.org; Rob Herring; Pawel Moll; Mark Rutland; Ian +>> Rickerd; devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org; linux-arm-kernel-IAPFreCvJWM9gwCICpdfJQ@public.gmane.orgd.org; +>> linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org; Rob Herring; Pawel Moll; Mark Rutland; Ian >> Campbell; Kumar Gala; Russell King >> Subject: Re: [PATCH v2 05/11] ARM: dts: zynq: Add QSPI for Parallella >> ->> On 07/25/2014 10:42 AM, Andreas F?rber wrote: +>> On 07/25/2014 10:42 AM, Andreas Färber wrote: >>> Am 25.07.2014 09:59, schrieb Michal Simek: ->>>> On 07/25/2014 01:18 AM, S?ren Brinkmann wrote: ->>>>> On Fri, 2014-07-25 at 01:00AM +0200, Andreas F?rber wrote: +>>>> On 07/25/2014 01:18 AM, Sören Brinkmann wrote: +>>>>> On Fri, 2014-07-25 at 01:00AM +0200, Andreas Färber wrote: >>>>>> Prepare SPI0 and SPI1 while at it. >>> >>>> Patch subject is incorrect. You are adding SPI and QSPI. @@ -23,7 +23,7 @@ Am 25.07.2014 12:31, schrieb Harini Katakam: >>> add SPI as well while already reading that part of the TRM. :) >>> >>>>>> ->>>>>> Signed-off-by: Andreas F?rber <afaerber@suse.de> --- v2: New +>>>>>> Signed-off-by: Andreas Färber <afaerber-l3A5Bk7waGM@public.gmane.org> --- v2: New >>>>>> >>>>>> arch/arm/boot/dts/zynq-7000.dtsi | 37 >>>>>> +++++++++++++++++++++++++++++++++++ @@ -36,7 +36,7 @@ Am 25.07.2014 12:31, schrieb Harini Katakam: >>>>>> b/arch/arm/boot/dts/zynq-7000.dtsi @@ -122,6 +122,30 @@ >>>>>> interrupts = <0 50 4>; }; >>>>>> ->>>>>> + spi0: spi at e0006000 { + compatible = +>>>>>> + spi0: spi@e0006000 { + compatible = >> "xlnx,zynq-spi-r1p6"; >>>>>> + reg = <0xe0006000 0x1000>; + status >> = "disabled"; + @@ -46,7 +46,7 @@ Am 25.07.2014 12:31, schrieb Harini Katakam: >> "ref_clk", >>>>>> "pclk"; + #address-cells = <1>; + #size- >> cells = <0>; + }; ->>>>>> + + spi1: spi at e0007000 { + compatible = +>>>>>> + + spi1: spi@e0007000 { + compatible = >>>>>> "xlnx,zynq-spi-r1p6"; + reg = <0xe0007000 0x1000>; + >> status >>>>>> = "disabled"; + interrupt-parent = <&intc>; + @@ -58,11 +58,11 @@ Am 25.07.2014 12:31, schrieb Harini Katakam: >>>>>> = <0>; + }; + >>>>> Until here things look good. >>>>> ->>>>>> gem0: ethernet at e000b000 { compatible = "cdns,gem"; reg = +>>>>>> gem0: ethernet@e000b000 { compatible = "cdns,gem"; reg = >>>>>> <0xe000b000 0x4000>; @@ -140,6 +164,19 @@ clock-names = "pclk", >>>>>> "hclk", "tx_clk"; }; >>>>>> ->>>>>> + qspi: qspi at e000d000 { + compatible = +>>>>>> + qspi: qspi@e000d000 { + compatible = >>>>>> "xlnx,zynq-spi-r1p6"; + reg = <0xe000d000 0x1000>; + >> status >>>>>> = "disabled"; + interrupt-parent = <&intc>; + @@ -95,5 +95,9 @@ being prepended before the SPI compatible string? Andreas -- -SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N?rnberg, Germany -GF: Jeff Hawn, Jennifer Guild, Felix Imend?rffer; HRB 16746 AG N?rnberg +SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany +GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg +-- +To unsubscribe from this list: send the line "unsubscribe devicetree" in +the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/a/content_digest b/N1/content_digest index d381254..bf491d1 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -5,29 +5,45 @@ "ref\053D21887.2020305@suse.de\0" "ref\053D2258B.9000609@xilinx.com\0" "ref\07aabd35a-0b4a-4d03-9976-ef3926929ddc@BL2FFO11FD027.protection.gbl\0" - "From\0afaerber@suse.de (Andreas F\303\244rber)\0" - "Subject\0[PATCH v2 05/11] ARM: dts: zynq: Add QSPI for Parallella\0" + "ref\07aabd35a-0b4a-4d03-9976-ef3926929ddc-xjCwUguQ558+FoeucOxqwGYJ4DzVTqeXkX/xN29GLwg@public.gmane.org\0" + "From\0Andreas F\303\244rber <afaerber-l3A5Bk7waGM@public.gmane.org>\0" + "Subject\0Re: [PATCH v2 05/11] ARM: dts: zynq: Add QSPI for Parallella\0" "Date\0Fri, 25 Jul 2014 12:43:09 +0200\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Harini Katakam <harini.katakam-gjFFaj9aHVfQT0dZR+AlfA@public.gmane.org>\0" + "Cc\0Michal Simek <michals-gjFFaj9aHVfQT0dZR+AlfA@public.gmane.org>" + monstr-pSz03upnqPeHXe+LvDLADg@public.gmane.org <monstr-pSz03upnqPeHXe+LvDLADg@public.gmane.org> + Soren Brinkmann <sorenb-gjFFaj9aHVfQT0dZR+AlfA@public.gmane.org> + Andreas Olofsson <andreas-hhg9azYwhpdWk0Htik3J/w@public.gmane.org> + Matteo Vit <matteo.vit-WGsyu9ztxDWovDFt+AQlJdBPR1lH4CV8@public.gmane.org> + Sean Rickerd <srickerd-IBi9RG/b67k@public.gmane.org> + devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org <devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> + linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org <linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org> + linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org <linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> + Rob Herring <robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> + Pawel Moll <pawel.moll-5wv7dgnIgG8@public.gmane.org> + Mark Rutland <mark.rutland-5wv7dgnIgG8@public.gmane.org> + Ian Campbell <ijc+devicetree-KcIKpvwj1kUDXYZnReoRVg@public.gmane.org> + Kumar Gala <galak-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org> + " Russell King <linux-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org>\0" "\00:1\0" "b\0" "Hi Harini,\n" "\n" "Am 25.07.2014 12:31, schrieb Harini Katakam:\n" ">> -----Original Message-----\n" - ">> From: Michal Simek [mailto:michal.simek at xilinx.com]\n" + ">> From: Michal Simek [mailto:michal.simek-gjFFaj9aHVfQT0dZR+AlfA@public.gmane.org]\n" ">> Sent: Friday, July 25, 2014 3:08 PM\n" - ">> To: Andreas F?rber; monstr at monstr.eu; Soren Brinkmann\n" + ">> To: Andreas F\303\244rber; monstr-pSz03upnqPeHXe+LvDLADg@public.gmane.org; Soren Brinkmann\n" ">> Cc: Harini Katakam; Michal Simek; Andreas Olofsson; Matteo Vit; Sean\n" - ">> Rickerd; devicetree at vger.kernel.org; linux-arm-kernel at lists.infradead.org;\n" - ">> linux-kernel at vger.kernel.org; Rob Herring; Pawel Moll; Mark Rutland; Ian\n" + ">> Rickerd; devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org; linux-arm-kernel-IAPFreCvJWM9gwCICpdfJQ@public.gmane.orgd.org;\n" + ">> linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org; Rob Herring; Pawel Moll; Mark Rutland; Ian\n" ">> Campbell; Kumar Gala; Russell King\n" ">> Subject: Re: [PATCH v2 05/11] ARM: dts: zynq: Add QSPI for Parallella\n" ">>\n" - ">> On 07/25/2014 10:42 AM, Andreas F?rber wrote:\n" + ">> On 07/25/2014 10:42 AM, Andreas F\303\244rber wrote:\n" ">>> Am 25.07.2014 09:59, schrieb Michal Simek:\n" - ">>>> On 07/25/2014 01:18 AM, S?ren Brinkmann wrote:\n" - ">>>>> On Fri, 2014-07-25 at 01:00AM +0200, Andreas F?rber wrote:\n" + ">>>> On 07/25/2014 01:18 AM, S\303\266ren Brinkmann wrote:\n" + ">>>>> On Fri, 2014-07-25 at 01:00AM +0200, Andreas F\303\244rber wrote:\n" ">>>>>> Prepare SPI0 and SPI1 while at it.\n" ">>>\n" ">>>> Patch subject is incorrect. You are adding SPI and QSPI.\n" @@ -36,7 +52,7 @@ ">>> add SPI as well while already reading that part of the TRM. :)\n" ">>>\n" ">>>>>>\n" - ">>>>>> Signed-off-by: Andreas F?rber <afaerber@suse.de> --- v2: New\n" + ">>>>>> Signed-off-by: Andreas F\303\244rber <afaerber-l3A5Bk7waGM@public.gmane.org> --- v2: New\n" ">>>>>>\n" ">>>>>> arch/arm/boot/dts/zynq-7000.dtsi | 37\n" ">>>>>> +++++++++++++++++++++++++++++++++++\n" @@ -49,7 +65,7 @@ ">>>>>> b/arch/arm/boot/dts/zynq-7000.dtsi @@ -122,6 +122,30 @@\n" ">>>>>> interrupts = <0 50 4>; };\n" ">>>>>>\n" - ">>>>>> +\t\tspi0: spi at e0006000 { +\t\t\tcompatible =\n" + ">>>>>> +\t\tspi0: spi@e0006000 { +\t\t\tcompatible =\n" ">> \"xlnx,zynq-spi-r1p6\";\n" ">>>>>> +\t\t\treg = <0xe0006000 0x1000>; +\t\t\tstatus\n" ">> = \"disabled\"; +\n" @@ -59,7 +75,7 @@ ">> \"ref_clk\",\n" ">>>>>> \"pclk\"; +\t\t\t#address-cells = <1>; +\t\t\t#size-\n" ">> cells = <0>; +\t\t};\n" - ">>>>>> + +\t\tspi1: spi at e0007000 { +\t\t\tcompatible =\n" + ">>>>>> + +\t\tspi1: spi@e0007000 { +\t\t\tcompatible =\n" ">>>>>> \"xlnx,zynq-spi-r1p6\"; +\t\t\treg = <0xe0007000 0x1000>; +\n" ">> \t\t\tstatus\n" ">>>>>> = \"disabled\"; +\t\t\tinterrupt-parent = <&intc>; +\n" @@ -71,11 +87,11 @@ ">>>>>> = <0>; +\t\t}; +\n" ">>>>> Until here things look good.\n" ">>>>>\n" - ">>>>>> gem0: ethernet at e000b000 { compatible = \"cdns,gem\"; reg =\n" + ">>>>>> gem0: ethernet@e000b000 { compatible = \"cdns,gem\"; reg =\n" ">>>>>> <0xe000b000 0x4000>; @@ -140,6 +164,19 @@ clock-names = \"pclk\",\n" ">>>>>> \"hclk\", \"tx_clk\"; };\n" ">>>>>>\n" - ">>>>>> +\t\tqspi: qspi at e000d000 { +\t\t\tcompatible =\n" + ">>>>>> +\t\tqspi: qspi@e000d000 { +\t\t\tcompatible =\n" ">>>>>> \"xlnx,zynq-spi-r1p6\"; +\t\t\treg = <0xe000d000 0x1000>; +\n" ">> \t\t\tstatus\n" ">>>>>> = \"disabled\"; +\t\t\tinterrupt-parent = <&intc>; +\n" @@ -108,7 +124,11 @@ "Andreas\n" "\n" "-- \n" - "SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N?rnberg, Germany\n" - GF: Jeff Hawn, Jennifer Guild, Felix Imend?rffer; HRB 16746 AG N?rnberg + "SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N\303\274rnberg, Germany\n" + "GF: Jeff Hawn, Jennifer Guild, Felix Imend\303\266rffer; HRB 16746 AG N\303\274rnberg\n" + "--\n" + "To unsubscribe from this list: send the line \"unsubscribe devicetree\" in\n" + "the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\n" + More majordomo info at http://vger.kernel.org/majordomo-info.html -be8bf8e7d5dd8f15f287142c5c7c9b20c47bee254429dba8c320322617541b3a +db781472e229db6331d583dd8b617a989f8e45dfcfe02d7e7451bbb99e32469b
diff --git a/a/1.txt b/N2/1.txt index ea49813..bdd6d66 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -2,19 +2,19 @@ Hi Harini, Am 25.07.2014 12:31, schrieb Harini Katakam: >> -----Original Message----- ->> From: Michal Simek [mailto:michal.simek at xilinx.com] +>> From: Michal Simek [mailto:michal.simek@xilinx.com] >> Sent: Friday, July 25, 2014 3:08 PM ->> To: Andreas F?rber; monstr at monstr.eu; Soren Brinkmann +>> To: Andreas Färber; monstr@monstr.eu; Soren Brinkmann >> Cc: Harini Katakam; Michal Simek; Andreas Olofsson; Matteo Vit; Sean ->> Rickerd; devicetree at vger.kernel.org; linux-arm-kernel at lists.infradead.org; ->> linux-kernel at vger.kernel.org; Rob Herring; Pawel Moll; Mark Rutland; Ian +>> Rickerd; devicetree@vger.kernel.org; linux-arm-kernel@lists.infradead.org; +>> linux-kernel@vger.kernel.org; Rob Herring; Pawel Moll; Mark Rutland; Ian >> Campbell; Kumar Gala; Russell King >> Subject: Re: [PATCH v2 05/11] ARM: dts: zynq: Add QSPI for Parallella >> ->> On 07/25/2014 10:42 AM, Andreas F?rber wrote: +>> On 07/25/2014 10:42 AM, Andreas Färber wrote: >>> Am 25.07.2014 09:59, schrieb Michal Simek: ->>>> On 07/25/2014 01:18 AM, S?ren Brinkmann wrote: ->>>>> On Fri, 2014-07-25 at 01:00AM +0200, Andreas F?rber wrote: +>>>> On 07/25/2014 01:18 AM, Sören Brinkmann wrote: +>>>>> On Fri, 2014-07-25 at 01:00AM +0200, Andreas Färber wrote: >>>>>> Prepare SPI0 and SPI1 while at it. >>> >>>> Patch subject is incorrect. You are adding SPI and QSPI. @@ -23,7 +23,7 @@ Am 25.07.2014 12:31, schrieb Harini Katakam: >>> add SPI as well while already reading that part of the TRM. :) >>> >>>>>> ->>>>>> Signed-off-by: Andreas F?rber <afaerber@suse.de> --- v2: New +>>>>>> Signed-off-by: Andreas Färber <afaerber@suse.de> --- v2: New >>>>>> >>>>>> arch/arm/boot/dts/zynq-7000.dtsi | 37 >>>>>> +++++++++++++++++++++++++++++++++++ @@ -36,7 +36,7 @@ Am 25.07.2014 12:31, schrieb Harini Katakam: >>>>>> b/arch/arm/boot/dts/zynq-7000.dtsi @@ -122,6 +122,30 @@ >>>>>> interrupts = <0 50 4>; }; >>>>>> ->>>>>> + spi0: spi at e0006000 { + compatible = +>>>>>> + spi0: spi@e0006000 { + compatible = >> "xlnx,zynq-spi-r1p6"; >>>>>> + reg = <0xe0006000 0x1000>; + status >> = "disabled"; + @@ -46,7 +46,7 @@ Am 25.07.2014 12:31, schrieb Harini Katakam: >> "ref_clk", >>>>>> "pclk"; + #address-cells = <1>; + #size- >> cells = <0>; + }; ->>>>>> + + spi1: spi at e0007000 { + compatible = +>>>>>> + + spi1: spi@e0007000 { + compatible = >>>>>> "xlnx,zynq-spi-r1p6"; + reg = <0xe0007000 0x1000>; + >> status >>>>>> = "disabled"; + interrupt-parent = <&intc>; + @@ -58,11 +58,11 @@ Am 25.07.2014 12:31, schrieb Harini Katakam: >>>>>> = <0>; + }; + >>>>> Until here things look good. >>>>> ->>>>>> gem0: ethernet at e000b000 { compatible = "cdns,gem"; reg = +>>>>>> gem0: ethernet@e000b000 { compatible = "cdns,gem"; reg = >>>>>> <0xe000b000 0x4000>; @@ -140,6 +164,19 @@ clock-names = "pclk", >>>>>> "hclk", "tx_clk"; }; >>>>>> ->>>>>> + qspi: qspi at e000d000 { + compatible = +>>>>>> + qspi: qspi@e000d000 { + compatible = >>>>>> "xlnx,zynq-spi-r1p6"; + reg = <0xe000d000 0x1000>; + >> status >>>>>> = "disabled"; + interrupt-parent = <&intc>; + @@ -95,5 +95,5 @@ being prepended before the SPI compatible string? Andreas -- -SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N?rnberg, Germany -GF: Jeff Hawn, Jennifer Guild, Felix Imend?rffer; HRB 16746 AG N?rnberg +SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany +GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg diff --git a/a/content_digest b/N2/content_digest index d381254..6d77d0f 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -5,29 +5,44 @@ "ref\053D21887.2020305@suse.de\0" "ref\053D2258B.9000609@xilinx.com\0" "ref\07aabd35a-0b4a-4d03-9976-ef3926929ddc@BL2FFO11FD027.protection.gbl\0" - "From\0afaerber@suse.de (Andreas F\303\244rber)\0" - "Subject\0[PATCH v2 05/11] ARM: dts: zynq: Add QSPI for Parallella\0" + "From\0Andreas F\303\244rber <afaerber@suse.de>\0" + "Subject\0Re: [PATCH v2 05/11] ARM: dts: zynq: Add QSPI for Parallella\0" "Date\0Fri, 25 Jul 2014 12:43:09 +0200\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Harini Katakam <harini.katakam@xilinx.com>\0" + "Cc\0Michal Simek <michals@xilinx.com>" + monstr@monstr.eu <monstr@monstr.eu> + Soren Brinkmann <sorenb@xilinx.com> + Andreas Olofsson <andreas@adapteva.com> + Matteo Vit <matteo.vit@starwaredesign.com> + Sean Rickerd <srickerd@suse.com> + devicetree@vger.kernel.org <devicetree@vger.kernel.org> + linux-arm-kernel@lists.infradead.org <linux-arm-kernel@lists.infradead.org> + linux-kernel@vger.kernel.org <linux-kernel@vger.kernel.org> + Rob Herring <robh+dt@kernel.org> + Pawel Moll <pawel.moll@arm.com> + Mark Rutland <mark.rutland@arm.com> + Ian Campbell <ijc+devicetree@hellion.org.uk> + Kumar Gala <galak@codeaurora.org> + " Russell King <linux@arm.linux.org.uk>\0" "\00:1\0" "b\0" "Hi Harini,\n" "\n" "Am 25.07.2014 12:31, schrieb Harini Katakam:\n" ">> -----Original Message-----\n" - ">> From: Michal Simek [mailto:michal.simek at xilinx.com]\n" + ">> From: Michal Simek [mailto:michal.simek@xilinx.com]\n" ">> Sent: Friday, July 25, 2014 3:08 PM\n" - ">> To: Andreas F?rber; monstr at monstr.eu; Soren Brinkmann\n" + ">> To: Andreas F\303\244rber; monstr@monstr.eu; Soren Brinkmann\n" ">> Cc: Harini Katakam; Michal Simek; Andreas Olofsson; Matteo Vit; Sean\n" - ">> Rickerd; devicetree at vger.kernel.org; linux-arm-kernel at lists.infradead.org;\n" - ">> linux-kernel at vger.kernel.org; Rob Herring; Pawel Moll; Mark Rutland; Ian\n" + ">> Rickerd; devicetree@vger.kernel.org; linux-arm-kernel@lists.infradead.org;\n" + ">> linux-kernel@vger.kernel.org; Rob Herring; Pawel Moll; Mark Rutland; Ian\n" ">> Campbell; Kumar Gala; Russell King\n" ">> Subject: Re: [PATCH v2 05/11] ARM: dts: zynq: Add QSPI for Parallella\n" ">>\n" - ">> On 07/25/2014 10:42 AM, Andreas F?rber wrote:\n" + ">> On 07/25/2014 10:42 AM, Andreas F\303\244rber wrote:\n" ">>> Am 25.07.2014 09:59, schrieb Michal Simek:\n" - ">>>> On 07/25/2014 01:18 AM, S?ren Brinkmann wrote:\n" - ">>>>> On Fri, 2014-07-25 at 01:00AM +0200, Andreas F?rber wrote:\n" + ">>>> On 07/25/2014 01:18 AM, S\303\266ren Brinkmann wrote:\n" + ">>>>> On Fri, 2014-07-25 at 01:00AM +0200, Andreas F\303\244rber wrote:\n" ">>>>>> Prepare SPI0 and SPI1 while at it.\n" ">>>\n" ">>>> Patch subject is incorrect. You are adding SPI and QSPI.\n" @@ -36,7 +51,7 @@ ">>> add SPI as well while already reading that part of the TRM. :)\n" ">>>\n" ">>>>>>\n" - ">>>>>> Signed-off-by: Andreas F?rber <afaerber@suse.de> --- v2: New\n" + ">>>>>> Signed-off-by: Andreas F\303\244rber <afaerber@suse.de> --- v2: New\n" ">>>>>>\n" ">>>>>> arch/arm/boot/dts/zynq-7000.dtsi | 37\n" ">>>>>> +++++++++++++++++++++++++++++++++++\n" @@ -49,7 +64,7 @@ ">>>>>> b/arch/arm/boot/dts/zynq-7000.dtsi @@ -122,6 +122,30 @@\n" ">>>>>> interrupts = <0 50 4>; };\n" ">>>>>>\n" - ">>>>>> +\t\tspi0: spi at e0006000 { +\t\t\tcompatible =\n" + ">>>>>> +\t\tspi0: spi@e0006000 { +\t\t\tcompatible =\n" ">> \"xlnx,zynq-spi-r1p6\";\n" ">>>>>> +\t\t\treg = <0xe0006000 0x1000>; +\t\t\tstatus\n" ">> = \"disabled\"; +\n" @@ -59,7 +74,7 @@ ">> \"ref_clk\",\n" ">>>>>> \"pclk\"; +\t\t\t#address-cells = <1>; +\t\t\t#size-\n" ">> cells = <0>; +\t\t};\n" - ">>>>>> + +\t\tspi1: spi at e0007000 { +\t\t\tcompatible =\n" + ">>>>>> + +\t\tspi1: spi@e0007000 { +\t\t\tcompatible =\n" ">>>>>> \"xlnx,zynq-spi-r1p6\"; +\t\t\treg = <0xe0007000 0x1000>; +\n" ">> \t\t\tstatus\n" ">>>>>> = \"disabled\"; +\t\t\tinterrupt-parent = <&intc>; +\n" @@ -71,11 +86,11 @@ ">>>>>> = <0>; +\t\t}; +\n" ">>>>> Until here things look good.\n" ">>>>>\n" - ">>>>>> gem0: ethernet at e000b000 { compatible = \"cdns,gem\"; reg =\n" + ">>>>>> gem0: ethernet@e000b000 { compatible = \"cdns,gem\"; reg =\n" ">>>>>> <0xe000b000 0x4000>; @@ -140,6 +164,19 @@ clock-names = \"pclk\",\n" ">>>>>> \"hclk\", \"tx_clk\"; };\n" ">>>>>>\n" - ">>>>>> +\t\tqspi: qspi at e000d000 { +\t\t\tcompatible =\n" + ">>>>>> +\t\tqspi: qspi@e000d000 { +\t\t\tcompatible =\n" ">>>>>> \"xlnx,zynq-spi-r1p6\"; +\t\t\treg = <0xe000d000 0x1000>; +\n" ">> \t\t\tstatus\n" ">>>>>> = \"disabled\"; +\t\t\tinterrupt-parent = <&intc>; +\n" @@ -108,7 +123,7 @@ "Andreas\n" "\n" "-- \n" - "SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N?rnberg, Germany\n" - GF: Jeff Hawn, Jennifer Guild, Felix Imend?rffer; HRB 16746 AG N?rnberg + "SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N\303\274rnberg, Germany\n" + "GF: Jeff Hawn, Jennifer Guild, Felix Imend\303\266rffer; HRB 16746 AG N\303\274rnberg" -be8bf8e7d5dd8f15f287142c5c7c9b20c47bee254429dba8c320322617541b3a +31223bbac45802a63f85aba5b14e29b77f23aac736439a9ee92065cf9f89aa74
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.