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 <[email protected]> > Acked-by: Alexandre Belloni <[email protected]>
Acked-by: Nicolas Ferre <[email protected]> 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 >> [email protected] >> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel > -- Nicolas Ferre -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
