[GIT PULL] at91: Device Tree updates for 3.11 #3

[GIT PULL] at91: Device Tree updates for 3.11 #3

[Nicolas Ferre]

Arnd, Olof,

One more pull-request for AT91 DT patches.
It is focused on SPI on several SoCs and it particular the SPI+DMA addition on newer
SAMA5D3 and AT91SAM9N12.

Thanks, best regards,

The following changes since commit 24ce10e142e7b063c4ae4437dd3b290fbfafe052:

  ARM: at91: sam9m10g45ek add udc DT support (2013-06-15 00:15:22 +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 26e3326cc04bc3fc890a95ad6cb36359372acba5:

  ARM: at91: dt: rm9200ek: add spi support (2013-06-26 10:13:39 +0200)

----------------------------------------------------------------
- more SPI DT activation for rm9200
- SPI DMA for at91sam9n12/sama5d3
And one little fix for SPI compatibility string

----------------------------------------------------------------
Jean-Christophe PLAGNIOL-VILLARD (2):
      ARM: at91: dt: rm9200: add spi support
      ARM: at91: dt: rm9200ek: add spi support

Nicolas Ferre (3):
      ARM: at91/DT: fix SPI compatibility string
      ARM: at91/DT: sama5d3: add SPI DMA client infos
      ARM: at91/DT: at91sam9n12: add SPI DMA client infos

 arch/arm/boot/dts/at91rm9200.dtsi  | 20 ++++++++++++++++++++
 arch/arm/boot/dts/at91rm9200ek.dts | 10 ++++++++++
 arch/arm/boot/dts/at91sam9n12.dtsi |  6 ++++++
 arch/arm/boot/dts/sama5d3.dtsi     | 10 ++++++++--
 4 files changed, 44 insertions(+), 2 deletions(-)

-- 
Nicolas Ferre

Re: [GIT PULL] at91: Device Tree updates for 3.11 #3

[Arnd Bergmann]

On Wednesday 26 June 2013, Nicolas Ferre wrote:
> Arnd, Olof,
> 
> One more pull-request for AT91 DT patches.
> It is focused on SPI on several SoCs and it particular the SPI+DMA addition on newer
> SAMA5D3 and AT91SAM9N12.

Pulled into next/dt, thanks! I've performed the simple merge below.

	Arnd

diff --cc arch/arm/boot/dts/sama5d3.dtsi
index bbf88d7,5956f9b..a1d5e25
--- a/arch/arm/boot/dts/sama5d3.dtsi
+++ b/arch/arm/boot/dts/sama5d3.dtsi
@@@ -80,9 -76,17 +80,12 @@@
  			spi0: spi@f0004000 {
  				#address-cells = <1>;
  				#size-cells = <0>;
- 				compatible = "atmel,at91sam9x5-spi";
+ 				compatible = "atmel,at91rm9200-spi";
  				reg = <0xf0004000 0x100>;
  				interrupts = <24 IRQ_TYPE_LEVEL_HIGH 3>;
 -				cs-gpios = <&pioD 13 0
 -					    &pioD 14 0 /* conflicts with SCK0 and CANRX0 */
 -					    &pioD 15 0 /* conflicts with CTS0 and CANTX0 */
 -					    &pioD 16 0 /* conflicts with RTS0 and PWMFI3 */
 -					   >;
+ 				dmas = <&dma0 2 AT91_DMA_CFG_PER_ID(1)>,
+ 				       <&dma0 2 AT91_DMA_CFG_PER_ID(2)>;
+ 				dma-names = "tx", "rx";
  				pinctrl-names = "default";
  				pinctrl-0 = <&pinctrl_spi0>;
  				status = "disabled";
@@@ -203,9 -207,17 +206,12 @@@
  			spi1: spi@f8008000 {
  				#address-cells = <1>;
  				#size-cells = <0>;
- 				compatible = "atmel,at91sam9x5-spi";
+ 				compatible = "atmel,at91rm9200-spi";
  				reg = <0xf8008000 0x100>;
  				interrupts = <25 IRQ_TYPE_LEVEL_HIGH 3>;
 -				cs-gpios = <&pioC 25 0
 -					    &pioC 26 0 /* conflitcs with TWD1 and ISI_D11 */
 -					    &pioC 27 0 /* conflitcs with TWCK1 and ISI_D10 */
 -					    &pioC 28 0 /* conflitcs with PWMFI0 and ISI_D9 */
 -					   >;
+ 				dmas = <&dma1 2 AT91_DMA_CFG_PER_ID(15)>,
+ 				       <&dma1 2 AT91_DMA_CFG_PER_ID(16)>;
+ 				dma-names = "tx", "rx";
  				pinctrl-names = "default";
  				pinctrl-0 = <&pinctrl_spi1>;
  				status = "disabled";

Re: [GIT PULL] at91: Device Tree updates for 3.11 #3

[Nicolas Ferre]

On 26/06/2013 16:57, Arnd Bergmann :
> On Wednesday 26 June 2013, Nicolas Ferre wrote:
>> Arnd, Olof,
>>
>> One more pull-request for AT91 DT patches.
>> It is focused on SPI on several SoCs and it particular the SPI+DMA addition on newer
>> SAMA5D3 and AT91SAM9N12.
>
> Pulled into next/dt, thanks! I've performed the simple merge below.

Your merge is correct. Thanks a lot Arnd.

Bye,

> diff --cc arch/arm/boot/dts/sama5d3.dtsi
> index bbf88d7,5956f9b..a1d5e25
> --- a/arch/arm/boot/dts/sama5d3.dtsi
> +++ b/arch/arm/boot/dts/sama5d3.dtsi
> @@@ -80,9 -76,17 +80,12 @@@
>    			spi0: spi@f0004000 {
>    				#address-cells = <1>;
>    				#size-cells = <0>;
> - 				compatible = "atmel,at91sam9x5-spi";
> + 				compatible = "atmel,at91rm9200-spi";
>    				reg = <0xf0004000 0x100>;
>    				interrupts = <24 IRQ_TYPE_LEVEL_HIGH 3>;
>   -				cs-gpios = <&pioD 13 0
>   -					    &pioD 14 0 /* conflicts with SCK0 and CANRX0 */
>   -					    &pioD 15 0 /* conflicts with CTS0 and CANTX0 */
>   -					    &pioD 16 0 /* conflicts with RTS0 and PWMFI3 */
>   -					   >;
> + 				dmas = <&dma0 2 AT91_DMA_CFG_PER_ID(1)>,
> + 				       <&dma0 2 AT91_DMA_CFG_PER_ID(2)>;
> + 				dma-names = "tx", "rx";
>    				pinctrl-names = "default";
>    				pinctrl-0 = <&pinctrl_spi0>;
>    				status = "disabled";
> @@@ -203,9 -207,17 +206,12 @@@
>    			spi1: spi@f8008000 {
>    				#address-cells = <1>;
>    				#size-cells = <0>;
> - 				compatible = "atmel,at91sam9x5-spi";
> + 				compatible = "atmel,at91rm9200-spi";
>    				reg = <0xf8008000 0x100>;
>    				interrupts = <25 IRQ_TYPE_LEVEL_HIGH 3>;
>   -				cs-gpios = <&pioC 25 0
>   -					    &pioC 26 0 /* conflitcs with TWD1 and ISI_D11 */
>   -					    &pioC 27 0 /* conflitcs with TWCK1 and ISI_D10 */
>   -					    &pioC 28 0 /* conflitcs with PWMFI0 and ISI_D9 */
>   -					   >;
> + 				dmas = <&dma1 2 AT91_DMA_CFG_PER_ID(15)>,
> + 				       <&dma1 2 AT91_DMA_CFG_PER_ID(16)>;
> + 				dma-names = "tx", "rx";
>    				pinctrl-names = "default";
>    				pinctrl-0 = <&pinctrl_spi1>;
>    				status = "disabled";
>
>
>


-- 
Nicolas Ferre