summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Hemp <c.hemp@phytec.de>2014-11-14 14:32:26 +0100
committerShawn Guo <shawn.guo@linaro.org>2014-11-23 15:08:15 +0800
commit1b61feea3f65fd401a778d705c7223e9f7da529f (patch)
tree18bfe7a4db4a59eca22117f5867c38f7affbbcf2
parent9924546b29f5f20d0596ebc76ab1ddc1f716cae4 (diff)
downloadop-kernel-dev-1b61feea3f65fd401a778d705c7223e9f7da529f.zip
op-kernel-dev-1b61feea3f65fd401a778d705c7223e9f7da529f.tar.gz
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.dtsi4
-rw-r--r--arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi13
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 7634cc1..585b4f6 100644
--- a/arch/arm/boot/dts/imx6qdl-phytec-pbab01.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-phytec-pbab01.dtsi
@@ -101,6 +101,10 @@
};
};
+&can1 {
+ status = "okay";
+};
+
&fec {
status = "okay";
};
diff --git a/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi b/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi
index 2d72109..19cc269 100644
--- a/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi
@@ -64,6 +64,12 @@
status = "disabled";
};
+&can1 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_flexcan1>;
+ status = "disabled";
+};
+
&ecspi3 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_ecspi3>;
@@ -240,6 +246,13 @@
>;
};
+ pinctrl_flexcan1: flexcan1grp {
+ fsl,pins = <
+ MX6QDL_PAD_KEY_ROW2__FLEXCAN1_RX 0x1b0b0
+ MX6QDL_PAD_KEY_COL2__FLEXCAN1_TX 0x1b0b0
+ >;
+ };
+
pinctrl_gpmi_nand: gpminandgrp {
fsl,pins = <
MX6QDL_PAD_NANDF_CLE__NAND_CLE 0xb0b1
OpenPOWER on IntegriCloud