diff mbox

ARM: dts: Add support for the BeagleBoard xM A/B

Message ID 1397574599-29573-1-git-send-email-robertcnelson@gmail.com (mailing list archive)
State New, archived
Headers show

Commit Message

Robert Nelson April 15, 2014, 3:09 p.m. UTC
BeagleBoard xM A/B has an inverted usb hub enable line vs the xM C

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
 arch/arm/boot/dts/Makefile               |  1 +
 arch/arm/boot/dts/omap3-beagle-xm-ab.dts | 15 +++++++++++++++
 2 files changed, 16 insertions(+)
 create mode 100644 arch/arm/boot/dts/omap3-beagle-xm-ab.dts

Comments

Robert Nelson April 15, 2014, 3:12 p.m. UTC | #1
On Tue, Apr 15, 2014 at 10:09 AM, Robert Nelson <robertcnelson@gmail.com> wrote:
> BeagleBoard xM A/B has an inverted usb hub enable line vs the xM C
>
> Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
> ---
>  arch/arm/boot/dts/Makefile               |  1 +
>  arch/arm/boot/dts/omap3-beagle-xm-ab.dts | 15 +++++++++++++++
>  2 files changed, 16 insertions(+)
>  create mode 100644 arch/arm/boot/dts/omap3-beagle-xm-ab.dts
>
> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
> index 35c146f..0bdeba3 100644
> --- a/arch/arm/boot/dts/Makefile
> +++ b/arch/arm/boot/dts/Makefile
> @@ -246,6 +246,7 @@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \
>         omap3-sbc-t3730.dtb \
>         omap3-devkit8000.dtb \
>         omap3-beagle-xm.dtb \
> +       omap3-beagle-xm-ab.dtb \
>         omap3-evm.dtb \
>         omap3-evm-37xx.dtb \
>         omap3-ldp.dtb \
> diff --git a/arch/arm/boot/dts/omap3-beagle-xm-ab.dts b/arch/arm/boot/dts/omap3-beagle-xm-ab.dts
> new file mode 100644
> index 0000000..9d81123
> --- /dev/null
> +++ b/arch/arm/boot/dts/omap3-beagle-xm-ab.dts
> @@ -0,0 +1,15 @@
> +/*
> + * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License version 2 as
> + * published by the Free Software Foundation.
> + */
> +
> +#include "omap3-beagle-xm.dts"
> +
> +/ {
> +       /* HS USB Port 2 Power enable was inverted with the xM C */
> +       hsusb2_power: hsusb2_power_reg {
> +               enable-active-high;
       };
> +};

Crap, copy paste bug, there.  I can send a v2, if you guys are happy
with the "omap3-beagle-xm-ab.dtb" naming..

