[PATCH v4 1/1] ARM: at91/dt: sam9x5: Add CAN device nodes

[PATCH v4 1/1] ARM: at91/dt: sam9x5: Add CAN device nodes

[Alexander Stein]

Add the missing CAN devices node including their pin muxing to the shared
.dtsi for at91sam9x5. Actually include this file.
While at it, fix white spaces of can1_clk.

Signed-off-by: Alexander Stein <alexander.stein-93q1YBGzJSMe9JSWTWOYM3xStJ4P+DSV@public.gmane.org>
---
Changes in v4:
* Move can related descriptions to at91sam9x5_can.dtsi
* Actually include this file in at91sam9x[23]5.dtsi

 arch/arm/boot/dts/at91sam9x25.dtsi    |  1 +
 arch/arm/boot/dts/at91sam9x35.dtsi    |  1 +
 arch/arm/boot/dts/at91sam9x5_can.dtsi | 48 ++++++++++++++++++++++++++++++++---
 3 files changed, 46 insertions(+), 4 deletions(-)

diff --git a/arch/arm/boot/dts/at91sam9x25.dtsi b/arch/arm/boot/dts/at91sam9x25.dtsi
index c255421..3c5fa33 100644
--- a/arch/arm/boot/dts/at91sam9x25.dtsi
+++ b/arch/arm/boot/dts/at91sam9x25.dtsi
@@ -10,6 +10,7 @@
 #include "at91sam9x5_usart3.dtsi"
 #include "at91sam9x5_macb0.dtsi"
 #include "at91sam9x5_macb1.dtsi"
+#include "at91sam9x5_can.dtsi"
 
 / {
 	model = "Atmel AT91SAM9X25 SoC";
diff --git a/arch/arm/boot/dts/at91sam9x35.dtsi b/arch/arm/boot/dts/at91sam9x35.dtsi
index 8eac66c..499cdc8 100644
--- a/arch/arm/boot/dts/at91sam9x35.dtsi
+++ b/arch/arm/boot/dts/at91sam9x35.dtsi
@@ -8,6 +8,7 @@
 
 #include "at91sam9x5.dtsi"
 #include "at91sam9x5_macb0.dtsi"
+#include "at91sam9x5_can.dtsi"
 
 / {
 	model = "Atmel AT91SAM9X35 SoC";
diff --git a/arch/arm/boot/dts/at91sam9x5_can.dtsi b/arch/arm/boot/dts/at91sam9x5_can.dtsi
index f44ab77..3579232 100644
--- a/arch/arm/boot/dts/at91sam9x5_can.dtsi
+++ b/arch/arm/boot/dts/at91sam9x5_can.dtsi
@@ -20,10 +20,50 @@
 						reg = <29>;
 					};
 
-                                        can1_clk: can1_clk {
-                                                #clock-cells = <0>;
-                                                reg = <30>;
-                                        };
+					can1_clk: can1_clk {
+						#clock-cells = <0>;
+						reg = <30>;
+					};
+				};
+			};
+
+			can0: can@f8000000 {
+				compatible = "atmel,at91sam9x5-can";
+				reg = <0xf8000000 0x300>;
+				interrupts = <29 IRQ_TYPE_LEVEL_HIGH 3>;
+				pinctrl-names = "default";
+				pinctrl-0 = <&pinctrl_can0_rx_tx>;
+				clocks = <&can0_clk>;
+				clock-names = "can_clk";
+				status = "disabled";
+			};
+
+			can1: can@f8004000 {
+				compatible = "atmel,at91sam9x5-can";
+				reg = <0xf8004000 0x300>;
+				interrupts = <30 IRQ_TYPE_LEVEL_HIGH 3>;
+				pinctrl-names = "default";
+				pinctrl-0 = <&pinctrl_can1_rx_tx>;
+				clocks = <&can1_clk>;
+				clock-names = "can_clk";
+				status = "disabled";
+			};
+
+			pinctrl@fffff400 {
+				can0 {
+					pinctrl_can0_rx_tx: can0_rx_tx {
+						atmel,pins =
+							<AT91_PIOA 9 AT91_PERIPH_B AT91_PINCTRL_NONE	/* CANRX0, conflicts with DRXD */
+							AT91_PIOA 10 AT91_PERIPH_B AT91_PINCTRL_NONE>;	/* CANTX0, conflicts with DTXD */
+					};
+				};
+
+				can1 {
+					pinctrl_can1_rx_tx: can1_rx_tx {
+						atmel,pins =
+							<AT91_PIOA 6 AT91_PERIPH_B AT91_PINCTRL_NONE	/* CANRX1, conflicts with RXD1 */
+							AT91_PIOA 5 AT91_PERIPH_B AT91_PINCTRL_NONE>;	/* CANTX1, conflicts with TXD1 */
+					};
 				};
 			};
 		};
