[PATCH 1/3] ARM: at91/dt/trivial: use macro for AES irq type

[PATCH 1/3] ARM: at91/dt/trivial: use macro for AES irq type

[Nicolas Ferre]

Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
---
 arch/arm/boot/dts/sama5d3.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/sama5d3.dtsi b/arch/arm/boot/dts/sama5d3.dtsi
index ca956b6..b2aabff 100644
--- a/arch/arm/boot/dts/sama5d3.dtsi
+++ b/arch/arm/boot/dts/sama5d3.dtsi
@@ -350,7 +350,7 @@
 			aes@f8038000 {
 				compatible = "atmel,sam9g46-aes";
 				reg = <0xf8038000 0x100>;
-				interrupts = <43 4 0>;
+				interrupts = <43 IRQ_TYPE_LEVEL_HIGH 0>;
 			};
 
 			tdes@f803c000 {
-- 
1.8.2.2

[PATCH 2/3] ARM: at91/dt/trivial: before sama5d3, Atmel MPU were using at91 prefix

[Nicolas Ferre]

Change the sha/aes/tdes compatibility string to match common
case for the at91sam9g45 family which is to keep the at91 prefix.

Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
---
 arch/arm/boot/dts/sama5d3.dtsi | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm/boot/dts/sama5d3.dtsi b/arch/arm/boot/dts/sama5d3.dtsi
index b2aabff..99bd4a6 100644
--- a/arch/arm/boot/dts/sama5d3.dtsi
+++ b/arch/arm/boot/dts/sama5d3.dtsi
@@ -342,19 +342,19 @@
 			};
 
 			sha@f8034000 {
-				compatible = "atmel,sam9g46-sha";
+				compatible = "atmel,at91sam9g46-sha";
 				reg = <0xf8034000 0x100>;
 				interrupts = <42 IRQ_TYPE_LEVEL_HIGH 0>;
 			};
 
 			aes@f8038000 {
-				compatible = "atmel,sam9g46-aes";
+				compatible = "atmel,at91sam9g46-aes";
 				reg = <0xf8038000 0x100>;
 				interrupts = <43 IRQ_TYPE_LEVEL_HIGH 0>;
 			};
 
 			tdes@f803c000 {
-				compatible = "atmel,sam9g46-tdes";
+				compatible = "atmel,at91sam9g46-tdes";
 				reg = <0xf803c000 0x100>;
 				interrupts = <44 IRQ_TYPE_LEVEL_HIGH 0>;
 			};
-- 
1.8.2.2

[PATCH 3/3] ARM: at91/dt/sama5d3: add DMA information to SHA/AES/TDES nodes

[Nicolas Ferre]

Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
---
 arch/arm/boot/dts/sama5d3.dtsi | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/arch/arm/boot/dts/sama5d3.dtsi b/arch/arm/boot/dts/sama5d3.dtsi
index 99bd4a6..aca3893 100644
--- a/arch/arm/boot/dts/sama5d3.dtsi
+++ b/arch/arm/boot/dts/sama5d3.dtsi
@@ -345,18 +345,26 @@
 				compatible = "atmel,at91sam9g46-sha";
 				reg = <0xf8034000 0x100>;
 				interrupts = <42 IRQ_TYPE_LEVEL_HIGH 0>;
+				dmas = <&dma1 2 AT91_DMA_CFG_PER_ID(17)>;
+				dma-names = "tx";
 			};
 
 			aes@f8038000 {
 				compatible = "atmel,at91sam9g46-aes";
 				reg = <0xf8038000 0x100>;
 				interrupts = <43 IRQ_TYPE_LEVEL_HIGH 0>;
+				dmas = <&dma1 2 AT91_DMA_CFG_PER_ID(18)>,
+				       <&dma1 2 AT91_DMA_CFG_PER_ID(19)>;
+				dma-names = "tx", "rx";
 			};
 
 			tdes@f803c000 {
 				compatible = "atmel,at91sam9g46-tdes";
 				reg = <0xf803c000 0x100>;
 				interrupts = <44 IRQ_TYPE_LEVEL_HIGH 0>;
+				dmas = <&dma1 2 AT91_DMA_CFG_PER_ID(20)>,
+				       <&dma1 2 AT91_DMA_CFG_PER_ID(21)>;
+				dma-names = "tx", "rx";
 			};
 
 			dma0: dma-controller@ffffe600 {
-- 
1.8.2.2

Re: [PATCH 2/3] ARM: at91/dt/trivial: before sama5d3, Atmel MPU were using at91 prefix

[Jean-Christophe PLAGNIOL-VILLARD]

On 18:46 Mon 14 Oct     , Nicolas Ferre wrote:
> Change the sha/aes/tdes compatibility string to match common
> case for the at91sam9g45 family which is to keep the at91 prefix.
> 
> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
> ---
>  arch/arm/boot/dts/sama5d3.dtsi | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/sama5d3.dtsi b/arch/arm/boot/dts/sama5d3.dtsi
> index b2aabff..99bd4a6 100644
> --- a/arch/arm/boot/dts/sama5d3.dtsi
> +++ b/arch/arm/boot/dts/sama5d3.dtsi
> @@ -342,19 +342,19 @@
>  			};
>  
>  			sha@f8034000 {
> -				compatible = "atmel,sam9g46-sha";
> +				compatible = "atmel,at91sam9g46-sha";
>  				reg = <0xf8034000 0x100>;
>  				interrupts = <42 IRQ_TYPE_LEVEL_HIGH 0>;
>  			};
>  
>  			aes@f8038000 {
> -				compatible = "atmel,sam9g46-aes";
> +				compatible = "atmel,at91sam9g46-aes";
>  				reg = <0xf8038000 0x100>;
>  				interrupts = <43 IRQ_TYPE_LEVEL_HIGH 0>;
>  			};
>  
>  			tdes@f803c000 {
> -				compatible = "atmel,sam9g46-tdes";
> +				compatible = "atmel,at91sam9g46-tdes";
>  				reg = <0xf803c000 0x100>;
>  				interrupts = <44 IRQ_TYPE_LEVEL_HIGH 0>;
you keep the previous compatible in the driver too for backword compatiblity

Best Regards,
J.
>  			};
> -- 
> 1.8.2.2
> 
> 
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Re: [PATCH 2/3] ARM: at91/dt/trivial: before sama5d3, Atmel MPU were using at91 prefix

[Nicolas Ferre]

On 14/10/2013 19:09, Jean-Christophe PLAGNIOL-VILLARD :
> On 18:46 Mon 14 Oct     , Nicolas Ferre wrote:
>> Change the sha/aes/tdes compatibility string to match common
>> case for the at91sam9g45 family which is to keep the at91 prefix.
>>
>> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
>> ---
>>   arch/arm/boot/dts/sama5d3.dtsi | 6 +++---
>>   1 file changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git a/arch/arm/boot/dts/sama5d3.dtsi b/arch/arm/boot/dts/sama5d3.dtsi
>> index b2aabff..99bd4a6 100644
>> --- a/arch/arm/boot/dts/sama5d3.dtsi
>> +++ b/arch/arm/boot/dts/sama5d3.dtsi
>> @@ -342,19 +342,19 @@
>>   			};
>>
>>   			sha@f8034000 {
>> -				compatible = "atmel,sam9g46-sha";
>> +				compatible = "atmel,at91sam9g46-sha";
>>   				reg = <0xf8034000 0x100>;
>>   				interrupts = <42 IRQ_TYPE_LEVEL_HIGH 0>;
>>   			};
>>
>>   			aes@f8038000 {
>> -				compatible = "atmel,sam9g46-aes";
>> +				compatible = "atmel,at91sam9g46-aes";
>>   				reg = <0xf8038000 0x100>;
>>   				interrupts = <43 IRQ_TYPE_LEVEL_HIGH 0>;
>>   			};
>>
>>   			tdes@f803c000 {
>> -				compatible = "atmel,sam9g46-tdes";
>> +				compatible = "atmel,at91sam9g46-tdes";
>>   				reg = <0xf803c000 0x100>;
>>   				interrupts = <44 IRQ_TYPE_LEVEL_HIGH 0>;
> you keep the previous compatible in the driver too for backword compatiblity

No, as the consumer of the old compatibility string has never been sent 
to mainline (or even mailing-list) and as the "dma" property is not 
compatible with the one existing on our 3.6.9-based kernel.

So, anyway the DT has to be changed for a move from 3.6.9 => 3.10. As I 
do not want to bloat the DT forever, let's stick with this new 
compatibility string.

Bye,


>>   			};
>> --
>> 1.8.2.2
>>
>>
>> _______________________________________________
>> linux-arm-kernel mailing list
>> linux-arm-kernel@lists.infradead.org
>> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
>


-- 
Nicolas Ferre