Regards,
Nishanth Menon April 15, 2014, 3:35 p.m. UTC | #2
On 04/15/2014 10:12 AM, Robert Nelson wrote:
> On Tue, Apr 15, 2014 at 10:09 AM, Robert Nelson <robertcnelson@gmail.com> wrote:
>> BeagleBoard xM A/B has an inverted usb hub enable line vs the xM C
>>
>> Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
>> ---
>>  arch/arm/boot/dts/Makefile               |  1 +
>>  arch/arm/boot/dts/omap3-beagle-xm-ab.dts | 15 +++++++++++++++
>>  2 files changed, 16 insertions(+)
>>  create mode 100644 arch/arm/boot/dts/omap3-beagle-xm-ab.dts
>>
>> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
>> index 35c146f..0bdeba3 100644
>> --- a/arch/arm/boot/dts/Makefile
>> +++ b/arch/arm/boot/dts/Makefile
>> @@ -246,6 +246,7 @@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \
>>         omap3-sbc-t3730.dtb \
>>         omap3-devkit8000.dtb \
>>         omap3-beagle-xm.dtb \
>> +       omap3-beagle-xm-ab.dtb \
>>         omap3-evm.dtb \
>>         omap3-evm-37xx.dtb \
>>         omap3-ldp.dtb \
>> diff --git a/arch/arm/boot/dts/omap3-beagle-xm-ab.dts b/arch/arm/boot/dts/omap3-beagle-xm-ab.dts
>> new file mode 100644
>> index 0000000..9d81123
>> --- /dev/null
>> +++ b/arch/arm/boot/dts/omap3-beagle-xm-ab.dts
>> @@ -0,0 +1,15 @@
>> +/*
>> + * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
>> + *
>> + * This program is free software; you can redistribute it and/or modify
>> + * it under the terms of the GNU General Public License version 2 as
>> + * published by the Free Software Foundation.
>> + */
>> +
>> +#include "omap3-beagle-xm.dts"
>> +
>> +/ {
>> +       /* HS USB Port 2 Power enable was inverted with the xM C */
>> +       hsusb2_power: hsusb2_power_reg {
>> +               enable-active-high;
>        };
>> +};
> 
> Crap, copy paste bug, there.  I can send a v2, if you guys are happy
> with the "omap3-beagle-xm-ab.dtb" naming..
> 
> Regards,
> 
Will u-boot adequately handle this as part of find_fdt?
Robert Nelson April 15, 2014, 3:40 p.m. UTC | #3
On Tue, Apr 15, 2014 at 10:35 AM, Nishanth Menon <nm@ti.com> wrote:
> On 04/15/2014 10:12 AM, Robert Nelson wrote:
>> On Tue, Apr 15, 2014 at 10:09 AM, Robert Nelson <robertcnelson@gmail.com> wrote:
>>> BeagleBoard xM A/B has an inverted usb hub enable line vs the xM C
>>>
>>> Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
>>> ---
>>>  arch/arm/boot/dts/Makefile               |  1 +
>>>  arch/arm/boot/dts/omap3-beagle-xm-ab.dts | 15 +++++++++++++++
>>>  2 files changed, 16 insertions(+)
>>>  create mode 100644 arch/arm/boot/dts/omap3-beagle-xm-ab.dts
>>>
>>> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
>>> index 35c146f..0bdeba3 100644
>>> --- a/arch/arm/boot/dts/Makefile
>>> +++ b/arch/arm/boot/dts/Makefile
>>> @@ -246,6 +246,7 @@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \
>>>         omap3-sbc-t3730.dtb \
>>>         omap3-devkit8000.dtb \
>>>         omap3-beagle-xm.dtb \
>>> +       omap3-beagle-xm-ab.dtb \
>>>         omap3-evm.dtb \
>>>         omap3-evm-37xx.dtb \
>>>         omap3-ldp.dtb \
>>> diff --git a/arch/arm/boot/dts/omap3-beagle-xm-ab.dts b/arch/arm/boot/dts/omap3-beagle-xm-ab.dts
>>> new file mode 100644
>>> index 0000000..9d81123
>>> --- /dev/null
>>> +++ b/arch/arm/boot/dts/omap3-beagle-xm-ab.dts
>>> @@ -0,0 +1,15 @@
>>> +/*
>>> + * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
>>> + *
>>> + * This program is free software; you can redistribute it and/or modify
>>> + * it under the terms of the GNU General Public License version 2 as
>>> + * published by the Free Software Foundation.
>>> + */
>>> +
>>> +#include "omap3-beagle-xm.dts"
>>> +
>>> +/ {
>>> +       /* HS USB Port 2 Power enable was inverted with the xM C */
>>> +       hsusb2_power: hsusb2_power_reg {
>>> +               enable-active-high;
>>        };
>>> +};
>>
>> Crap, copy paste bug, there.  I can send a v2, if you guys are happy
>> with the "omap3-beagle-xm-ab.dtb" naming..
>>
>> Regards,
>>
> Will u-boot adequately handle this as part of find_fdt?

It will after i submit something like: (this uses a new feature in v2014.04)

https://github.com/eewiki/u-boot-patches/blob/master/v2014.04/0001-am335x_evm-uEnv.txt-bootz-n-fixes.patch#L76

Essentially, test for presence of omap3-beagle-xm-ab.dtb, if not found
drop to old omap3-beagle-xm.dtb

Background: i also tried getting this having this fixed in u-boot:

