From: Shawn Guo <shawnguo@kernel.org>
To: Joakim Zhang <qiangqing.zhang@nxp.com>
Cc: "s.hauer@pengutronix.de" <s.hauer@pengutronix.de>,
"kernel@pengutronix.de" <kernel@pengutronix.de>,
Fabio Estevam <fabio.estevam@nxp.com>,
dl-linux-imx <linux-imx@nxp.com>,
"robh+dt@kernel.org" <robh+dt@kernel.org>,
"linux-arm-kernel@lists.infradead.org"
<linux-arm-kernel@lists.infradead.org>,
"devicetree@vger.kernel.org" <devicetree@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"A.s. Dong" <aisheng.dong@nxp.com>
Subject: Re: [PATCH V2 3/3] ARM: dts: sabreauto: Add flexcan support
Date: Sun, 4 Nov 2018 22:26:51 +0800 [thread overview]
Message-ID: <20181104142647.GH26016@tiger> (raw)
In-Reply-To: <20181030083954.26440-4-qiangqing.zhang@nxp.com>
On Tue, Oct 30, 2018 at 08:42:47AM +0000, Joakim Zhang wrote:
> From: Dong Aisheng <aisheng.dong@nxp.com>
>
> The flexcan1 is pin conflict with fec. So we add a new dts file with
> flexcan1 enabled with fec disabled for user to use.
>
> Signed-off-by: Dong Aisheng <aisheng.dong@nxp.com>
> Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
We do not want to maintain a pile of DTS files for a single development
board with pin sharing among different devices.
Shawn
> ---
> .../boot/dts/imx6dl-sabreauto-flexcan1.dts | 14 ++++++
> .../arm/boot/dts/imx6q-sabreauto-flexcan1.dts | 14 ++++++
> arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 47 +++++++++++++++++++
> 3 files changed, 75 insertions(+)
> create mode 100644 arch/arm/boot/dts/imx6dl-sabreauto-flexcan1.dts
> create mode 100644 arch/arm/boot/dts/imx6q-sabreauto-flexcan1.dts
>
> diff --git a/arch/arm/boot/dts/imx6dl-sabreauto-flexcan1.dts b/arch/arm/boot/dts/imx6dl-sabreauto-flexcan1.dts
> new file mode 100644
> index 000000000000..4ebcc283f549
> --- /dev/null
> +++ b/arch/arm/boot/dts/imx6dl-sabreauto-flexcan1.dts
> @@ -0,0 +1,14 @@
> +// SPDX-License-Identifier: GPL-2.0
> +//
> +// Copyright (C) 2013 Freescale Semiconductor, Inc.
> +
> +#include "imx6dl-sabreauto.dts"
> +
> +&can1{
> + status = "okay";
> +};
> +
> +&fec {
> + /* pin conflict with flexcan1 */
> + status = "disabled";
> +};
> diff --git a/arch/arm/boot/dts/imx6q-sabreauto-flexcan1.dts b/arch/arm/boot/dts/imx6q-sabreauto-flexcan1.dts
> new file mode 100644
> index 000000000000..e7e684656f09
> --- /dev/null
> +++ b/arch/arm/boot/dts/imx6q-sabreauto-flexcan1.dts
> @@ -0,0 +1,14 @@
> +// SPDX-License-Identifier: GPL-2.0
> +//
> +// Copyright (C) 2013 Freescale Semiconductor, Inc.
> +
> +#include "imx6q-sabreauto.dts"
> +
> +&can1{
> + status = "okay";
> +};
> +
> +&fec {
> + /* pin conflict with flexcan1 */
> + status = "disabled";
> +};
> diff --git a/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi b/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi
> index a10f0ad0bfb1..c1111b972b46 100644
> --- a/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi
> +++ b/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi
> @@ -101,6 +101,25 @@
> enable-active-high;
> };
>
> + reg_can_en: regulator-can-en {
> + compatible = "regulator-fixed";
> + regulator-name = "can-en";
> + regulator-min-microvolt = <3300000>;
> + regulator-max-microvolt = <3300000>;
> + gpio = <&max7310_b 6 GPIO_ACTIVE_HIGH>;
> + enable-active-high;
> + };
> +
> + reg_can_stby: regulator-can-stby {
> + compatible = "regulator-fixed";
> + regulator-name = "can-stby";
> + regulator-min-microvolt = <3300000>;
> + regulator-max-microvolt = <3300000>;
> + gpio = <&max7310_b 5 GPIO_ACTIVE_HIGH>;
> + enable-active-high;
> + vin-supply = <®_can_en>;
> + };
> +
> sound-cs42888 {
> compatible = "fsl,imx6-sabreauto-cs42888",
> "fsl,imx-audio-cs42888";
> @@ -279,6 +298,20 @@
> status = "okay";
> };
>
> +&can1 {
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_flexcan1>;
> + xceiver-supply = <®_can_stby>;
> + status = "disabled"; /* pin conflict with fec */
> +};
> +
> +&can2 {
> + pinctrl-names = "default";
> + pinctrl-0 = <&pinctrl_flexcan2>;
> + xceiver-supply = <®_can_stby>;
> + status = "okay";
> +};
> +
> &gpmi {
> pinctrl-names = "default";
> pinctrl-0 = <&pinctrl_gpmi_nand>;
> @@ -494,6 +527,20 @@
> >;
> };
>
> + pinctrl_flexcan1: flexcan1grp {
> + fsl,pins = <
> + MX6QDL_PAD_KEY_ROW2__FLEXCAN1_RX 0x17059
> + MX6QDL_PAD_KEY_COL2__FLEXCAN1_TX 0x17059
> + >;
> + };
> +
> + pinctrl_flexcan2: flexcan2grp {
> + fsl,pins = <
> + MX6QDL_PAD_KEY_COL4__FLEXCAN2_TX 0x17059
> + MX6QDL_PAD_KEY_ROW4__FLEXCAN2_RX 0x17059
> + >;
> + };
> +
> pinctrl_gpio_keys: gpiokeysgrp {
> fsl,pins = <
> MX6QDL_PAD_SD2_CMD__GPIO1_IO11 0x1b0b0
> --
> 2.17.1
>
prev parent reply other threads:[~2018-11-04 14:27 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-30 8:42 [PATCH V2 0/3] ARM: dts: sabreauto: Add flexcan support Joakim Zhang
2018-10-30 8:42 ` [PATCH V2 1/3] ARM: dts: imx6sx-sdb: " Joakim Zhang
2018-10-30 8:42 ` [PATCH V2 2/3] ARM: dts: imx6sx-sabreauto: " Joakim Zhang
2018-10-30 8:42 ` [PATCH V2 3/3] ARM: dts: sabreauto: " Joakim Zhang
2018-11-04 14:26 ` Shawn Guo [this message]
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=20181104142647.GH26016@tiger \
--to=shawnguo@kernel.org \
--cc=aisheng.dong@nxp.com \
--cc=devicetree@vger.kernel.org \
--cc=fabio.estevam@nxp.com \
--cc=kernel@pengutronix.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-imx@nxp.com \
--cc=linux-kernel@vger.kernel.org \
--cc=qiangqing.zhang@nxp.com \
--cc=robh+dt@kernel.org \
--cc=s.hauer@pengutronix.de \
/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).