From: Marek Vasut <marex@denx•de>
To: linux-arm-kernel@lists•infradead.org
Cc: Marek Vasut <marex@denx•de>, Shawn Guo <shawnguo@kernel•org>,
Fabio Estevam <festevam@gmail•com>,
NXP Linux Team <linux-imx@nxp•com>,
Ludwig Zenz <lzenz@dh-electronics•com>
Subject: [PATCH V2] ARM: dts: imx6q-dhcom: Enable CAN in board DTS
Date: Tue, 17 Sep 2019 17:35:12 +0200 [thread overview]
Message-ID: <20190917153512.6102-1-marex@denx.de> (raw)
Move the CAN enablement from SoM DTSi to board DTS, as each board might need
different CAN configuration. Moreover, disable CAN2 on the PDK2 as it is not
available on any connector. This also fixes on-SoM SD slot operation, as it
shares pins with the CAN2.
Signed-off-by: Marek Vasut <marex@denx•de>
Reviewed-by: Fabio Estevam <festevam@gmail•com>
Cc: Fabio Estevam <festevam@gmail•com>
Cc: Ludwig Zenz <lzenz@dh-electronics•com>
Cc: Shawn Guo <shawnguo@kernel•org>
Cc: NXP Linux Team <linux-imx@nxp•com>
To: linux-arm-kernel@lists•infradead.org
---
V2: Add board name to subject
---
arch/arm/boot/dts/imx6q-dhcom-pdk2.dts | 8 ++++++++
arch/arm/boot/dts/imx6q-dhcom-som.dtsi | 2 --
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/imx6q-dhcom-pdk2.dts b/arch/arm/boot/dts/imx6q-dhcom-pdk2.dts
index 9c61e3be2d9a..5219553df1e7 100644
--- a/arch/arm/boot/dts/imx6q-dhcom-pdk2.dts
+++ b/arch/arm/boot/dts/imx6q-dhcom-pdk2.dts
@@ -43,6 +43,14 @@
status = "okay";
};
+&can1 {
+ status = "okay";
+};
+
+&can2 {
+ status = "disabled";
+};
+
&hdmi {
ddc-i2c-bus = <&i2c2>;
status = "okay";
diff --git a/arch/arm/boot/dts/imx6q-dhcom-som.dtsi b/arch/arm/boot/dts/imx6q-dhcom-som.dtsi
index 387801dde02e..845cfad99bf9 100644
--- a/arch/arm/boot/dts/imx6q-dhcom-som.dtsi
+++ b/arch/arm/boot/dts/imx6q-dhcom-som.dtsi
@@ -51,13 +51,11 @@
&can1 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_flexcan1>;
- status = "okay";
};
&can2 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_flexcan2>;
- status = "okay";
};
&ecspi1 {
--
2.23.0.rc1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists•infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next reply other threads:[~2019-09-17 15:35 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-17 15:35 Marek Vasut [this message]
2019-10-07 11:54 ` [PATCH V2] ARM: dts: imx6q-dhcom: Enable CAN in board DTS 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=20190917153512.6102-1-marex@denx.de \
--to=marex@denx$(echo .)de \
--cc=festevam@gmail$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=linux-imx@nxp$(echo .)com \
--cc=lzenz@dh-electronics$(echo .)com \
--cc=shawnguo@kernel$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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