| Message ID | 1412599207-15676-1-git-send-email-alexander.stein@systec-electronic.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 06/10/2014 at 14:40:07 +0200, Alexander Stein wrote : > Add the missing CAN devices node including their pin muxing. The required > clock node already exists. > > Signed-off-by: Alexander Stein <alexander.stein@systec-electronic.com> Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> > --- > arch/arm/boot/dts/at91sam9263.dtsi | 19 +++++++++++++++++++ > 1 file changed, 19 insertions(+) > > diff --git a/arch/arm/boot/dts/at91sam9263.dtsi b/arch/arm/boot/dts/at91sam9263.dtsi > index bb23c2d..174ab77 100644 > --- a/arch/arm/boot/dts/at91sam9263.dtsi > +++ b/arch/arm/boot/dts/at91sam9263.dtsi > @@ -672,6 +672,14 @@ > }; > }; > > + can { > + pinctrl_can_rx_tx: can_rx_tx { > + atmel,pins = > + <AT91_PIOA 14 AT91_PERIPH_A AT91_PINCTRL_NONE /* CANRX, conflicts with IRQ0 */ > + AT91_PIOA 13 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* CANTX, conflicts with PCK0 */ > + }; > + }; > + > pioA: gpio@fffff200 { > compatible = "atmel,at91rm9200-gpio"; > reg = <0xfffff200 0x200>; > @@ -898,6 +906,17 @@ > clock-names = "pwm_clk"; > status = "disabled"; > }; > + > + can: can@fffac000 { > + compatible = "atmel,at91sam9263-can"; > + reg = <0xfffac000 0x300>; > + interrupts = <12 IRQ_TYPE_LEVEL_HIGH 3>; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_can_rx_tx>; > + clocks = <&can_clk>; > + clock-names = "can_clk"; > + status = "disabled"; > + }; > }; > > fb0: fb@0x00700000 { > -- > 2.0.4 > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
On 06/10/2014 16:09, Alexandre Belloni : > On 06/10/2014 at 14:40:07 +0200, Alexander Stein wrote : >> Add the missing CAN devices node including their pin muxing. The required >> clock node already exists. >> >> Signed-off-by: Alexander Stein <alexander.stein@systec-electronic.com> > Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> and stacked on top of at91-3.19-dt branch. Thanks! > >> --- >> arch/arm/boot/dts/at91sam9263.dtsi | 19 +++++++++++++++++++ >> 1 file changed, 19 insertions(+) >> >> diff --git a/arch/arm/boot/dts/at91sam9263.dtsi b/arch/arm/boot/dts/at91sam9263.dtsi >> index bb23c2d..174ab77 100644 >> --- a/arch/arm/boot/dts/at91sam9263.dtsi >> +++ b/arch/arm/boot/dts/at91sam9263.dtsi >> @@ -672,6 +672,14 @@ >> }; >> }; >> >> + can { >> + pinctrl_can_rx_tx: can_rx_tx { >> + atmel,pins = >> + <AT91_PIOA 14 AT91_PERIPH_A AT91_PINCTRL_NONE /* CANRX, conflicts with IRQ0 */ >> + AT91_PIOA 13 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* CANTX, conflicts with PCK0 */ >> + }; >> + }; >> + >> pioA: gpio@fffff200 { >> compatible = "atmel,at91rm9200-gpio"; >> reg = <0xfffff200 0x200>; >> @@ -898,6 +906,17 @@ >> clock-names = "pwm_clk"; >> status = "disabled"; >> }; >> + >> + can: can@fffac000 { >> + compatible = "atmel,at91sam9263-can"; >> + reg = <0xfffac000 0x300>; >> + interrupts = <12 IRQ_TYPE_LEVEL_HIGH 3>; >> + pinctrl-names = "default"; >> + pinctrl-0 = <&pinctrl_can_rx_tx>; >> + clocks = <&can_clk>; >> + clock-names = "can_clk"; >> + status = "disabled"; >> + }; >> }; >> >> fb0: fb@0x00700000 { >> -- >> 2.0.4 >> >> >> _______________________________________________ >> linux-arm-kernel mailing list >> linux-arm-kernel@lists.infradead.org >> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel >
diff --git a/arch/arm/boot/dts/at91sam9263.dtsi b/arch/arm/boot/dts/at91sam9263.dtsi index bb23c2d..174ab77 100644 --- a/arch/arm/boot/dts/at91sam9263.dtsi +++ b/arch/arm/boot/dts/at91sam9263.dtsi @@ -672,6 +672,14 @@ }; }; + can { + pinctrl_can_rx_tx: can_rx_tx { + atmel,pins = + <AT91_PIOA 14 AT91_PERIPH_A AT91_PINCTRL_NONE /* CANRX, conflicts with IRQ0 */ + AT91_PIOA 13 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* CANTX, conflicts with PCK0 */ + }; + }; + pioA: gpio@fffff200 { compatible = "atmel,at91rm9200-gpio"; reg = <0xfffff200 0x200>; @@ -898,6 +906,17 @@ clock-names = "pwm_clk"; status = "disabled"; }; + + can: can@fffac000 { + compatible = "atmel,at91sam9263-can"; + reg = <0xfffac000 0x300>; + interrupts = <12 IRQ_TYPE_LEVEL_HIGH 3>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_can_rx_tx>; + clocks = <&can_clk>; + clock-names = "can_clk"; + status = "disabled"; + }; }; fb0: fb@0x00700000 {
Add the missing CAN devices node including their pin muxing. The required clock node already exists. Signed-off-by: Alexander Stein <alexander.stein@systec-electronic.com> --- arch/arm/boot/dts/at91sam9263.dtsi | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)