diff options
author | Christian Hemp <c.hemp@phytec.de> | 2014-11-14 08:32:26 -0500 |
---|---|---|
committer | Shawn Guo <shawn.guo@linaro.org> | 2014-11-23 02:08:15 -0500 |
commit | 1b61feea3f65fd401a778d705c7223e9f7da529f (patch) | |
tree | 18bfe7a4db4a59eca22117f5867c38f7affbbcf2 | |
parent | 9924546b29f5f20d0596ebc76ab1ddc1f716cae4 (diff) |
ARM: dts: imx6: phyFLEX: Add CAN support
Add CAN support for Phytec phyFLEX-i.MX6 (PFL-A-02 and PBA-B-01).
Signed-off-by: Christian Hemp <c.hemp@phytec.de>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
-rw-r--r-- | arch/arm/boot/dts/imx6qdl-phytec-pbab01.dtsi | 4 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi | 13 |
2 files changed, 17 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/imx6qdl-phytec-pbab01.dtsi b/arch/arm/boot/dts/imx6qdl-phytec-pbab01.dtsi index 7634cc1c9436..585b4f6986c1 100644 --- a/arch/arm/boot/dts/imx6qdl-phytec-pbab01.dtsi +++ b/arch/arm/boot/dts/imx6qdl-phytec-pbab01.dtsi | |||
@@ -101,6 +101,10 @@ | |||
101 | }; | 101 | }; |
102 | }; | 102 | }; |
103 | 103 | ||
104 | &can1 { | ||
105 | status = "okay"; | ||
106 | }; | ||
107 | |||
104 | &fec { | 108 | &fec { |
105 | status = "okay"; | 109 | status = "okay"; |
106 | }; | 110 | }; |
diff --git a/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi b/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi index 2d721095a369..19cc269a08d4 100644 --- a/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi +++ b/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi | |||
@@ -64,6 +64,12 @@ | |||
64 | status = "disabled"; | 64 | status = "disabled"; |
65 | }; | 65 | }; |
66 | 66 | ||
67 | &can1 { | ||
68 | pinctrl-names = "default"; | ||
69 | pinctrl-0 = <&pinctrl_flexcan1>; | ||
70 | status = "disabled"; | ||
71 | }; | ||
72 | |||
67 | &ecspi3 { | 73 | &ecspi3 { |
68 | pinctrl-names = "default"; | 74 | pinctrl-names = "default"; |
69 | pinctrl-0 = <&pinctrl_ecspi3>; | 75 | pinctrl-0 = <&pinctrl_ecspi3>; |
@@ -240,6 +246,13 @@ | |||
240 | >; | 246 | >; |
241 | }; | 247 | }; |
242 | 248 | ||
249 | pinctrl_flexcan1: flexcan1grp { | ||
250 | fsl,pins = < | ||
251 | MX6QDL_PAD_KEY_ROW2__FLEXCAN1_RX 0x1b0b0 | ||
252 | MX6QDL_PAD_KEY_COL2__FLEXCAN1_TX 0x1b0b0 | ||
253 | >; | ||
254 | }; | ||
255 | |||
243 | pinctrl_gpmi_nand: gpminandgrp { | 256 | pinctrl_gpmi_nand: gpminandgrp { |
244 | fsl,pins = < | 257 | fsl,pins = < |
245 | MX6QDL_PAD_NANDF_CLE__NAND_CLE 0xb0b1 | 258 | MX6QDL_PAD_NANDF_CLE__NAND_CLE 0xb0b1 |