>
> --
> Regards,
> Nishanth Menon
Tony Lindgren April 18, 2014, 10:51 p.m. UTC | #4
* Robert Nelson <robertcnelson@gmail.com> [140415 08:46]:
> On Tue, Apr 15, 2014 at 10:35 AM, Nishanth Menon <nm@ti.com> wrote:
> > On 04/15/2014 10:12 AM, Robert Nelson wrote:
> >> On Tue, Apr 15, 2014 at 10:09 AM, Robert Nelson <robertcnelson@gmail.com> wrote:
> >>> BeagleBoard xM A/B has an inverted usb hub enable line vs the xM C
> >>>
> >>> Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
> >>> ---
> >>>  arch/arm/boot/dts/Makefile               |  1 +
> >>>  arch/arm/boot/dts/omap3-beagle-xm-ab.dts | 15 +++++++++++++++
> >>>  2 files changed, 16 insertions(+)
> >>>  create mode 100644 arch/arm/boot/dts/omap3-beagle-xm-ab.dts
> >>>
> >>> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
> >>> index 35c146f..0bdeba3 100644
> >>> --- a/arch/arm/boot/dts/Makefile
> >>> +++ b/arch/arm/boot/dts/Makefile
> >>> @@ -246,6 +246,7 @@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \
> >>>         omap3-sbc-t3730.dtb \
> >>>         omap3-devkit8000.dtb \
> >>>         omap3-beagle-xm.dtb \
> >>> +       omap3-beagle-xm-ab.dtb \
> >>>         omap3-evm.dtb \
> >>>         omap3-evm-37xx.dtb \
> >>>         omap3-ldp.dtb \
> >>> diff --git a/arch/arm/boot/dts/omap3-beagle-xm-ab.dts b/arch/arm/boot/dts/omap3-beagle-xm-ab.dts
> >>> new file mode 100644
> >>> index 0000000..9d81123
> >>> --- /dev/null
> >>> +++ b/arch/arm/boot/dts/omap3-beagle-xm-ab.dts
> >>> @@ -0,0 +1,15 @@
> >>> +/*
> >>> + * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
> >>> + *
> >>> + * This program is free software; you can redistribute it and/or modify
> >>> + * it under the terms of the GNU General Public License version 2 as
> >>> + * published by the Free Software Foundation.
> >>> + */
> >>> +
> >>> +#include "omap3-beagle-xm.dts"
> >>> +
> >>> +/ {
> >>> +       /* HS USB Port 2 Power enable was inverted with the xM C */
> >>> +       hsusb2_power: hsusb2_power_reg {
> >>> +               enable-active-high;
> >>        };
> >>> +};
> >>
> >> Crap, copy paste bug, there.  I can send a v2, if you guys are happy
> >> with the "omap3-beagle-xm-ab.dtb" naming..
> >>
> >> Regards,
> >>
> > Will u-boot adequately handle this as part of find_fdt?
> 
> It will after i submit something like: (this uses a new feature in v2014.04)
> 
> https://github.com/eewiki/u-boot-patches/blob/master/v2014.04/0001-am335x_evm-uEnv.txt-bootz-n-fixes.patch#L76
> 
> Essentially, test for presence of omap3-beagle-xm-ab.dtb, if not found
> drop to old omap3-beagle-xm.dtb
> 
> Background: i also tried getting this having this fixed in u-boot:

Do we still need to apply this patch then?

