mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Philippe Schenker <philippe.schenker@toradex.com>
To: "Marcel Ziswiler" <marcel.ziswiler@toradex.com>,
	"Max Krummenacher" <max.krummenacher@toradex.com>,
	"stefan@agner.ch" <stefan@agner.ch>,
	"devicetree@vger.kernel.org" <devicetree@vger.kernel.org>,
	"Rob Herring" <robh+dt@kernel.org>,
	"Shawn Guo" <shawnguo@kernel.org>,
	"Mark Rutland" <mark.rutland@arm.com>,
	"Michal Vokáč" <michal.vokac@ysoft.com>,
	"Fabio Estevam" <festevam@gmail.com>
Cc: Philippe Schenker <philippe.schenker@toradex.com>,
	"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
	"linux-arm-kernel@lists.infradead.org" 
	<linux-arm-kernel@lists.infradead.org>,
	Pengutronix Kernel Team <kernel@pengutronix.de>,
	NXP Linux Team <linux-imx@nxp.com>,
	Sascha Hauer <s.hauer@pengutronix.de>
Subject: [PATCH v4 03/21] ARM: dts: imx7-colibri: prepare module device tree for FlexCAN
Date: Mon, 12 Aug 2019 14:21:18 +0000	[thread overview]
Message-ID: <20190812142105.1995-4-philippe.schenker@toradex.com> (raw)
In-Reply-To: <20190812142105.1995-1-philippe.schenker@toradex.com>

Prepare FlexCAN use on SODIMM 55/63 178/188. Those SODIMM pins are
compatible for CAN bus use with several modules from the Colibri
family.
Add Better drivestrength and also add flexcan2.

Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>

---

Changes in v4:
- Added Marcel Ziswiler's Ack

Changes in v3: None
Changes in v2: None

 arch/arm/boot/dts/imx7-colibri.dtsi | 35 ++++++++++++++++++++++++-----
 1 file changed, 30 insertions(+), 5 deletions(-)

diff --git a/arch/arm/boot/dts/imx7-colibri.dtsi b/arch/arm/boot/dts/imx7-colibri.dtsi
index f7c9ce5bed47..52046085ce6f 100644
--- a/arch/arm/boot/dts/imx7-colibri.dtsi
+++ b/arch/arm/boot/dts/imx7-colibri.dtsi
@@ -117,6 +117,18 @@
 	fsl,magic-packet;
 };
 