-- 
2.0.4

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH v4 1/1] ARM: at91/dt: sam9x5: Add CAN device nodes

[Nicolas Ferre]

On 07/10/2014 13:51, Alexander Stein :
> Add the missing CAN devices node including their pin muxing to the shared
> .dtsi for at91sam9x5. Actually include this file.
> While at it, fix white spaces of can1_clk.

Well, no: I split the patch in two to separate these whitespace
modifications and the addition of nodes. But now worries, I did it and
stacked the 2 patches on top of my WIP at91-3.19-dt branch.

(FYI, the additional patch is named (ARM: at91/dt/trivial:
at91sam9x5_can.dtsi: comment and whitespace fixes))

I also added the Acked-by from Alexandre Belloni as he added it in a
previous version and confirmed it on IRC for this v4.

Thanks for your help Alexander. Bye,


> Signed-off-by: Alexander Stein <alexander.stein-93q1YBGzJSMe9JSWTWOYM3xStJ4P+DSV@public.gmane.org>
> ---
> Changes in v4:
> * Move can related descriptions to at91sam9x5_can.dtsi
> * Actually include this file in at91sam9x[23]5.dtsi
> 
>  arch/arm/boot/dts/at91sam9x25.dtsi    |  1 +
>  arch/arm/boot/dts/at91sam9x35.dtsi    |  1 +
>  arch/arm/boot/dts/at91sam9x5_can.dtsi | 48 ++++++++++++++++++++++++++++++++---
>  3 files changed, 46 insertions(+), 4 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/at91sam9x25.dtsi b/arch/arm/boot/dts/at91sam9x25.dtsi
> index c255421..3c5fa33 100644
> --- a/arch/arm/boot/dts/at91sam9x25.dtsi
> +++ b/arch/arm/boot/dts/at91sam9x25.dtsi
> @@ -10,6 +10,7 @@
>  #include "at91sam9x5_usart3.dtsi"
>  #include "at91sam9x5_macb0.dtsi"
>  #include "at91sam9x5_macb1.dtsi"
> +#include "at91sam9x5_can.dtsi"
>  
>  / {
>  	model = "Atmel AT91SAM9X25 SoC";
> diff --git a/arch/arm/boot/dts/at91sam9x35.dtsi b/arch/arm/boot/dts/at91sam9x35.dtsi
> index 8eac66c..499cdc8 100644
> --- a/arch/arm/boot/dts/at91sam9x35.dtsi
> +++ b/arch/arm/boot/dts/at91sam9x35.dtsi
> @@ -8,6 +8,7 @@
>  
>  #include "at91sam9x5.dtsi"
>  #include "at91sam9x5_macb0.dtsi"
> +#include "at91sam9x5_can.dtsi"
>  
>  / {
>  	model = "Atmel AT91SAM9X35 SoC";
> diff --git a/arch/arm/boot/dts/at91sam9x5_can.dtsi b/arch/arm/boot/dts/at91sam9x5_can.dtsi
> index f44ab77..3579232 100644
> --- a/arch/arm/boot/dts/at91sam9x5_can.dtsi
> +++ b/arch/arm/boot/dts/at91sam9x5_can.dtsi
> @@ -20,10 +20,50 @@
>  						reg = <29>;
>  					};
>  
> -                                        can1_clk: can1_clk {
> -                                                #clock-cells = <0>;
> -                                                reg = <30>;
> -                                        };
> +					can1_clk: can1_clk {
> +						#clock-cells = <0>;
> +						reg = <30>;
> +					};
> +				};
> +			};
> +
> +			can0: can@f8000000 {
> +				compatible = "atmel,at91sam9x5-can";
> +				reg = <0xf8000000 0x300>;
> +				interrupts = <29 IRQ_TYPE_LEVEL_HIGH 3>;
> +				pinctrl-names = "default";
> +				pinctrl-0 = <&pinctrl_can0_rx_tx>;
> +				clocks = <&can0_clk>;
> +				clock-names = "can_clk";
> +				status = "disabled";
> +			};
> +
> +			can1: can@f8004000 {
> +				compatible = "atmel,at91sam9x5-can";
> +				reg = <0xf8004000 0x300>;
> +				interrupts = <30 IRQ_TYPE_LEVEL_HIGH 3>;
> +				pinctrl-names = "default";
> +				pinctrl-0 = <&pinctrl_can1_rx_tx>;
> +				clocks = <&can1_clk>;
> +				clock-names = "can_clk";
> +				status = "disabled";
> +			};
> +
> +			pinctrl@fffff400 {
> +				can0 {
> +					pinctrl_can0_rx_tx: can0_rx_tx {
> +						atmel,pins =
> +							<AT91_PIOA 9 AT91_PERIPH_B AT91_PINCTRL_NONE	/* CANRX0, conflicts with DRXD */
> +							AT91_PIOA 10 AT91_PERIPH_B AT91_PINCTRL_NONE>;	/* CANTX0, conflicts with DTXD */
> +					};
> +				};
> +
> +				can1 {
> +					pinctrl_can1_rx_tx: can1_rx_tx {
> +						atmel,pins =
> +							<AT91_PIOA 6 AT91_PERIPH_B AT91_PINCTRL_NONE	/* CANRX1, conflicts with RXD1 */
> +							AT91_PIOA 5 AT91_PERIPH_B AT91_PINCTRL_NONE>;	/* CANTX1, conflicts with TXD1 */
> +					};
>  				};
>  			};
>  		};
> 