Tony
Robert Nelson April 18, 2014, 11:42 p.m. UTC | #5
On Fri, Apr 18, 2014 at 5:51 PM, Tony Lindgren <tony@atomide.com> wrote:
> * Robert Nelson <robertcnelson@gmail.com> [140415 08:46]:
>> On Tue, Apr 15, 2014 at 10:35 AM, Nishanth Menon <nm@ti.com> wrote:
>> > On 04/15/2014 10:12 AM, Robert Nelson wrote:
>> >> On Tue, Apr 15, 2014 at 10:09 AM, Robert Nelson <robertcnelson@gmail.com> wrote:
>> >>> BeagleBoard xM A/B has an inverted usb hub enable line vs the xM C
>> >>>
>> >>> Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
>> >>> ---
>> >>>  arch/arm/boot/dts/Makefile               |  1 +
>> >>>  arch/arm/boot/dts/omap3-beagle-xm-ab.dts | 15 +++++++++++++++
>> >>>  2 files changed, 16 insertions(+)
>> >>>  create mode 100644 arch/arm/boot/dts/omap3-beagle-xm-ab.dts
>> >>>
>> >>> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
>> >>> index 35c146f..0bdeba3 100644
>> >>> --- a/arch/arm/boot/dts/Makefile
>> >>> +++ b/arch/arm/boot/dts/Makefile
>> >>> @@ -246,6 +246,7 @@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \
>> >>>         omap3-sbc-t3730.dtb \
>> >>>         omap3-devkit8000.dtb \
>> >>>         omap3-beagle-xm.dtb \
>> >>> +       omap3-beagle-xm-ab.dtb \
>> >>>         omap3-evm.dtb \
>> >>>         omap3-evm-37xx.dtb \
>> >>>         omap3-ldp.dtb \
>> >>> diff --git a/arch/arm/boot/dts/omap3-beagle-xm-ab.dts b/arch/arm/boot/dts/omap3-beagle-xm-ab.dts
>> >>> new file mode 100644
>> >>> index 0000000..9d81123
>> >>> --- /dev/null
>> >>> +++ b/arch/arm/boot/dts/omap3-beagle-xm-ab.dts
>> >>> @@ -0,0 +1,15 @@
>> >>> +/*
>> >>> + * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
>> >>> + *
>> >>> + * This program is free software; you can redistribute it and/or modify
>> >>> + * it under the terms of the GNU General Public License version 2 as
>> >>> + * published by the Free Software Foundation.
>> >>> + */
>> >>> +
>> >>> +#include "omap3-beagle-xm.dts"
>> >>> +
>> >>> +/ {
>> >>> +       /* HS USB Port 2 Power enable was inverted with the xM C */
>> >>> +       hsusb2_power: hsusb2_power_reg {
>> >>> +               enable-active-high;
>> >>        };
>> >>> +};
>> >>
>> >> Crap, copy paste bug, there.  I can send a v2, if you guys are happy
>> >> with the "omap3-beagle-xm-ab.dtb" naming..
>> >>
>> >> Regards,
>> >>
>> > Will u-boot adequately handle this as part of find_fdt?
>>
>> It will after i submit something like: (this uses a new feature in v2014.04)
>>
>> https://github.com/eewiki/u-boot-patches/blob/master/v2014.04/0001-am335x_evm-uEnv.txt-bootz-n-fixes.patch#L76
>>
>> Essentially, test for presence of omap3-beagle-xm-ab.dtb, if not found
>> drop to old omap3-beagle-xm.dtb
>>
>> Background: i also tried getting this having this fixed in u-boot:
>
> Do we still need to apply this patch then?

Yeah, Tom want's it done in the kernel:

Here's my proposed u-boot patch:
http://lists.denx.de/pipermail/u-boot/2014-January/172154.html

and Tom's recommendation:
http://lists.denx.de/pipermail/u-boot/2014-January/172274.html

Once this hits mainline, i'll submit a patch to u-boot to check for
the presence of this version and drop to the old dtb if not found.

Regards,
Tony Lindgren April 18, 2014, 11:51 p.m. UTC | #6
* Robert Nelson <robertcnelson@gmail.com> [140418 16:42]:
> On Fri, Apr 18, 2014 at 5:51 PM, Tony Lindgren <tony@atomide.com> wrote:
> > * Robert Nelson <robertcnelson@gmail.com> [140415 08:46]:
> >>
> >> Background: i also tried getting this having this fixed in u-boot:
> >
> > Do we still need to apply this patch then?
> 
> Yeah, Tom want's it done in the kernel:
> 
> Here's my proposed u-boot patch:
> http://lists.denx.de/pipermail/u-boot/2014-January/172154.html
> 
> and Tom's recommendation:
> http://lists.denx.de/pipermail/u-boot/2014-January/172274.html
> 
> Once this hits mainline, i'll submit a patch to u-boot to check for
> the presence of this version and drop to the old dtb if not found.

OK applying into omap-for-v3.15/fixes thanks.