+&flexcan1 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_flexcan1>;
+	status = "disabled";
+};
+
+&flexcan2 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_flexcan2>;
+	status = "disabled";
+};
+
 &gpmi {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_gpmi_nand>;
@@ -330,12 +342,11 @@
 
 &iomuxc {
 	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_gpio1 &pinctrl_gpio2 &pinctrl_gpio3 &pinctrl_gpio4>;
+	pinctrl-0 = <&pinctrl_gpio1 &pinctrl_gpio2 &pinctrl_gpio3 &pinctrl_gpio4
+		     &pinctrl_gpio7>;
 
 	pinctrl_gpio1: gpio1-grp {
 		fsl,pins = <
-			MX7D_PAD_ENET1_RGMII_RD3__GPIO7_IO3	0x74 /* SODIMM 55 */
-			MX7D_PAD_ENET1_RGMII_RD2__GPIO7_IO2	0x74 /* SODIMM 63 */
 			MX7D_PAD_SAI1_RX_SYNC__GPIO6_IO16	0x14 /* SODIMM 77 */
 			MX7D_PAD_EPDC_DATA09__GPIO2_IO9		0x14 /* SODIMM 89 */
 			MX7D_PAD_EPDC_DATA08__GPIO2_IO8		0x74 /* SODIMM 91 */
@@ -416,6 +427,13 @@
 		>;
 	};
 
+	pinctrl_gpio7: gpio7-grp { /* Alternatively CAN1 */
+		fsl,pins = <
+			MX7D_PAD_ENET1_RGMII_RD3__GPIO7_IO3	0x14 /* SODIMM 55 */
+			MX7D_PAD_ENET1_RGMII_RD2__GPIO7_IO2	0x14 /* SODIMM 63 */
+		>;
+	};
+
 	pinctrl_i2c1_int: i2c1-int-grp { /* PMIC / TOUCH */
 		fsl,pins = <
 			MX7D_PAD_GPIO1_IO13__GPIO1_IO13	0x79
@@ -459,10 +477,17 @@
 		>;
 	};
 
+	pinctrl_flexcan1: flexcan1-grp {
+		fsl,pins = <
+			MX7D_PAD_ENET1_RGMII_RD3__FLEXCAN1_TX	0x79 /* SODIMM 55 */
+			MX7D_PAD_ENET1_RGMII_RD2__FLEXCAN1_RX	0x79 /* SODIMM 63 */
+		>;
+	};
+
 	pinctrl_flexcan2: flexcan2-grp {
 		fsl,pins = <
-			MX7D_PAD_GPIO1_IO14__FLEXCAN2_RX	0x59
-			MX7D_PAD_GPIO1_IO15__FLEXCAN2_TX	0x59
+			MX7D_PAD_GPIO1_IO14__FLEXCAN2_RX	0x79 /* SODIMM 188 */
+			MX7D_PAD_GPIO1_IO15__FLEXCAN2_TX	0x79 /* SODIMM 178 */
 		>;
 	};
 
-- 
2.22.0


  parent reply	other threads:[~2019-08-12 14:21 UTC|newest]

Thread overview: 48+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-08-12 14:21 [PATCH v4 00/21] Common patches from downstream development Philippe Schenker
2019-08-12 14:21 ` [PATCH v4 01/21] ARM: dts: imx7-colibri: make sure module supplies are always on Philippe Schenker
2019-08-19 10:58   ` Shawn Guo
2019-08-12 14:21 ` [PATCH v4 02/21] ARM: dts: imx7-colibri: disable HS400 Philippe Schenker
2019-08-15 13:52   ` Oleksandr Suvorov
2019-08-19 11:06   ` Shawn Guo
2019-08-12 14:21 ` Philippe Schenker [this message]
2019-08-19 11:09   ` [PATCH v4 03/21] ARM: dts: imx7-colibri: prepare module device tree for FlexCAN Shawn Guo
2019-08-12 14:21 ` [PATCH v4 04/21] ARM: dts: imx7-colibri: Add sleep mode to ethernet Philippe Schenker
2019-08-19 11:12   ` Shawn Guo
2019-08-12 14:21 ` [PATCH v4 05/21] ARM: dts: imx7-colibri: add recovery for I2C for iMX7 Philippe Schenker
2019-08-19 11:14   ` Shawn Guo
2019-08-12 14:21 ` [PATCH v4 06/21] ARM: dts: imx7-colibri: add GPIO wakeup key Philippe Schenker
2019-08-19 11:17   ` Shawn Guo
2019-08-12 14:21 ` [PATCH v4 07/21] ARM: dts: imx7-colibri: fix 1.8V/UHS support Philippe Schenker
2019-08-19 11:18   ` Shawn Guo
2019-08-21 12:49     ` Philippe Schenker
2019-08-12 14:21 ` [PATCH v4 08/21] ARM: dts: imx7-colibri: Add touch controllers Philippe Schenker
2019-08-15 10:59   ` Oleksandr Suvorov
2019-08-19 11:21   ` Shawn Guo
2019-08-21 12:51     ` Philippe Schenker
2019-08-12 14:21 ` [PATCH v4 09/21] ARM: dts: imx6qdl-colibri: add phy to fec Philippe Schenker
2019-08-19 11:22   ` Shawn Guo
2019-08-12 14:21 ` [PATCH v4 10/21] ARM: dts: imx6qdl-colibri: Add missing pin declaration in iomuxc Philippe Schenker
2019-08-19 11:25   ` Shawn Guo
2019-08-12 14:21 ` [PATCH v4 11/21] ARM: dts: imx6qdl-apalis: Add sleep state to can interfaces Philippe Schenker
2019-08-19 11:27   ` Shawn Guo
2019-08-21 13:15     ` Philippe Schenker
2019-08-12 14:21 ` [PATCH v4 12/21] ARM: dts: imx6-apalis: Add touchscreens used on Toradex eval boards Philippe Schenker
2019-08-15 11:04   ` Oleksandr Suvorov
2019-08-19 11:30   ` Shawn Guo
2019-08-12 14:21 ` [PATCH v4 13/21] ARM: dts: imx6-colibri: Add missing pinmuxing to Toradex eval board Philippe Schenker
2019-08-15 11:00   ` Oleksandr Suvorov
2019-08-12 14:21 ` [PATCH v4 14/21] ARM: dts: imx6ull-colibri: Add sleep mode to fec Philippe Schenker
2019-08-16  7:09   ` Oleksandr Suvorov
2019-08-12 14:21 ` [PATCH v4 15/21] ARM: dts: imx6ull-colibri: reduce v_batt current in power off Philippe Schenker
2019-08-15  7:55   ` Oleksandr Suvorov
2019-08-12 14:21 ` [PATCH v4 16/21] ARM: dts: imx6ull-colibri: Add watchdog Philippe Schenker
2019-08-12 14:21 ` [PATCH v4 17/21] ARM: dts: imx6ull: improve can templates Philippe Schenker
2019-08-15  7:42   ` Oleksandr Suvorov
2019-08-12 14:21 ` [PATCH v4 18/21] ARM: dts: imx6ull-colibri: Add general wakeup key used on Colibri Philippe Schenker
2019-08-15 13:44   ` Oleksandr Suvorov
2019-08-12 14:21 ` [PATCH v4 19/21] ARM: dts: imx6ull-colibri: Add touchscreen used with Eval Board Philippe Schenker
2019-08-15 11:02   ` Oleksandr Suvorov
2019-08-12 14:21 ` [PATCH v4 20/21] ARM: dts: imx7-colibri: Add UHS support to eval board Philippe Schenker
2019-08-16  6:44   ` Philippe Schenker
2019-08-12 14:21 ` [PATCH v4 21/21] ARM: dts: imx6qdl-colibri.dtsi: UHS-I support for v1.1a hw Philippe Schenker
2019-08-16  6:44   ` Philippe Schenker

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=20190812142105.1995-4-philippe.schenker@toradex.com \
    --to=philippe.schenker@toradex.com \
    --cc=devicetree@vger.kernel.org \
    --cc=festevam@gmail.com \
    --cc=kernel@pengutronix.de \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-imx@nxp.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=marcel.ziswiler@toradex.com \
    --cc=mark.rutland@arm.com \
    --cc=max.krummenacher@toradex.com \
    --cc=michal.vokac@ysoft.com \
    --cc=robh+dt@kernel.org \
    --cc=s.hauer@pengutronix.de \
    --cc=shawnguo@kernel.org \
    --cc=stefan@agner.ch \
    /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

all inboxes | Powered by JetHome®