mbox

[GIT,PULL] at91: Device Tree update for 3.11 #2

Message ID 1371250067-19317-1-git-send-email-nicolas.ferre@atmel.com
State New
Headers show

Pull-request

git://github.com/at91linux/linux-at91.git tags/at91-dt

Message

Nicolas Ferre June 14, 2013, 10:47 p.m. UTC 
Arnd, Olof,

Additional pull-request for AT91 DT patches.
It contains the remaining part of the USB gadget pull-request that I sent you
last week. After having split it, here is the DT part.
It also contains the update of DMA bindings: it is the AT91 part the should go
through arm-soc. I have included the patch (ARM: at91: dt: add header to define
at_hdmac configuration) so that we avoid build errors whichever git tree
(slave-dma or arm-soc) is merged first.
A SPI DT patch for at91sam9x5 is also added.

Thanks, best regards,

The following changes since commit 028633c238f91dc113520a7ad25d37b2ba9068af:

  ARM: at91/dt: add pinctrl definition for at91 tc blocks (2013-05-31 22:40:37 +0200)

are available in the git repository at:

  git://github.com/at91linux/linux-at91.git tags/at91-dt

for you to fetch changes up to 24ce10e142e7b063c4ae4437dd3b290fbfafe052:

  ARM: at91: sam9m10g45ek add udc DT support (2013-06-15 00:15:22 +0200)

----------------------------------------------------------------
Again some nice DT updates for AT91:
- DMA binding update with one patch shared with slave-dma tree
- more SPI DT activation
- enable the USB gadget HS for DT platforms

----------------------------------------------------------------
Jean-Christophe PLAGNIOL-VILLARD (4):
      ARM: at91: sam9x5 add udc DT support
      ARM: at91: sam9x5ek add udc DT support
      ARM: at91: sam9g45 add udc DT support
      ARM: at91: sam9m10g45ek add udc DT support

Ludovic Desroches (2):
      ARM: at91: dt: add header to define at_hdmac configuration
      ARM: at91: dt: switch DMA DT bindings to pre-processor

Richard Genoud (1):
      ARM: at91: dt: at91sam9x5: add SPI DMA client infos

 arch/arm/boot/dts/at91sam9g45.dtsi     | 67 ++++++++++++++++++++++++++-
 arch/arm/boot/dts/at91sam9m10g45ek.dts |  5 ++
 arch/arm/boot/dts/at91sam9n12.dtsi     | 11 +++--
 arch/arm/boot/dts/at91sam9x5.dtsi      | 85 ++++++++++++++++++++++++++++++----
 arch/arm/boot/dts/at91sam9x5ek.dtsi    |  5 ++
 arch/arm/boot/dts/sama5d3.dtsi         | 19 ++++----
 arch/arm/mach-at91/at91sam9g45.c       |  2 +
 arch/arm/mach-at91/at91sam9x5.c        |  2 +
 include/dt-bindings/dma/at91.h         | 27 +++++++++++
 9 files changed, 199 insertions(+), 24 deletions(-)
 create mode 100644 include/dt-bindings/dma/at91.h

Comments

Olof Johansson June 15, 2013, 1:52 a.m. UTC | #1 
On Sat, Jun 15, 2013 at 12:47:47AM +0200, Nicolas Ferre wrote:
> Arnd, Olof,
> 
> Additional pull-request for AT91 DT patches.
> It contains the remaining part of the USB gadget pull-request that I sent you
> last week. After having split it, here is the DT part.
> It also contains the update of DMA bindings: it is the AT91 part the should go
> through arm-soc. I have included the patch (ARM: at91: dt: add header to define
> at_hdmac configuration) so that we avoid build errors whichever git tree
> (slave-dma or arm-soc) is merged first.
> A SPI DT patch for at91sam9x5 is also added.
> 
> Thanks, best regards,
> 
> The following changes since commit 028633c238f91dc113520a7ad25d37b2ba9068af:
> 
>   ARM: at91/dt: add pinctrl definition for at91 tc blocks (2013-05-31 22:40:37 +0200)
> 
> are available in the git repository at:
> 
>   git://github.com/at91linux/linux-at91.git tags/at91-dt

Pulled, thanks.


-Olof
Nicolas Ferre June 17, 2013, 8:34 a.m. UTC | #2 
>On Sat, Jun 15, 2013 at 12:47:47AM +0200, Nicolas Ferre wrote:
>> Arnd, Olof,
>>
>> Additional pull-request for AT91 DT patches.
>> It contains the remaining part of the USB gadget pull-request that I sent you
>> last week. After having split it, here is the DT part.
>> It also contains the update of DMA bindings: it is the AT91 part the should go
>> through arm-soc. I have included the patch (ARM: at91: dt: add header to define
>> at_hdmac configuration) so that we avoid build errors whichever git tree
>> (slave-dma or arm-soc) is merged first.
>> A SPI DT patch for at91sam9x5 is also added.
>>
>> Thanks, best regards,
>>
>> The following changes since commit 028633c238f91dc113520a7ad25d37b2ba9068af:
>>
>>   ARM: at91/dt: add pinctrl definition for at91 tc blocks (2013-05-31 22:40:37 +0200)
>>
>> are available in the git repository at:
>>
>>   git://github.com/at91linux/linux-at91.git tags/at91-dt
>
>Pulled, thanks.

Hi,

I do not see it appearing in arm-soc/at91/dt branch even though is it present in arm-soc/for-next: is it normal?

Bye,
Olof Johansson June 17, 2013, 4:56 p.m. UTC | #3 
On Mon, Jun 17, 2013 at 1:34 AM, Ferre, Nicolas <Nicolas.FERRE@atmel.com> wrote:
>
>>On Sat, Jun 15, 2013 at 12:47:47AM +0200, Nicolas Ferre wrote:
>>> Arnd, Olof,
>>>
>>> Additional pull-request for AT91 DT patches.
>>> It contains the remaining part of the USB gadget pull-request that I sent you
>>> last week. After having split it, here is the DT part.
>>> It also contains the update of DMA bindings: it is the AT91 part the should go
>>> through arm-soc. I have included the patch (ARM: at91: dt: add header to define
>>> at_hdmac configuration) so that we avoid build errors whichever git tree
>>> (slave-dma or arm-soc) is merged first.
>>> A SPI DT patch for at91sam9x5 is also added.
>>>
>>> Thanks, best regards,
>>>
>>> The following changes since commit 028633c238f91dc113520a7ad25d37b2ba9068af:
>>>
>>>   ARM: at91/dt: add pinctrl definition for at91 tc blocks (2013-05-31 22:40:37 +0200)
>>>
>>> are available in the git repository at:
>>>
>>>   git://github.com/at91linux/linux-at91.git tags/at91-dt
>>
>>Pulled, thanks.
>
> Hi,
>
> I do not see it appearing in arm-soc/at91/dt branch even though is it present in arm-soc/for-next: is it normal?

I had missed to push that (and the driver branch) up. They are there
now, as at91/dt2 and at91/drivers. Fixed the bad branch name in
arm-soc-for-next-contents.txt as well.


-Olof
Nicolas Ferre June 18, 2013, 8:05 a.m. UTC | #4 
On 17/06/2013 18:56, Olof Johansson :
> On Mon, Jun 17, 2013 at 1:34 AM, Ferre, Nicolas <Nicolas.FERRE@atmel.com> wrote:
>>
>>> On Sat, Jun 15, 2013 at 12:47:47AM +0200, Nicolas Ferre wrote:
>>>> Arnd, Olof,
>>>>
>>>> Additional pull-request for AT91 DT patches.
>>>> It contains the remaining part of the USB gadget pull-request that I sent you
>>>> last week. After having split it, here is the DT part.
>>>> It also contains the update of DMA bindings: it is the AT91 part the should go
>>>> through arm-soc. I have included the patch (ARM: at91: dt: add header to define
>>>> at_hdmac configuration) so that we avoid build errors whichever git tree
>>>> (slave-dma or arm-soc) is merged first.
>>>> A SPI DT patch for at91sam9x5 is also added.
>>>>
>>>> Thanks, best regards,
>>>>
>>>> The following changes since commit 028633c238f91dc113520a7ad25d37b2ba9068af:
>>>>
>>>>    ARM: at91/dt: add pinctrl definition for at91 tc blocks (2013-05-31 22:40:37 +0200)
>>>>
>>>> are available in the git repository at:
>>>>
>>>>    git://github.com/at91linux/linux-at91.git tags/at91-dt
>>>
>>> Pulled, thanks.
>>
>> Hi,
>>
>> I do not see it appearing in arm-soc/at91/dt branch even though is it present in arm-soc/for-next: is it normal?
>
> I had missed to push that (and the driver branch) up. They are there
> now, as at91/dt2 and at91/drivers. Fixed the bad branch name in
> arm-soc-for-next-contents.txt as well.

Nice, thanks.

Bye,