diff options
| author |   Marek Vasut <marex@denx.de> | 2019-09-17 17:35:12 +0200 |
|---|---|---|
| committer |   Shawn Guo <shawnguo@kernel.org> | 2019-10-07 19:54:00 +0800 |
| commit | b0a506fb806d7bedfb979a42ae65fd9859906dc9 (patch) | |
| tree | 98894eaa654156613ddac8d5fd29a5bd141f5f20 /arch/arm/boot | |
| parent | ARM: dts: imx7d: Add opp-suspend property (diff) | |
| download | linux-dev-b0a506fb806d7bedfb979a42ae65fd9859906dc9.tar.xz linux-dev-b0a506fb806d7bedfb979a42ae65fd9859906dc9.zip | |
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>
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/dts/imx6q-dhcom-pdk2.dts | 8 | ||||
| -rw-r--r-- | 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 { |