-- 
Nicolas Ferre
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH v4 1/1] ARM: at91/dt: sam9x5: Add CAN device nodes

[Alexander Stein]

Hello Nicolas,

On Tuesday 21 October 2014 19:06:46, Nicolas Ferre wrote:
> On 07/10/2014 13:51, Alexander Stein :
> > Add the missing CAN devices node including their pin muxing to the shared
> > .dtsi for at91sam9x5. Actually include this file.
> > While at it, fix white spaces of can1_clk.
> 
> Well, no: I split the patch in two to separate these whitespace
> modifications and the addition of nodes. But now worries, I did it and
> stacked the 2 patches on top of my WIP at91-3.19-dt branch.

It seems this branch is not public, yet. At least I could not find it on git.kernel.org.
Did you also pick "ARM: at91/dt: sam9263: Add CAN device nodes"? (https://www.mail-archive.com/devicetree@vger.kernel.org/msg44970.html)

Best regards,
Alexander
-- 
Dipl.-Inf. Alexander Stein

SYS TEC electronic GmbH
Am Windrad 2
08468 Heinsdorfergrund
Tel.: 03765 38600-1156
Fax: 03765 38600-4100
Email: alexander.stein@systec-electronic.com
Website: www.systec-electronic.com
 
Managing Director: Dipl.-Phys. Siegmar Schmidt
Commercial registry: Amtsgericht Chemnitz, HRB 28082

Re: [PATCH v4 1/1] ARM: at91/dt: sam9x5: Add CAN device nodes

[Nicolas Ferre]

On 28/10/2014 09:27, Alexander Stein :
> Hello Nicolas,
> 
> On Tuesday 21 October 2014 19:06:46, Nicolas Ferre wrote:
>> On 07/10/2014 13:51, Alexander Stein :
>>> Add the missing CAN devices node including their pin muxing to the shared
>>> .dtsi for at91sam9x5. Actually include this file.
>>> While at it, fix white spaces of can1_clk.
>>
>> Well, no: I split the patch in two to separate these whitespace
>> modifications and the addition of nodes. But now worries, I did it and
>> stacked the 2 patches on top of my WIP at91-3.19-dt branch.
> 
> It seems this branch is not public, yet. At least I could not find it on git.kernel.org.

It is now:


> Did you also pick "ARM: at91/dt: sam9263: Add CAN device nodes"? (https://www.mail-archive.com/devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org/msg44970.html)

I've just done it. Thanks for the "heads-up" ;-)

Bye,
-- 
Nicolas Ferre
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html