Commit b0a506fb authored by Marek Vasut's avatar Marek Vasut Committed by Shawn Guo

ARM: dts: imx6q-dhcom: Enable CAN in board DTS

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: default avatarMarek Vasut <marex@denx.de>
Reviewed-by: default avatarFabio 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
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
parent 06ed392d
...@@ -43,6 +43,14 @@ &audmux { ...@@ -43,6 +43,14 @@ &audmux {
status = "okay"; status = "okay";
}; };
&can1 {
status = "okay";
};
&can2 {
status = "disabled";
};
&hdmi { &hdmi {
ddc-i2c-bus = <&i2c2>; ddc-i2c-bus = <&i2c2>;
status = "okay"; status = "okay";
......
...@@ -51,13 +51,11 @@ reg_3p3v: regulator-3P3V { ...@@ -51,13 +51,11 @@ reg_3p3v: regulator-3P3V {
&can1 { &can1 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_flexcan1>; pinctrl-0 = <&pinctrl_flexcan1>;
status = "okay";
}; };
&can2 { &can2 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pinctrl_flexcan2>; pinctrl-0 = <&pinctrl_flexcan2>;
status = "okay";
}; };
&ecspi1 { &ecspi1 {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment