* Re: [GIT PULL v2] at91: USBA DT support / drivers update for 3.11 #1
2013-06-03 17:05 ` [GIT PULL v2] at91: USBA DT support / drivers update for 3.11 #1 Nicolas Ferre
@ 2013-06-03 17:10 ` Nicolas Ferre
2013-06-11 23:48 ` Olof Johansson
` (2 subsequent siblings)
3 siblings, 0 replies; 12+ messages in thread
From: Nicolas Ferre @ 2013-06-03 17:10 UTC (permalink / raw)
To: Arnd Bergmann, Olof Johansson
Cc: Linux Kernel list, linux-arm-kernel,
Jean-Christophe PLAGNIOL-VILLARD, Ludovic Desroches
On 03/06/2013 19:05, Nicolas Ferre :
> Arnd, Olof,
>
> This is a rework of the previous pull-request done by Jean-Christophe
> PLAGNIOL-VILLARD last week ([GIT PULL] at91: USBA DT support for 3.11).
> You should see that this material is based on the cleanup branch that you
> already have in arm-soc/at91/cleanup.
>
> This adds the DT support for USBA gadget driver present in the most recent
> AT91 SoCs.
> As agreed with Arnd and Felipe we send these drivers updates via arm-soc.
>
> Thanks, best regards,
>
> The following changes since commit b3f442b0eedbc20b5ce3f4a96530588d14901199:
>
> ARM: at91: udpate defconfigs (2013-05-17 15:05:08 +0200)
>
> are available in the git repository at:
>
> git://github.com/at91linux/linux-at91.git tags/at91-drivers
>
> for you to fetch changes up to a375f12dde25a7e89acd75d066d0225657d7dfc2:
>
> ARM: at91: sam9m10g45ek add udc DT support (2013-05-24 07:15:20 +0800)
>
> ----------------------------------------------------------------
> Adding the DT support to UBB gadget High-Speed aka usba.
---------------------------^^^
Typo corrected in "at91-drivers" tag pushed now! (sorry for the noise).
> It updates the driver and all device tree files
>
> ----------------------------------------------------------------
> Jean-Christophe PLAGNIOL-VILLARD (7):
> USB: gadget: atmel_usba: move global struct usba_ep usba_ep to struct usba_udc
> USB: gadget: atmel_usba: allow multi instance
> USB: gadget: atmel_usba: add DT support
> 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
>
> .../devicetree/bindings/usb/atmel-usb.txt | 82 +++++++
> arch/arm/boot/dts/at91sam9g45.dtsi | 62 +++++
> arch/arm/boot/dts/at91sam9m10g45ek.dts | 5 +
> arch/arm/boot/dts/at91sam9x5.dtsi | 62 +++++
> arch/arm/boot/dts/at91sam9x5ek.dtsi | 5 +
> arch/arm/mach-at91/at91sam9g45.c | 2 +
> arch/arm/mach-at91/at91sam9x5.c | 2 +
> drivers/usb/gadget/Kconfig | 2 +-
> drivers/usb/gadget/atmel_usba_udc.c | 264 ++++++++++++++-------
> drivers/usb/gadget/atmel_usba_udc.h | 2 +
> 10 files changed, 407 insertions(+), 81 deletions(-)
>
--
Nicolas Ferre
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [GIT PULL v2] at91: USBA DT support / drivers update for 3.11 #1
2013-06-03 17:05 ` [GIT PULL v2] at91: USBA DT support / drivers update for 3.11 #1 Nicolas Ferre
2013-06-03 17:10 ` Nicolas Ferre
@ 2013-06-11 23:48 ` Olof Johansson
2013-06-14 21:46 ` Nicolas Ferre
2013-06-14 22:02 ` [GIT PULL v3] " Nicolas Ferre
2013-06-14 22:47 ` [GIT PULL] at91: Device Tree update for 3.11 #2 Nicolas Ferre
3 siblings, 1 reply; 12+ messages in thread
From: Olof Johansson @ 2013-06-11 23:48 UTC (permalink / raw)
To: Nicolas Ferre
Cc: Arnd Bergmann, Linux Kernel list, linux-arm-kernel,
Jean-Christophe PLAGNIOL-VILLARD, Ludovic Desroches
On Mon, Jun 03, 2013 at 07:05:39PM +0200, Nicolas Ferre wrote:
> Arnd, Olof,
>
> This is a rework of the previous pull-request done by Jean-Christophe
> PLAGNIOL-VILLARD last week ([GIT PULL] at91: USBA DT support for 3.11).
> You should see that this material is based on the cleanup branch that you
> already have in arm-soc/at91/cleanup.
>
> This adds the DT support for USBA gadget driver present in the most recent
> AT91 SoCs.
> As agreed with Arnd and Felipe we send these drivers updates via arm-soc.
>
> Thanks, best regards,
>
> The following changes since commit b3f442b0eedbc20b5ce3f4a96530588d14901199:
>
> ARM: at91: udpate defconfigs (2013-05-17 15:05:08 +0200)
>
> are available in the git repository at:
>
> git://github.com/at91linux/linux-at91.git tags/at91-drivers
>
> for you to fetch changes up to a375f12dde25a7e89acd75d066d0225657d7dfc2:
>
> ARM: at91: sam9m10g45ek add udc DT support (2013-05-24 07:15:20 +0800)
>
> ----------------------------------------------------------------
> Adding the DT support to UBB gadget High-Speed aka usba.
> It updates the driver and all device tree files
>
> ----------------------------------------------------------------
> Jean-Christophe PLAGNIOL-VILLARD (7):
> USB: gadget: atmel_usba: move global struct usba_ep usba_ep to struct usba_udc
> USB: gadget: atmel_usba: allow multi instance
> USB: gadget: atmel_usba: add DT support
> 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
Hi,
So, now you have multiple branches updating the DT files on at91, and they all
conflict due to add/add or add/change.
This branch is really two separate things already: three driver patches for
next/drivers, and 4 devicetree updates that can go on top of the previous
at91/dt branch. That should remove every DT conflict.
Care to reshuffle?
Thanks,
-Olof
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [GIT PULL v2] at91: USBA DT support / drivers update for 3.11 #1
2013-06-11 23:48 ` Olof Johansson
@ 2013-06-14 21:46 ` Nicolas Ferre
0 siblings, 0 replies; 12+ messages in thread
From: Nicolas Ferre @ 2013-06-14 21:46 UTC (permalink / raw)
To: Olof Johansson
Cc: Arnd Bergmann, Linux Kernel list, linux-arm-kernel,
Jean-Christophe PLAGNIOL-VILLARD, Ludovic Desroches
On 12/06/2013 01:48, Olof Johansson :
> On Mon, Jun 03, 2013 at 07:05:39PM +0200, Nicolas Ferre wrote:
>> Arnd, Olof,
>>
>> This is a rework of the previous pull-request done by Jean-Christophe
>> PLAGNIOL-VILLARD last week ([GIT PULL] at91: USBA DT support for 3.11).
>> You should see that this material is based on the cleanup branch that you
>> already have in arm-soc/at91/cleanup.
>>
>> This adds the DT support for USBA gadget driver present in the most recent
>> AT91 SoCs.
>> As agreed with Arnd and Felipe we send these drivers updates via arm-soc.
>>
>> Thanks, best regards,
>>
>> The following changes since commit b3f442b0eedbc20b5ce3f4a96530588d14901199:
>>
>> ARM: at91: udpate defconfigs (2013-05-17 15:05:08 +0200)
>>
>> are available in the git repository at:
>>
>> git://github.com/at91linux/linux-at91.git tags/at91-drivers
>>
>> for you to fetch changes up to a375f12dde25a7e89acd75d066d0225657d7dfc2:
>>
>> ARM: at91: sam9m10g45ek add udc DT support (2013-05-24 07:15:20 +0800)
>>
>> ----------------------------------------------------------------
>> Adding the DT support to UBB gadget High-Speed aka usba.
>> It updates the driver and all device tree files
>>
>> ----------------------------------------------------------------
>> Jean-Christophe PLAGNIOL-VILLARD (7):
>> USB: gadget: atmel_usba: move global struct usba_ep usba_ep to struct usba_udc
>> USB: gadget: atmel_usba: allow multi instance
>> USB: gadget: atmel_usba: add DT support
>> 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
>
> Hi,
>
> So, now you have multiple branches updating the DT files on at91, and they all
> conflict due to add/add or add/change.
>
> This branch is really two separate things already: three driver patches for
> next/drivers, and 4 devicetree updates that can go on top of the previous
> at91/dt branch. That should remove every DT conflict.
>
> Care to reshuffle?
Olof,
I try to rework this right now and send you two new pull-requests for
these topics.
Bye,
--
Nicolas Ferre
^ permalink raw reply [flat|nested] 12+ messages in thread
* [GIT PULL v3] at91: USBA DT support / drivers update for 3.11 #1
2013-06-03 17:05 ` [GIT PULL v2] at91: USBA DT support / drivers update for 3.11 #1 Nicolas Ferre
2013-06-03 17:10 ` Nicolas Ferre
2013-06-11 23:48 ` Olof Johansson
@ 2013-06-14 22:02 ` Nicolas Ferre
2013-06-15 2:03 ` Olof Johansson
2013-06-14 22:47 ` [GIT PULL] at91: Device Tree update for 3.11 #2 Nicolas Ferre
3 siblings, 1 reply; 12+ messages in thread
From: Nicolas Ferre @ 2013-06-14 22:02 UTC (permalink / raw)
To: Arnd Bergmann, Olof Johansson
Cc: balbi, Nicolas Ferre, Linux Kernel list, linux-arm-kernel,
Jean-Christophe PLAGNIOL-VILLARD, Ludovic Desroches
Arnd, Olof,
This is a rework of the previous pull-request done by Jean-Christophe
PLAGNIOL-VILLARD ([GIT PULL] at91: USBA DT support for 3.11).
It is also the division of my previous pull request (v2) to extract only
patches related to drivers. The DT patches will be stacked on top of our
arm-soc/at91/dt branch in an upcoming pull-request.
You should see that this material is based on the cleanup branch that you
already have in arm-soc/at91/cleanup.
This adds the DT support for USBA gadget driver present in the most recent
AT91 SoCs.
As agreed with Arnd and Felipe we send these drivers updates via arm-soc.
Thanks, best regards,
The following changes since commit b3f442b0eedbc20b5ce3f4a96530588d14901199:
ARM: at91: udpate defconfigs (2013-05-17 15:05:08 +0200)
are available in the git repository at:
git://github.com/at91linux/linux-at91.git tags/at91-drivers
for you to fetch changes up to 4a3ae9324ebeb9715369d2bca799bfd7dcff6dd7:
USB: gadget: atmel_usba: add DT support (2013-05-24 07:14:45 +0800)
----------------------------------------------------------------
Adding the DT support to USB gadget High-Speed aka usba.
----------------------------------------------------------------
Jean-Christophe PLAGNIOL-VILLARD (3):
USB: gadget: atmel_usba: move global struct usba_ep usba_ep to struct usba_udc
USB: gadget: atmel_usba: allow multi instance
USB: gadget: atmel_usba: add DT support
.../devicetree/bindings/usb/atmel-usb.txt | 82 +++++++
drivers/usb/gadget/Kconfig | 2 +-
drivers/usb/gadget/atmel_usba_udc.c | 264 ++++++++++++++-------
drivers/usb/gadget/atmel_usba_udc.h | 2 +
4 files changed, 269 insertions(+), 81 deletions(-)
--
Nicolas Ferre
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [GIT PULL v3] at91: USBA DT support / drivers update for 3.11 #1
2013-06-14 22:02 ` [GIT PULL v3] " Nicolas Ferre
@ 2013-06-15 2:03 ` Olof Johansson
2013-06-17 9:05 ` RE : " Ferre, Nicolas
0 siblings, 1 reply; 12+ messages in thread
From: Olof Johansson @ 2013-06-15 2:03 UTC (permalink / raw)
To: Nicolas Ferre
Cc: Arnd Bergmann, balbi, Linux Kernel list, linux-arm-kernel,
Jean-Christophe PLAGNIOL-VILLARD, Ludovic Desroches
On Sat, Jun 15, 2013 at 12:02:44AM +0200, Nicolas Ferre wrote:
> Arnd, Olof,
>
> This is a rework of the previous pull-request done by Jean-Christophe
> PLAGNIOL-VILLARD ([GIT PULL] at91: USBA DT support for 3.11).
> It is also the division of my previous pull request (v2) to extract only
> patches related to drivers. The DT patches will be stacked on top of our
> arm-soc/at91/dt branch in an upcoming pull-request.
> You should see that this material is based on the cleanup branch that you
> already have in arm-soc/at91/cleanup.
>
> This adds the DT support for USBA gadget driver present in the most recent
> AT91 SoCs.
> As agreed with Arnd and Felipe we send these drivers updates via arm-soc.
>
> Thanks, best regards,
>
> The following changes since commit b3f442b0eedbc20b5ce3f4a96530588d14901199:
>
> ARM: at91: udpate defconfigs (2013-05-17 15:05:08 +0200)
>
> are available in the git repository at:
>
> git://github.com/at91linux/linux-at91.git tags/at91-drivers
Pulled, thanks. This had conflicts with some code from fixes. The change/remove
ones were easy (cs-gpio vs interrupts), but there was one dealing with pinctrl.
PLease double-check that there wasn't a need to carry over a fix to the
include-file-based version.
-Olof
^ permalink raw reply [flat|nested] 12+ messages in thread
* RE : [GIT PULL v3] at91: USBA DT support / drivers update for 3.11 #1
2013-06-15 2:03 ` Olof Johansson
@ 2013-06-17 9:05 ` Ferre, Nicolas
0 siblings, 0 replies; 12+ messages in thread
From: Ferre, Nicolas @ 2013-06-17 9:05 UTC (permalink / raw)
To: Olof Johansson, Arnd Bergmann
Cc: balbi@ti.com, Linux Kernel list, linux-arm-kernel,
Jean-Christophe PLAGNIOL-VILLARD, Desroches, Ludovic
From: Olof Johansson [olof@lixom.net]
>On Sat, Jun 15, 2013 at 12:02:44AM +0200, Nicolas Ferre wrote:
>> Arnd, Olof,
>>
>> This is a rework of the previous pull-request done by Jean-Christophe
>> PLAGNIOL-VILLARD ([GIT PULL] at91: USBA DT support for 3.11).
>> It is also the division of my previous pull request (v2) to extract only
>> patches related to drivers. The DT patches will be stacked on top of our
>> arm-soc/at91/dt branch in an upcoming pull-request.
>> You should see that this material is based on the cleanup branch that you
>> already have in arm-soc/at91/cleanup.
>>
>> This adds the DT support for USBA gadget driver present in the most recent
>> AT91 SoCs.
>> As agreed with Arnd and Felipe we send these drivers updates via arm-soc.
>>
>> Thanks, best regards,
>>
>> The following changes since commit b3f442b0eedbc20b5ce3f4a96530588d14901199:
>>
>> ARM: at91: udpate defconfigs (2013-05-17 15:05:08 +0200)
>>
>> are available in the git repository at:
>>
>> git://github.com/at91linux/linux-at91.git tags/at91-drivers
>
>Pulled, thanks. This had conflicts with some code from fixes. The change/remove
>ones were easy (cs-gpio vs interrupts), but there was one dealing with pinctrl.
>PLease double-check that there wasn't a need to carry over a fix to the
>include-file-based version.
I have just double-checked and your resolution about pinctrl is right. Thanks a lot Olof.
(note that I do not see the arm-soc/at91/drivers branch...)
Bye,
^ permalink raw reply [flat|nested] 12+ messages in thread
* [GIT PULL] at91: Device Tree update for 3.11 #2
2013-06-03 17:05 ` [GIT PULL v2] at91: USBA DT support / drivers update for 3.11 #1 Nicolas Ferre
` (2 preceding siblings ...)
2013-06-14 22:02 ` [GIT PULL v3] " Nicolas Ferre
@ 2013-06-14 22:47 ` Nicolas Ferre
2013-06-15 1:52 ` Olof Johansson
3 siblings, 1 reply; 12+ messages in thread
From: Nicolas Ferre @ 2013-06-14 22:47 UTC (permalink / raw)
To: Arnd Bergmann, Olof Johansson
Cc: balbi, richard.genoud, voice.shen, vinod.koul, Nicolas Ferre,
Linux Kernel list, linux-arm-kernel,
Jean-Christophe PLAGNIOL-VILLARD, Ludovic Desroches
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
--
Nicolas Ferre
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [GIT PULL] at91: Device Tree update for 3.11 #2
2013-06-14 22:47 ` [GIT PULL] at91: Device Tree update for 3.11 #2 Nicolas Ferre
@ 2013-06-15 1:52 ` Olof Johansson
2013-06-17 8:34 ` RE : " Ferre, Nicolas
0 siblings, 1 reply; 12+ messages in thread
From: Olof Johansson @ 2013-06-15 1:52 UTC (permalink / raw)
To: Nicolas Ferre
Cc: Arnd Bergmann, balbi, richard.genoud, voice.shen, vinod.koul,
Linux Kernel list, linux-arm-kernel,
Jean-Christophe PLAGNIOL-VILLARD, Ludovic Desroches
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
^ permalink raw reply [flat|nested] 12+ messages in thread
* RE : [GIT PULL] at91: Device Tree update for 3.11 #2
2013-06-15 1:52 ` Olof Johansson
@ 2013-06-17 8:34 ` Ferre, Nicolas
2013-06-17 16:56 ` Olof Johansson
0 siblings, 1 reply; 12+ messages in thread
From: Ferre, Nicolas @ 2013-06-17 8:34 UTC (permalink / raw)
To: Olof Johansson, Arnd Bergmann
Cc: balbi@ti.com, richard.genoud@gmail.com, Shen, Voice,
vinod.koul@intel.com, Linux Kernel list, linux-arm-kernel,
Jean-Christophe PLAGNIOL-VILLARD, Desroches, Ludovic
>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,
--
Nicolas Ferre
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: RE : [GIT PULL] at91: Device Tree update for 3.11 #2
2013-06-17 8:34 ` RE : " Ferre, Nicolas
@ 2013-06-17 16:56 ` Olof Johansson
2013-06-18 8:05 ` Nicolas Ferre
0 siblings, 1 reply; 12+ messages in thread
From: Olof Johansson @ 2013-06-17 16:56 UTC (permalink / raw)
To: Ferre, Nicolas
Cc: Arnd Bergmann, balbi@ti.com, richard.genoud@gmail.com,
Shen, Voice, vinod.koul@intel.com, Linux Kernel list,
linux-arm-kernel, Jean-Christophe PLAGNIOL-VILLARD,
Desroches, Ludovic
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
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: RE : [GIT PULL] at91: Device Tree update for 3.11 #2
2013-06-17 16:56 ` Olof Johansson
@ 2013-06-18 8:05 ` Nicolas Ferre
0 siblings, 0 replies; 12+ messages in thread
From: Nicolas Ferre @ 2013-06-18 8:05 UTC (permalink / raw)
To: Olof Johansson
Cc: Arnd Bergmann, balbi@ti.com, richard.genoud@gmail.com,
Shen, Voice, vinod.koul@intel.com, Linux Kernel list,
linux-arm-kernel, Jean-Christophe PLAGNIOL-VILLARD,
Desroches, Ludovic
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,
--
Nicolas Ferre
^ permalink raw reply [flat|nested] 12+ messages in thread