[PATCH] ARM: zynq: DT: Add USB to device tree

Sören Brinkmann
2014-12-01T23:16:13Z

On Tue, 2014-12-02 at 12:14AM +0100, Andreas F?rber wrote:
> Am 01.12.2014 um 23:56 schrieb S?ren Brinkmann:
> > On Mon, 2014-12-01 at 01:24PM -0800, S?ren Brinkmann wrote:
> >> On Mon, 2014-12-01 at 09:26PM +0100, Andreas F?rber wrote:
> >>> Am 01.12.2014 um 19:42 schrieb Soren Brinkmann:
> >>>> Add USB nodes to zc702, zc706 and zed device trees.
> >>>>
> >>>> Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com>
> >>>> ---
> >>>> arch/arm/boot/dts/zynq-7000.dtsi | 22 +++++++++++++++++++++-
> >>>> arch/arm/boot/dts/zynq-zc702.dts | 11 +++++++++++
> >>>> arch/arm/boot/dts/zynq-zc706.dts | 10 ++++++++++
> >>>> arch/arm/boot/dts/zynq-zed.dts | 10 ++++++++++
> >>>> 4 files changed, 52 insertions(+), 1 deletion(-)
> >>>>
> >>>> diff --git a/arch/arm/boot/dts/zynq-7000.dtsi b/arch/arm/boot/dts/zynq-7000.dtsi
> >>>> index ce2ef5bec4f2..9ed60938f301 100644
> >>>> --- a/arch/arm/boot/dts/zynq-7000.dtsi
> >>>> +++ b/arch/arm/boot/dts/zynq-7000.dtsi
> > [...]
> >>>> @@ -324,6 +344,6 @@
> >>>> reg = <0xf8005000 0x1000>;
> >>>> reset = <0>;
> >>>> timeout-sec = <10>;
> >>>> - };
> >>>> + } ;
> >>>> };
> >>>> };
> >>>
> >>> Unrelated accidental change here though. :)
> >
> > Since a v2 is needed now, does this really require a dedicated patch to
> > fix this bogus space here or do we just look the other way?
>
> Sorry, I don't understand the question: If as you say a v2 is needed,
> why knowingly introduce a space between } and ; in your patch? Maybe I'm
> missing something or you're looking at the patch in reverse...?

Oh, I thought I was removing it... That must have been some merge error.
Forget what I said. This part will vanish.

S?ren