Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: 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
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

authored by

Marek Vasut and committed by
Shawn Guo
b0a506fb 06ed392d

+8 -2
+8
arch/arm/boot/dts/imx6q-dhcom-pdk2.dts
··· 43 43 status = "okay"; 44 44 }; 45 45 46 + &can1 { 47 + status = "okay"; 48 + }; 49 + 50 + &can2 { 51 + status = "disabled"; 52 + }; 53 + 46 54 &hdmi { 47 55 ddc-i2c-bus = <&i2c2>; 48 56 status = "okay";
-2
arch/arm/boot/dts/imx6q-dhcom-som.dtsi
··· 51 51 &can1 { 52 52 pinctrl-names = "default"; 53 53 pinctrl-0 = <&pinctrl_flexcan1>; 54 - status = "okay"; 55 54 }; 56 55 57 56 &can2 { 58 57 pinctrl-names = "default"; 59 58 pinctrl-0 = <&pinctrl_flexcan2>; 60 - status = "okay"; 61 59 }; 62 60 63 61 &ecspi1 {