devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Christian Hemp <c.hemp@phytec.de>
To: shawn.guo@linaro.org
Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
	Christian Hemp <c.hemp@phytec.de>
Subject: [PATCH 5/5] ARM:dts:imx6:phyFLEX: Add CAN support
Date: Fri, 14 Nov 2014 14:32:26 +0100	[thread overview]
Message-ID: <1415971946-48975-6-git-send-email-c.hemp@phytec.de> (raw)
In-Reply-To: <1415971946-48975-1-git-send-email-c.hemp@phytec.de>

Add CAN support for Phytec phyFLEX-i.MX6 (PFL-A-02 and PBA-B-01).

Signed-off-by: Christian Hemp <c.hemp@phytec.de>
---
 arch/arm/boot/dts/imx6qdl-phytec-pbab01.dtsi |  4 ++++
 arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi | 13 +++++++++++++
 2 files changed, 17 insertions(+)

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
-- 
1.9.1

  parent reply	other threads:[~2014-11-14 13:32 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-11-14 13:32 [PATCH 0/5] ARM:dts:imx6:phyflex: dt update Christian Hemp
2014-11-14 13:32 ` [PATCH 1/5] ARM:dts:imx6:phyFLEX: set nodes in alphabetical order Christian Hemp
2014-11-14 13:32 ` [PATCH 2/5] ARM:dts:imx6:phyFLEX: Enable gpmi in module file Christian Hemp
     [not found]   ` <1415971946-48975-3-git-send-email-c.hemp-guT5V/WYfQezQB+pC5nmwQ@public.gmane.org>
2014-11-14 14:55     ` Arnd Bergmann
2014-11-17  8:27       ` Christian Hemp
2014-11-17  8:29         ` Arnd Bergmann
2014-11-14 13:32 ` [PATCH 3/5] ARM:dts:imx6:phyFLEX: Set correct interrupt for pmic Christian Hemp
2014-11-14 13:32 ` [PATCH 4/5] ARM:dts:imx6:phyFLEX: Add PCIe Christian Hemp
2014-11-14 13:32 ` Christian Hemp [this message]
     [not found] ` <1415971946-48975-1-git-send-email-c.hemp-guT5V/WYfQezQB+pC5nmwQ@public.gmane.org>
2014-11-19  1:32   ` [PATCH 0/5] ARM:dts:imx6:phyflex: dt update Shawn Guo

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1415971946-48975-6-git-send-email-c.hemp@phytec.de \
    --to=c.hemp@phytec.de \
    --cc=devicetree@vger.kernel.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=shawn.guo@linaro.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).