All of lore.kernel.org
 help / color / mirror / Atom feed
From: Philippe Schenker <dev@pschenker.ch>
To: marcel.ziswiler@toradex.com, max.krummenacher@toradex.com,
	stefan@agner.ch, devicetree@vger.kernel.org,
	Rob Herring <robh+dt@kernel.org>, Shawn Guo <shawnguo@kernel.org>,
	Mark Rutland <mark.rutland@arm.com>
Cc: Philippe Schenker <philippe.schenker@toradex.com>,
	Fabio Estevam <festevam@gmail.com>,
	linux-kernel@vger.kernel.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 19/22] ARM: dts: imx6ull: improve can templates
Date: Tue, 30 Jul 2019 16:46:46 +0200	[thread overview]
Message-ID: <20190730144649.19022-20-dev@pschenker.ch> (raw)
In-Reply-To: <20190730144649.19022-1-dev@pschenker.ch>

From: Max Krummenacher <max.krummenacher@toradex.com>

Add the pinmuxing and a inactive node for flexcan1 on SODIMM 55/63
and move the inactive flexcan nodes to imx6ull-colibri-eval-v3.dtsi
where they belong.

Note that this commit does not enable flexcan functionality, but rather
eases the effort needed to do so.

Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
---

 arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi | 12 ++++++++++++
 arch/arm/boot/dts/imx6ull-colibri-nonwifi.dtsi |  2 +-
 arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi    |  2 +-
 arch/arm/boot/dts/imx6ull-colibri.dtsi         | 16 ++++++++++++++--
 4 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi b/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi
index b6147c76d159..3bee37c75aa6 100644
--- a/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi
+++ b/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi
@@ -83,6 +83,18 @@
 	};
 };
 
