diff options
| -rw-r--r-- | arch/arm/boot/dts/at91sam9x25.dtsi | 1 | ||||
| -rw-r--r-- | arch/arm/boot/dts/at91sam9x35.dtsi | 1 | ||||
| -rw-r--r-- | arch/arm/boot/dts/at91sam9x5_can.dtsi | 40 |
3 files changed, 42 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/at91sam9x25.dtsi b/arch/arm/boot/dts/at91sam9x25.dtsi index c2554219f7a4..3c5fa3388997 100644 --- a/arch/arm/boot/dts/at91sam9x25.dtsi +++ b/arch/arm/boot/dts/at91sam9x25.dtsi | |||
| @@ -10,6 +10,7 @@ | |||
| 10 | #include "at91sam9x5_usart3.dtsi" | 10 | #include "at91sam9x5_usart3.dtsi" |
| 11 | #include "at91sam9x5_macb0.dtsi" | 11 | #include "at91sam9x5_macb0.dtsi" |
| 12 | #include "at91sam9x5_macb1.dtsi" | 12 | #include "at91sam9x5_macb1.dtsi" |
| 13 | #include "at91sam9x5_can.dtsi" | ||
| 13 | 14 | ||
| 14 | / { | 15 | / { |
| 15 | model = "Atmel AT91SAM9X25 SoC"; | 16 | model = "Atmel AT91SAM9X25 SoC"; |
diff --git a/arch/arm/boot/dts/at91sam9x35.dtsi b/arch/arm/boot/dts/at91sam9x35.dtsi index 8eac66ce0ab7..499cdc81f4c0 100644 --- a/arch/arm/boot/dts/at91sam9x35.dtsi +++ b/arch/arm/boot/dts/at91sam9x35.dtsi | |||
| @@ -8,6 +8,7 @@ | |||
| 8 | 8 | ||
| 9 | #include "at91sam9x5.dtsi" | 9 | #include "at91sam9x5.dtsi" |
| 10 | #include "at91sam9x5_macb0.dtsi" | 10 | #include "at91sam9x5_macb0.dtsi" |
| 11 | #include "at91sam9x5_can.dtsi" | ||
| 11 | 12 | ||
| 12 | / { | 13 | / { |
| 13 | model = "Atmel AT91SAM9X35 SoC"; | 14 | model = "Atmel AT91SAM9X35 SoC"; |
diff --git a/arch/arm/boot/dts/at91sam9x5_can.dtsi b/arch/arm/boot/dts/at91sam9x5_can.dtsi index ebe4147529bb..8eb2f9c1b978 100644 --- a/arch/arm/boot/dts/at91sam9x5_can.dtsi +++ b/arch/arm/boot/dts/at91sam9x5_can.dtsi | |||
| @@ -26,6 +26,46 @@ | |||
| 26 | }; | 26 | }; |
| 27 | }; | 27 | }; |
| 28 | }; | 28 | }; |
| 29 | |||
| 30 | can0: can@f8000000 { | ||
| 31 | compatible = "atmel,at91sam9x5-can"; | ||
| 32 | reg = <0xf8000000 0x300>; | ||
| 33 | interrupts = <29 IRQ_TYPE_LEVEL_HIGH 3>; | ||
| 34 | pinctrl-names = "default"; | ||
| 35 | pinctrl-0 = <&pinctrl_can0_rx_tx>; | ||
| 36 | clocks = <&can0_clk>; | ||
| 37 | clock-names = "can_clk"; | ||
| 38 | status = "disabled"; | ||
| 39 | }; | ||
| 40 | |||
| 41 | can1: can@f8004000 { | ||
| 42 | compatible = "atmel,at91sam9x5-can"; | ||
| 43 | reg = <0xf8004000 0x300>; | ||
| 44 | interrupts = <30 IRQ_TYPE_LEVEL_HIGH 3>; | ||
| 45 | pinctrl-names = "default"; | ||
| 46 | pinctrl-0 = <&pinctrl_can1_rx_tx>; | ||
| 47 | clocks = <&can1_clk>; | ||
| 48 | clock-names = "can_clk"; | ||
| 49 | status = "disabled"; | ||
| 50 | }; | ||
| 51 | |||
| 52 | pinctrl@fffff400 { | ||
| 53 | can0 { | ||
| 54 | pinctrl_can0_rx_tx: can0_rx_tx { | ||
| 55 | atmel,pins = | ||
| 56 | <AT91_PIOA 9 AT91_PERIPH_B AT91_PINCTRL_NONE /* CANRX0, conflicts with DRXD */ | ||
| 57 | AT91_PIOA 10 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* CANTX0, conflicts with DTXD */ | ||
| 58 | }; | ||
| 59 | }; | ||
| 60 | |||
| 61 | can1 { | ||
| 62 | pinctrl_can1_rx_tx: can1_rx_tx { | ||
| 63 | atmel,pins = | ||
| 64 | <AT91_PIOA 6 AT91_PERIPH_B AT91_PINCTRL_NONE /* CANRX1, conflicts with RXD1 */ | ||
| 65 | AT91_PIOA 5 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* CANTX1, conflicts with TXD1 */ | ||
| 66 | }; | ||
| 67 | }; | ||
| 68 | }; | ||
| 29 | }; | 69 | }; |
| 30 | }; | 70 | }; |
| 31 | }; | 71 | }; |
