diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2016-09-03 21:28:23 +0200 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2017-01-10 23:13:28 +0100 |
| commit | 2a2f87ca50fe22c067a24be88e0096a3962b6b64 (patch) | |
| tree | 3aede8906f458f204522906f50de96a80ba49978 | |
| parent | 75fc7c7ad1b7a2e7ae4521e5f71c1b7067c5e530 (diff) | |
apalis/colibri imx6 dtb: follow flexcan lable name change
flexcanX -> canX
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
| -rw-r--r-- | arch/arm/boot/dts/imx6qdl-apalis-eval.dtsi | 4 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx6qdl-apalis-ixora.dtsi | 4 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx6qdl-apalis.dtsi | 4 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx6qdl-colibri.dtsi | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/arch/arm/boot/dts/imx6qdl-apalis-eval.dtsi b/arch/arm/boot/dts/imx6qdl-apalis-eval.dtsi index 2ac2a9f5c3b7..3ea0f9579d11 100644 --- a/arch/arm/boot/dts/imx6qdl-apalis-eval.dtsi +++ b/arch/arm/boot/dts/imx6qdl-apalis-eval.dtsi @@ -154,11 +154,11 @@ }; }; -&flexcan1 { +&can1 { status = "okay"; }; -&flexcan2 { +&can2 { status = "okay"; }; diff --git a/arch/arm/boot/dts/imx6qdl-apalis-ixora.dtsi b/arch/arm/boot/dts/imx6qdl-apalis-ixora.dtsi index b54e6aef11c1..20f2c2e87fe2 100644 --- a/arch/arm/boot/dts/imx6qdl-apalis-ixora.dtsi +++ b/arch/arm/boot/dts/imx6qdl-apalis-ixora.dtsi @@ -145,11 +145,11 @@ }; }; -&flexcan1 { +&can1 { status = "okay"; }; -&flexcan2 { +&can2 { status = "okay"; }; diff --git a/arch/arm/boot/dts/imx6qdl-apalis.dtsi b/arch/arm/boot/dts/imx6qdl-apalis.dtsi index 49b52371b227..d0f399127ea4 100644 --- a/arch/arm/boot/dts/imx6qdl-apalis.dtsi +++ b/arch/arm/boot/dts/imx6qdl-apalis.dtsi @@ -298,13 +298,13 @@ }; }; -&flexcan1 { +&can1 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_flexcan1>; status = "disabled"; }; -&flexcan2 { +&can2 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_flexcan2>; status = "disabled"; diff --git a/arch/arm/boot/dts/imx6qdl-colibri.dtsi b/arch/arm/boot/dts/imx6qdl-colibri.dtsi index de140b32b02b..9d19804ec81f 100644 --- a/arch/arm/boot/dts/imx6qdl-colibri.dtsi +++ b/arch/arm/boot/dts/imx6qdl-colibri.dtsi @@ -187,14 +187,14 @@ }; /* Colibri SDDIMM 55/63 */ -&flexcan1 { +&can1 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_flexcan1>; status = "disabled"; }; /* Colibri SODOMM 178/188 */ -&flexcan2 { +&can2 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_flexcan2>; status = "disabled"; |