+&can1 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_flexcan1>;
+	status = "disabled";
+};
+
+&can2 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_flexcan2>;
+	status = "disabled";
+};
+
 &i2c1 {
 	status = "okay";
 
diff --git a/arch/arm/boot/dts/imx6ull-colibri-nonwifi.dtsi b/arch/arm/boot/dts/imx6ull-colibri-nonwifi.dtsi
index fb213bec4654..95a11b8bcbdb 100644
--- a/arch/arm/boot/dts/imx6ull-colibri-nonwifi.dtsi
+++ b/arch/arm/boot/dts/imx6ull-colibri-nonwifi.dtsi
@@ -15,7 +15,7 @@
 &iomuxc {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_gpio1 &pinctrl_gpio2 &pinctrl_gpio3
-		&pinctrl_gpio4 &pinctrl_gpio5 &pinctrl_gpio6>;
+		&pinctrl_gpio4 &pinctrl_gpio5 &pinctrl_gpio6 &pinctrl_gpio7>;
 };
 
 &iomuxc_snvs {
diff --git a/arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi b/arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi
index 038d8c90f6df..a0545431b3dc 100644
--- a/arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi
+++ b/arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi
@@ -26,7 +26,7 @@
 &iomuxc {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_gpio1 &pinctrl_gpio2 &pinctrl_gpio3
-		&pinctrl_gpio4 &pinctrl_gpio5>;
+		&pinctrl_gpio4 &pinctrl_gpio5 &pinctrl_gpio7>;
 
 };
 
diff --git a/arch/arm/boot/dts/imx6ull-colibri.dtsi b/arch/arm/boot/dts/imx6ull-colibri.dtsi
index e3220298dd6f..553d4c1f80e9 100644
--- a/arch/arm/boot/dts/imx6ull-colibri.dtsi
+++ b/arch/arm/boot/dts/imx6ull-colibri.dtsi
@@ -256,6 +256,13 @@
 		>;
 	};
 
+	pinctrl_flexcan1: flexcan1-grp {
+		fsl,pins = <
+			MX6UL_PAD_ENET1_RX_DATA0__FLEXCAN1_TX	0x1b020
+			MX6UL_PAD_ENET1_RX_DATA1__FLEXCAN1_RX	0x1b020
+		>;
+	};
+
 	pinctrl_flexcan2: flexcan2-grp {
 		fsl,pins = <
 			MX6UL_PAD_ENET1_TX_DATA0__FLEXCAN2_RX	0x1b020
@@ -271,8 +278,6 @@
 
 	pinctrl_gpio1: gpio1-grp {
 		fsl,pins = <
-			MX6UL_PAD_ENET1_RX_DATA0__GPIO2_IO00	0x74 /* SODIMM 55 */
-			MX6UL_PAD_ENET1_RX_DATA1__GPIO2_IO01	0x74 /* SODIMM 63 */
 			MX6UL_PAD_UART3_RX_DATA__GPIO1_IO25	0X14 /* SODIMM 77 */
 			MX6UL_PAD_JTAG_TCK__GPIO1_IO14		0x14 /* SODIMM 99 */
 			MX6UL_PAD_NAND_CE1_B__GPIO4_IO14	0x14 /* SODIMM 133 */
@@ -325,6 +330,13 @@
 		>;
 	};
 
+	pinctrl_gpio7: gpio7-grp { /* CAN1 */
+		fsl,pins = <
+			MX6UL_PAD_ENET1_RX_DATA0__GPIO2_IO00	0x74 /* SODIMM 55 */
+			MX6UL_PAD_ENET1_RX_DATA1__GPIO2_IO01	0x74 /* SODIMM 63 */
+		>;
+	};
+
 	pinctrl_gpmi_nand: gpmi-nand-grp {
 		fsl,pins = <
 			MX6UL_PAD_NAND_DATA00__RAWNAND_DATA00	0x100a9
-- 
2.22.0


WARNING: multiple messages have this Message-ID
From: Philippe Schenker <dev@pschenker.ch>
To: marcel.ziswiler@toradex.com, max.krummenacher@toradex.com,
	stefan@agner.ch, devicetree@vger.kernel.org,
	Rob Herring <robh+dt@kernel.org>, Shawn Guo <shawnguo@kernel.org>,
	Mark Rutland <mark.rutland@arm.com>
Cc: Sascha Hauer <s.hauer@pengutronix.de>,
	linux-kernel@vger.kernel.org,
	Philippe Schenker <philippe.schenker@toradex.com>,
	NXP Linux Team <linux-imx@nxp.com>,
	Pengutronix Kernel Team <kernel@pengutronix.de>,
	Fabio Estevam <festevam@gmail.com>,
	linux-arm-kernel@lists.infradead.org
Subject: [PATCH 19/22] ARM: dts: imx6ull: improve can templates
Date: Tue, 30 Jul 2019 16:46:46 +0200	[thread overview]
Message-ID: <20190730144649.19022-20-dev@pschenker.ch> (raw)
In-Reply-To: <20190730144649.19022-1-dev@pschenker.ch>

From: Max Krummenacher <max.krummenacher@toradex.com>

Add the pinmuxing and a inactive node for flexcan1 on SODIMM 55/63
and move the inactive flexcan nodes to imx6ull-colibri-eval-v3.dtsi
where they belong.

Note that this commit does not enable flexcan functionality, but rather
eases the effort needed to do so.

Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
---

 arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi | 12 ++++++++++++
 arch/arm/boot/dts/imx6ull-colibri-nonwifi.dtsi |  2 +-
 arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi    |  2 +-
 arch/arm/boot/dts/imx6ull-colibri.dtsi         | 16 ++++++++++++++--
 4 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi b/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi
index b6147c76d159..3bee37c75aa6 100644
--- a/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi
+++ b/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi
@@ -83,6 +83,18 @@
 	};
 };
 
+&can1 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_flexcan1>;
+	status = "disabled";
+};
+
+&can2 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_flexcan2>;
+	status = "disabled";
+};
+
 &i2c1 {
 	status = "okay";
 
diff --git a/arch/arm/boot/dts/imx6ull-colibri-nonwifi.dtsi b/arch/arm/boot/dts/imx6ull-colibri-nonwifi.dtsi
index fb213bec4654..95a11b8bcbdb 100644
--- a/arch/arm/boot/dts/imx6ull-colibri-nonwifi.dtsi
+++ b/arch/arm/boot/dts/imx6ull-colibri-nonwifi.dtsi
@@ -15,7 +15,7 @@
 &iomuxc {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_gpio1 &pinctrl_gpio2 &pinctrl_gpio3
-		&pinctrl_gpio4 &pinctrl_gpio5 &pinctrl_gpio6>;
+		&pinctrl_gpio4 &pinctrl_gpio5 &pinctrl_gpio6 &pinctrl_gpio7>;
 };
 
 &iomuxc_snvs {
diff --git a/arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi b/arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi
index 038d8c90f6df..a0545431b3dc 100644
--- a/arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi
+++ b/arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi
@@ -26,7 +26,7 @@
 &iomuxc {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_gpio1 &pinctrl_gpio2 &pinctrl_gpio3
-		&pinctrl_gpio4 &pinctrl_gpio5>;
+		&pinctrl_gpio4 &pinctrl_gpio5 &pinctrl_gpio7>;
 
 };
 
diff --git a/arch/arm/boot/dts/imx6ull-colibri.dtsi b/arch/arm/boot/dts/imx6ull-colibri.dtsi
index e3220298dd6f..553d4c1f80e9 100644
--- a/arch/arm/boot/dts/imx6ull-colibri.dtsi
+++ b/arch/arm/boot/dts/imx6ull-colibri.dtsi
@@ -256,6 +256,13 @@
 		>;
 	};
 
+	pinctrl_flexcan1: flexcan1-grp {
+		fsl,pins = <
+			MX6UL_PAD_ENET1_RX_DATA0__FLEXCAN1_TX	0x1b020
+			MX6UL_PAD_ENET1_RX_DATA1__FLEXCAN1_RX	0x1b020
+		>;
+	};
+
 	pinctrl_flexcan2: flexcan2-grp {
 		fsl,pins = <
 			MX6UL_PAD_ENET1_TX_DATA0__FLEXCAN2_RX	0x1b020
@@ -271,8 +278,6 @@
 
 	pinctrl_gpio1: gpio1-grp {
 		fsl,pins = <
-			MX6UL_PAD_ENET1_RX_DATA0__GPIO2_IO00	0x74 /* SODIMM 55 */
-			MX6UL_PAD_ENET1_RX_DATA1__GPIO2_IO01	0x74 /* SODIMM 63 */
 			MX6UL_PAD_UART3_RX_DATA__GPIO1_IO25	0X14 /* SODIMM 77 */
 			MX6UL_PAD_JTAG_TCK__GPIO1_IO14		0x14 /* SODIMM 99 */
 			MX6UL_PAD_NAND_CE1_B__GPIO4_IO14	0x14 /* SODIMM 133 */
@@ -325,6 +330,13 @@
 		>;
 	};
 
+	pinctrl_gpio7: gpio7-grp { /* CAN1 */
+		fsl,pins = <
+			MX6UL_PAD_ENET1_RX_DATA0__GPIO2_IO00	0x74 /* SODIMM 55 */
+			MX6UL_PAD_ENET1_RX_DATA1__GPIO2_IO01	0x74 /* SODIMM 63 */
+		>;
+	};
+
 	pinctrl_gpmi_nand: gpmi-nand-grp {
 		fsl,pins = <
 			MX6UL_PAD_NAND_DATA00__RAWNAND_DATA00	0x100a9
-- 
2.22.0


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

  parent reply	other threads:[~2019-07-30 14:58 UTC|newest]

Thread overview: 84+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-07-30 14:46 [PATCH 00/22] This patchset holds some common changes that were never upstreamed Philippe Schenker
2019-07-30 14:46 ` Philippe Schenker
2019-07-30 14:46 ` Philippe Schenker
2019-07-30 14:46 ` [PATCH 01/22] ARM: dts: imx7-colibri: make sure module supplies are always on Philippe Schenker
2019-07-30 14:46   ` Philippe Schenker
2019-07-30 14:46   ` Philippe Schenker
2019-07-30 14:46 ` [PATCH 02/22] ARM: dts: imx7-colibri: disable HS400 Philippe Schenker
2019-07-30 14:46   ` Philippe Schenker
2019-07-30 14:46   ` Philippe Schenker
2019-07-30 14:46 ` [PATCH 03/22] ARM: dts: imx7-colibri: prepare module device tree for FlexCAN Philippe Schenker
2019-07-30 14:46   ` Philippe Schenker
2019-07-30 14:46   ` Philippe Schenker
2019-07-30 14:46 ` [PATCH 04/22] ARM: dts: imx7-colibri: Add sleep mode to ethernet Philippe Schenker
2019-07-30 14:46   ` Philippe Schenker
2019-07-30 14:46   ` Philippe Schenker
2019-07-30 14:46 ` [PATCH 05/22] ARM: dts: add recovery for I2C for iMX7 Philippe Schenker
2019-07-30 14:46   ` Philippe Schenker
2019-07-30 14:46   ` Philippe Schenker
2019-07-30 14:46 ` [PATCH 06/22] ARM: dts: imx7-colibri: add GPIO wakeup key Philippe Schenker
2019-07-30 14:46   ` Philippe Schenker
2019-07-30 14:46   ` Philippe Schenker
2019-07-30 14:46 ` [PATCH 07/22] ARM: dts: imx7-colibri: fix 1.8V/UHS support Philippe Schenker
2019-07-30 14:46   ` Philippe Schenker
2019-07-30 14:46   ` Philippe Schenker
2019-07-30 14:46 ` [PATCH 08/22] ARM: dts: imx7-colibri: Add touch controllers Philippe Schenker
2019-07-30 14:46   ` Philippe Schenker
2019-07-30 14:46   ` Philippe Schenker
2019-07-30 14:46 ` [PATCH 09/22] ARM: dts: imx6qdl-colibri: add phy to fec Philippe Schenker
2019-07-30 14:46   ` Philippe Schenker
2019-07-30 14:46   ` Philippe Schenker
2019-07-30 14:46 ` [PATCH 10/22] ARM: dts: imx6qdl-colibri: Add missing pin declaration in iomuxc Philippe Schenker
2019-07-30 14:46   ` Philippe Schenker
2019-07-30 14:46 ` [PATCH 11/22] ARM: dts: imx6: Add sleep state to can interfaces Philippe Schenker
2019-07-30 14:46   ` Philippe Schenker
2019-07-31  7:14   ` Michal Vokáč
2019-07-31  7:14     ` Michal Vokáč
2019-07-31 11:13     ` Philippe Schenker
2019-07-31 11:13       ` Philippe Schenker
2019-07-31 11:13       ` Philippe Schenker
2019-07-30 14:46 ` [PATCH 12/22] ARM: dts: imx6: Add touchscreens used on Toradex eval boards Philippe Schenker
2019-07-30 14:46   ` Philippe Schenker
2019-07-30 20:46   ` Fabio Estevam
2019-07-30 20:46     ` Fabio Estevam
2019-07-30 20:46     ` Fabio Estevam
2019-07-31  6:43     ` Philippe Schenker
2019-07-31  6:43       ` Philippe Schenker
2019-07-31  6:43       ` Philippe Schenker
2019-07-31  6:54       ` Michal Vokáč
2019-07-31  6:54         ` Michal Vokáč
2019-07-31  6:54         ` Michal Vokáč
2019-07-30 14:46 ` [PATCH 13/22] ARM: dts: colibri-imx6: Add missing pinmuxing to Toradex eval board Philippe Schenker
2019-07-30 14:46   ` Philippe Schenker
2019-07-31  7:09   ` Michal Vokáč
2019-07-31  7:09     ` Michal Vokáč
2019-07-30 14:46 ` [PATCH 14/22] ARM: dts: apalis-imx6: Add some example I2C devices Philippe Schenker
2019-07-30 14:46   ` Philippe Schenker
2019-07-30 20:53   ` Fabio Estevam
2019-07-30 20:53     ` Fabio Estevam
2019-07-30 20:53     ` Fabio Estevam
2019-07-31 11:36     ` Philippe Schenker
2019-07-31 11:36       ` Philippe Schenker
2019-07-31 11:36       ` Philippe Schenker
2019-07-30 14:46 ` [PATCH 15/22] ARM: dts: apalis-imx6: Add some optional " Philippe Schenker
2019-07-30 14:46   ` Philippe Schenker
2019-07-30 20:43   ` Fabio Estevam
2019-07-30 20:43     ` Fabio Estevam
2019-07-30 20:43     ` Fabio Estevam
2019-07-31 11:37     ` Philippe Schenker
2019-07-31 11:37       ` Philippe Schenker
2019-07-31 11:37       ` Philippe Schenker
2019-07-30 14:46 ` [PATCH 16/22] ARM: dts: imx6ull-colibri: Add sleep mode to fec Philippe Schenker
2019-07-30 14:46   ` Philippe Schenker
2019-07-30 14:46 ` [PATCH 17/22] ARM: dts: imx6ull-colibri: reduce v_batt current in power off Philippe Schenker
2019-07-30 14:46   ` Philippe Schenker
2019-07-30 14:46 ` [PATCH 18/22] ARM: dts: imx6ull-colibri: Add watchdog Philippe Schenker
2019-07-30 14:46   ` Philippe Schenker
2019-07-30 14:46 ` Philippe Schenker [this message]
2019-07-30 14:46   ` [PATCH 19/22] ARM: dts: imx6ull: improve can templates Philippe Schenker
2019-07-30 14:46 ` [PATCH 20/22] ARM: dts: imx6ull-colibri: Add general wakeup key used on Colibri Philippe Schenker
2019-07-30 14:46   ` Philippe Schenker
2019-07-30 14:46 ` [PATCH 21/22] ARM: dts: imx6/7-colibri: switch dr_mode to otg Philippe Schenker
2019-07-30 14:46   ` Philippe Schenker
2019-07-30 14:46 ` [PATCH 22/22] ARM: dts: imx6ull-colibri: Add touchscreens used with Eval Board Philippe Schenker
2019-07-30 14:46   ` 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=20190730144649.19022-20-dev@pschenker.ch \
    --to=dev@pschenker.ch \
    --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=philippe.schenker@toradex.com \
    --cc=robh+dt@kernel.org \
    --cc=s.hauer@pengutronix.de \
    --cc=shawnguo@kernel.org \
    --cc=stefan@agner.ch \
    --subject='Re: [PATCH 19/22] ARM: dts: imx6ull: improve can templates' \
    /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

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.