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>, Oleksandr Suvorov <oleksandr.suvorov@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 v5 11/13] ARM: dts: imx6ull: improve can templates Date: Tue, 27 Aug 2019 13:18:38 +0000 [thread overview] Message-ID: <20190827131806.6816-12-philippe.schenker@toradex.com> (raw) In-Reply-To: <20190827131806.6816-1-philippe.schenker@toradex.com> 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> Reviewed-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com> --- Changes in v5: - Added Olek's Reviewed-by Changes in v4: - Move can nodes to module deviceteree include imx6ull-colibri.dtsi Changes in v3: None Changes in v2: None .../arm/boot/dts/imx6ull-colibri-nonwifi.dtsi | 2 +- arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi | 2 +- arch/arm/boot/dts/imx6ull-colibri.dtsi | 28 +++++++++++++++++-- 3 files changed, 28 insertions(+), 4 deletions(-) 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..6d850d997e1e 100644 --- a/arch/arm/boot/dts/imx6ull-colibri.dtsi +++ b/arch/arm/boot/dts/imx6ull-colibri.dtsi @@ -54,6 +54,18 @@ vref-supply = <®_module_3v3_avdd>; }; +&can1 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_flexcan1>; + status = "disabled"; +}; + +&can2 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_flexcan2>; + status = "disabled"; +}; + /* Colibri SPI */ &ecspi1 { cs-gpios = <&gpio3 26 GPIO_ACTIVE_HIGH>; @@ -256,6 +268,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 +290,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 +342,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.23.0
WARNING: multiple messages have this Message-ID (diff)
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: Sascha Hauer <s.hauer@pengutronix.de>, "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>, Oleksandr Suvorov <oleksandr.suvorov@toradex.com>, Philippe Schenker <philippe.schenker@toradex.com>, NXP Linux Team <linux-imx@nxp.com>, Pengutronix Kernel Team <kernel@pengutronix.de>, "linux-arm-kernel@lists.infradead.org" <linux-arm-kernel@lists.infradead.org> Subject: [PATCH v5 11/13] ARM: dts: imx6ull: improve can templates Date: Tue, 27 Aug 2019 13:18:38 +0000 [thread overview] Message-ID: <20190827131806.6816-12-philippe.schenker@toradex.com> (raw) In-Reply-To: <20190827131806.6816-1-philippe.schenker@toradex.com> 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> Reviewed-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com> --- Changes in v5: - Added Olek's Reviewed-by Changes in v4: - Move can nodes to module deviceteree include imx6ull-colibri.dtsi Changes in v3: None Changes in v2: None .../arm/boot/dts/imx6ull-colibri-nonwifi.dtsi | 2 +- arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi | 2 +- arch/arm/boot/dts/imx6ull-colibri.dtsi | 28 +++++++++++++++++-- 3 files changed, 28 insertions(+), 4 deletions(-) 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..6d850d997e1e 100644 --- a/arch/arm/boot/dts/imx6ull-colibri.dtsi +++ b/arch/arm/boot/dts/imx6ull-colibri.dtsi @@ -54,6 +54,18 @@ vref-supply = <®_module_3v3_avdd>; }; +&can1 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_flexcan1>; + status = "disabled"; +}; + +&can2 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_flexcan2>; + status = "disabled"; +}; + /* Colibri SPI */ &ecspi1 { cs-gpios = <&gpio3 26 GPIO_ACTIVE_HIGH>; @@ -256,6 +268,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 +290,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 +342,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.23.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2019-08-27 13:18 UTC|newest] Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-08-27 13:18 [PATCH v5 00/13] Common patches from downstream development Philippe Schenker 2019-08-27 13:18 ` Philippe Schenker 2019-08-27 13:18 ` Philippe Schenker 2019-08-27 13:18 ` [PATCH v5 01/13] ARM: dts: imx7-colibri: add GPIO wakeup key Philippe Schenker 2019-08-27 13:18 ` Philippe Schenker 2019-08-27 13:18 ` Philippe Schenker 2019-08-27 13:18 ` [PATCH v5 02/13] ARM: dts: imx7-colibri: fix 1.8V/UHS support Philippe Schenker 2019-08-27 13:18 ` Philippe Schenker 2019-08-27 13:18 ` Philippe Schenker 2019-08-27 13:18 ` [PATCH v5 03/13] ARM: dts: imx7-colibri: Add touch controllers Philippe Schenker 2019-08-27 13:18 ` Philippe Schenker 2019-08-27 13:18 ` Philippe Schenker 2019-08-27 13:18 ` [PATCH v5 04/13] ARM: dts: imx6qdl-colibri: Add missing pin declaration in iomuxc Philippe Schenker 2019-08-27 13:18 ` Philippe Schenker 2019-08-27 13:18 ` Philippe Schenker 2019-08-27 13:18 ` [PATCH v5 05/13] ARM: dts: imx6qdl-apalis: Add sleep state to can interfaces Philippe Schenker 2019-08-27 13:18 ` Philippe Schenker 2019-08-27 13:18 ` Philippe Schenker 2019-08-27 13:18 ` [PATCH v5 06/13] ARM: dts: imx6-apalis: Add touchscreens used on Toradex eval boards Philippe Schenker 2019-08-27 13:18 ` Philippe Schenker 2019-08-27 13:18 ` Philippe Schenker 2019-08-27 13:18 ` [PATCH v5 07/13] ARM: dts: imx6-colibri: Add missing pinmuxing to Toradex eval board Philippe Schenker 2019-08-27 13:18 ` Philippe Schenker 2019-08-27 13:18 ` Philippe Schenker 2019-08-27 13:18 ` [PATCH v5 08/13] ARM: dts: imx6ull-colibri: Add sleep mode to fec Philippe Schenker 2019-08-27 13:18 ` Philippe Schenker 2019-08-27 13:18 ` Philippe Schenker 2019-08-27 13:18 ` [PATCH v5 09/13] ARM: dts: imx6ull-colibri: reduce v_batt current in power off Philippe Schenker 2019-08-27 13:18 ` Philippe Schenker 2019-08-27 13:18 ` Philippe Schenker 2019-08-27 13:18 ` [PATCH v5 10/13] ARM: dts: imx6ull-colibri: Add watchdog Philippe Schenker 2019-08-27 13:18 ` Philippe Schenker 2019-08-27 13:18 ` Philippe Schenker 2019-08-27 13:18 ` Philippe Schenker [this message] 2019-08-27 13:18 ` [PATCH v5 11/13] ARM: dts: imx6ull: improve can templates Philippe Schenker 2019-08-27 13:18 ` Philippe Schenker 2019-08-27 13:18 ` [PATCH v5 12/13] ARM: dts: imx6ull-colibri: Add general wakeup key used on Colibri Philippe Schenker 2019-08-27 13:18 ` Philippe Schenker 2019-08-27 13:18 ` Philippe Schenker 2019-08-27 13:18 ` [PATCH v5 13/13] ARM: dts: imx6ull-colibri: Add touchscreen used with Eval Board Philippe Schenker 2019-08-27 13:18 ` Philippe Schenker 2019-08-27 13:18 ` Philippe Schenker 2019-09-14 2:30 ` [PATCH v5 00/13] Common patches from downstream development Shawn Guo 2019-09-14 2:30 ` Shawn Guo 2019-09-14 2:30 ` 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=20190827131806.6816-12-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=oleksandr.suvorov@toradex.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
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.