Tony
pekon gupta April 22, 2014, 6:49 a.m. UTC | #7
Tony,

>From: Tony Lindgren
>* Robert Nelson <robertcnelson@gmail.com> [140418 16:42]:
>> On Fri, Apr 18, 2014 at 5:51 PM, Tony Lindgren <tony@atomide.com> wrote:
>> > * Robert Nelson <robertcnelson@gmail.com> [140415 08:46]:
>> >>
>> >> Background: i also tried getting this having this fixed in u-boot:
>> >
>> > Do we still need to apply this patch then?
>>
>> Yeah, Tom want's it done in the kernel:
>>
>> Here's my proposed u-boot patch:
>> http://lists.denx.de/pipermail/u-boot/2014-January/172154.html
>>
>> and Tom's recommendation:
>> http://lists.denx.de/pipermail/u-boot/2014-January/172274.html
>>
>> Once this hits mainline, i'll submit a patch to u-boot to check for
>> the presence of this version and drop to the old dtb if not found.
>
>OK applying into omap-for-v3.15/fixes thanks.
>
>Tony

You probably missed fixing below typo before applying this patch.
omap3-beagle-xm-ab.dts breaks without this.

> +/ {
> +       /* HS USB Port 2 Power enable was inverted with the xM C */
> +       hsusb2_power: hsusb2_power_reg {
> +               enable-active-high;
       };
> +};


with regards, pekon
Tony Lindgren April 22, 2014, 2:03 p.m. UTC | #8
* Gupta, Pekon <pekon@ti.com> [140421 23:49]:
> Tony,
> 
> >From: Tony Lindgren
> >* Robert Nelson <robertcnelson@gmail.com> [140418 16:42]:
> >> On Fri, Apr 18, 2014 at 5:51 PM, Tony Lindgren <tony@atomide.com> wrote:
> >> > * Robert Nelson <robertcnelson@gmail.com> [140415 08:46]:
> >> >>
> >> >> Background: i also tried getting this having this fixed in u-boot:
> >> >
> >> > Do we still need to apply this patch then?
> >>
> >> Yeah, Tom want's it done in the kernel:
> >>
> >> Here's my proposed u-boot patch:
> >> http://lists.denx.de/pipermail/u-boot/2014-January/172154.html
> >>
> >> and Tom's recommendation:
> >> http://lists.denx.de/pipermail/u-boot/2014-January/172274.html
> >>
> >> Once this hits mainline, i'll submit a patch to u-boot to check for
> >> the presence of this version and drop to the old dtb if not found.
> >
> >OK applying into omap-for-v3.15/fixes thanks.
> >
> >Tony
> 
> You probably missed fixing below typo before applying this patch.
> omap3-beagle-xm-ab.dts breaks without this.

Yeah pushed out omap-for-v3.15/fixes-v2 with the missing bracket.

Regards,

Tony
Kevin Hilman April 24, 2014, 10:32 p.m. UTC | #9
Robert Nelson <robertcnelson@gmail.com> writes:

> BeagleBoard xM A/B has an inverted usb hub enable line vs the xM C
>
> Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
> ---
>  arch/arm/boot/dts/Makefile               |  1 +
>  arch/arm/boot/dts/omap3-beagle-xm-ab.dts | 15 +++++++++++++++
>  2 files changed, 16 insertions(+)
>  create mode 100644 arch/arm/boot/dts/omap3-beagle-xm-ab.dts
>
> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
> index 35c146f..0bdeba3 100644
> --- a/arch/arm/boot/dts/Makefile
> +++ b/arch/arm/boot/dts/Makefile
> @@ -246,6 +246,7 @@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \
>  	omap3-sbc-t3730.dtb \
>  	omap3-devkit8000.dtb \
>  	omap3-beagle-xm.dtb \
> +	omap3-beagle-xm-ab.dtb \
>  	omap3-evm.dtb \
>  	omap3-evm-37xx.dtb \
>  	omap3-ldp.dtb \
> diff --git a/arch/arm/boot/dts/omap3-beagle-xm-ab.dts b/arch/arm/boot/dts/omap3-beagle-xm-ab.dts
> new file mode 100644
> index 0000000..9d81123
> --- /dev/null
> +++ b/arch/arm/boot/dts/omap3-beagle-xm-ab.dts
> @@ -0,0 +1,15 @@
> +/*
> + * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License version 2 as
> + * published by the Free Software Foundation.
> + */
> +
> +#include "omap3-beagle-xm.dts"
> +
> +/ {
> +	/* HS USB Port 2 Power enable was inverted with the xM C */
> +	hsusb2_power: hsusb2_power_reg {
> +		enable-active-high;

Missing '};' here?

This causes build breakage in linux-omap master, which now has this
applied.

> +};

Kevin
Kevin Hilman April 24, 2014, 10:34 p.m. UTC | #10
Tony Lindgren <tony@atomide.com> writes:

> * Gupta, Pekon <pekon@ti.com> [140421 23:49]:
>> Tony,
>> 
>> >From: Tony Lindgren
>> >* Robert Nelson <robertcnelson@gmail.com> [140418 16:42]:
>> >> On Fri, Apr 18, 2014 at 5:51 PM, Tony Lindgren <tony@atomide.com> wrote:
>> >> > * Robert Nelson <robertcnelson@gmail.com> [140415 08:46]:
>> >> >>
>> >> >> Background: i also tried getting this having this fixed in u-boot:
>> >> >
>> >> > Do we still need to apply this patch then?
>> >>
>> >> Yeah, Tom want's it done in the kernel:
>> >>
>> >> Here's my proposed u-boot patch:
>> >> http://lists.denx.de/pipermail/u-boot/2014-January/172154.html
>> >>
>> >> and Tom's recommendation:
>> >> http://lists.denx.de/pipermail/u-boot/2014-January/172274.html
>> >>
>> >> Once this hits mainline, i'll submit a patch to u-boot to check for
>> >> the presence of this version and drop to the old dtb if not found.
>> >
>> >OK applying into omap-for-v3.15/fixes thanks.
>> >
>> >Tony
>> 
>> You probably missed fixing below typo before applying this patch.
>> omap3-beagle-xm-ab.dts breaks without this.
>
> Yeah pushed out omap-for-v3.15/fixes-v2 with the missing bracket.

Your master branch still has the one that doesn't compile.

Kevin
Kevin Hilman April 24, 2014, 11:21 p.m. UTC | #11
On Thu, Apr 24, 2014 at 3:32 PM, Kevin Hilman <khilman@linaro.org> wrote:
> Robert Nelson <robertcnelson@gmail.com> writes:
>
>> BeagleBoard xM A/B has an inverted usb hub enable line vs the xM C
>>
>> Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
>> ---
>>  arch/arm/boot/dts/Makefile               |  1 +
>>  arch/arm/boot/dts/omap3-beagle-xm-ab.dts | 15 +++++++++++++++
>>  2 files changed, 16 insertions(+)
>>  create mode 100644 arch/arm/boot/dts/omap3-beagle-xm-ab.dts
>>
>> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
>> index 35c146f..0bdeba3 100644
>> --- a/arch/arm/boot/dts/Makefile
>> +++ b/arch/arm/boot/dts/Makefile
>> @@ -246,6 +246,7 @@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \
>>       omap3-sbc-t3730.dtb \
>>       omap3-devkit8000.dtb \
>>       omap3-beagle-xm.dtb \
>> +     omap3-beagle-xm-ab.dtb \
>>       omap3-evm.dtb \
>>       omap3-evm-37xx.dtb \
>>       omap3-ldp.dtb \
>> diff --git a/arch/arm/boot/dts/omap3-beagle-xm-ab.dts b/arch/arm/boot/dts/omap3-beagle-xm-ab.dts
>> new file mode 100644
>> index 0000000..9d81123
>> --- /dev/null
>> +++ b/arch/arm/boot/dts/omap3-beagle-xm-ab.dts
>> @@ -0,0 +1,15 @@
>> +/*
>> + * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
>> + *
>> + * This program is free software; you can redistribute it and/or modify
>> + * it under the terms of the GNU General Public License version 2 as
>> + * published by the Free Software Foundation.
>> + */
>> +
>> +#include "omap3-beagle-xm.dts"
>> +
>> +/ {
>> +     /* HS USB Port 2 Power enable was inverted with the xM C */
>> +     hsusb2_power: hsusb2_power_reg {
>> +             enable-active-high;
>
> Missing '};' here?
>
> This causes build breakage in linux-omap master, which now has this
> applied.

ignore this.  It's already been fixed, but was still lingering in
Tony's master branch.

Kevin
Tony Lindgren April 24, 2014, 11:37 p.m. UTC | #12
* Kevin Hilman <khilman@linaro.org> [140424 16:22]:
> On Thu, Apr 24, 2014 at 3:32 PM, Kevin Hilman <khilman@linaro.org> wrote:
> > Robert Nelson <robertcnelson@gmail.com> writes:
> >
> >> BeagleBoard xM A/B has an inverted usb hub enable line vs the xM C
> >>
> >> Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
> >> ---
> >>  arch/arm/boot/dts/Makefile               |  1 +
> >>  arch/arm/boot/dts/omap3-beagle-xm-ab.dts | 15 +++++++++++++++
> >>  2 files changed, 16 insertions(+)
> >>  create mode 100644 arch/arm/boot/dts/omap3-beagle-xm-ab.dts
> >>
> >> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
> >> index 35c146f..0bdeba3 100644
> >> --- a/arch/arm/boot/dts/Makefile
> >> +++ b/arch/arm/boot/dts/Makefile
> >> @@ -246,6 +246,7 @@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \
> >>       omap3-sbc-t3730.dtb \
> >>       omap3-devkit8000.dtb \
> >>       omap3-beagle-xm.dtb \
> >> +     omap3-beagle-xm-ab.dtb \
> >>       omap3-evm.dtb \
> >>       omap3-evm-37xx.dtb \
> >>       omap3-ldp.dtb \
> >> diff --git a/arch/arm/boot/dts/omap3-beagle-xm-ab.dts b/arch/arm/boot/dts/omap3-beagle-xm-ab.dts
> >> new file mode 100644
> >> index 0000000..9d81123
> >> --- /dev/null
> >> +++ b/arch/arm/boot/dts/omap3-beagle-xm-ab.dts
> >> @@ -0,0 +1,15 @@
> >> +/*
> >> + * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
> >> + *
> >> + * This program is free software; you can redistribute it and/or modify
> >> + * it under the terms of the GNU General Public License version 2 as
> >> + * published by the Free Software Foundation.
> >> + */
> >> +
> >> +#include "omap3-beagle-xm.dts"
> >> +
> >> +/ {
> >> +     /* HS USB Port 2 Power enable was inverted with the xM C */
> >> +     hsusb2_power: hsusb2_power_reg {
> >> +             enable-active-high;
> >
> > Missing '};' here?
> >
> > This causes build breakage in linux-omap master, which now has this
> > applied.
> 
> ignore this.  It's already been fixed, but was still lingering in
> Tony's master branch.

Oops, sorry yeah looks like I forgot to remerge the updated fixes
branch. Will update it today.

Tony
diff mbox

Patch

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 35c146f..0bdeba3 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -246,6 +246,7 @@  dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \
 	omap3-sbc-t3730.dtb \
 	omap3-devkit8000.dtb \
 	omap3-beagle-xm.dtb \
+	omap3-beagle-xm-ab.dtb \
 	omap3-evm.dtb \
 	omap3-evm-37xx.dtb \
 	omap3-ldp.dtb \
diff --git a/arch/arm/boot/dts/omap3-beagle-xm-ab.dts b/arch/arm/boot/dts/omap3-beagle-xm-ab.dts
new file mode 100644
index 0000000..9d81123
--- /dev/null
+++ b/arch/arm/boot/dts/omap3-beagle-xm-ab.dts
@@ -0,0 +1,15 @@ 
+/*
+ * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include "omap3-beagle-xm.dts"
+
+/ {
+	/* HS USB Port 2 Power enable was inverted with the xM C */
+	hsusb2_power: hsusb2_power_reg {
+		enable-active-high;
+};