Skip to contentSkip to conversation

ARM: dts: imx6: Disable "weim" node in the dtsi files

PATCH New Fabio Estevam 3 participants 3 messages Dec 30, 2016 – Jan 3, 2017

Subsystems (2)
Device tree bindings Arm i.MX and Layerscape
lore
Share & tools
lore

Fabio Estevam

author reviewer
#0 lore raw

PATCH v3 1/1 ARM: dts: imx6: Disable "weim" node in the dtsi files

From: Fabio Estevam <[email protected]>

Commit 1be81ea5860744520 ("ARM: dts: imx6: Add imx-weim parameters to dtsi's") causes the following probe error when the weim node is not present on the board dts (such as imx6q-sabresd):

imx-weim 21b8000.weim: Invalid 'ranges' configuration
imx-weim: probe of 21b8000.weim failed with error -22

There is no need to always enable the "weim" node on mx6. Do the same as in the other i.MX dtsi files where "weim" is disabled and only gets enabled on a per dts basis.

All the imx6 weim dts users explicitily provide 'status = "okay"', so this change has no impact on current imx6 weim users.

If a board does not use the weim driver it will not describe its 'ranges' property, so simply disable the 'weim' node in the imx6 dtsi files to avoid such probe error message.

Fixes 1be81ea5860744520 ("ARM: dts: imx6: Add imx-weim parameters to dtsi's")
Signed-off-by Fabio Estevam <[email protected]>

---
Changes since v2:
- Fix the error message by disabling weim at dtsi level.

 arch/arm/boot/dts/imx6qdl.dtsi | 1 +
 arch/arm/boot/dts/imx6sl.dtsi  | 1 +
 arch/arm/boot/dts/imx6sx.dtsi  | 1 +
 3 files changed, 3 insertions(+)
arch/arm/boot/dts/imx6qdl.dtsi +1 -0
index 53e6e63..89b834f 100644
@@ -1100,6 +1100,7 @@
 				interrupts = <0 14 IRQ_TYPE_LEVEL_HIGH>;
 				clocks = <&clks IMX6QDL_CLK_EIM_SLOW>;
 				fsl,weim-cs-gpr = <&gpr>;
+				status = "disabled";
 			};
 
 			ocotp: ocotp at 021bc000 {
arch/arm/boot/dts/imx6sl.dtsi +1 -0
index 4fd6de2..19cbd87 100644
@@ -900,6 +900,7 @@
 				reg = <0x021b8000 0x4000>;
 				interrupts = <0 14 IRQ_TYPE_LEVEL_HIGH>;
 				fsl,weim-cs-gpr = <&gpr>;
+				status = "disabled";
 			};
 
 			ocotp: ocotp at 021bc000 {
arch/arm/boot/dts/imx6sx.dtsi +1 -0
index 076a30f..10f3330 100644
@@ -977,6 +977,7 @@
 				interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
 				clocks = <&clks IMX6SX_CLK_EIM_SLOW>;
 				fsl,weim-cs-gpr = <&gpr>;
+				status = "disabled";
 			};
 
 			ocotp: ocotp at 021bc000 {
Signature · 1 line
2.7.4
#1 lore raw

PATCH v3 1/1 ARM: dts: imx6: Disable "weim" node in the dtsi files

Thanks Fabio.

Quoted 60 lines · Fabio Estevam

From: Fabio Estevam <[email protected]>

Commit 1be81ea5860744520 ("ARM: dts: imx6: Add imx-weim parameters to dtsi's") causes the following probe error when the weim node is not present on the board dts (such as imx6q-sabresd):

imx-weim 21b8000.weim: Invalid 'ranges' configuration
imx-weim: probe of 21b8000.weim failed with error -22

There is no need to always enable the "weim" node on mx6. Do the same as in the other i.MX dtsi files where "weim" is disabled and only gets enabled on a per dts basis.

All the imx6 weim dts users explicitily provide 'status = "okay"', so this change has no impact on current imx6 weim users.

If a board does not use the weim driver it will not describe its 'ranges' property, so simply disable the 'weim' node in the imx6 dtsi files to avoid such probe error message.

Fixes 1be81ea5860744520 ("ARM: dts: imx6: Add imx-weim parameters to dtsi's")
Signed-off-by Fabio Estevam <[email protected]>

---
Changes since v2:
- Fix the error message by disabling weim at dtsi level.

 arch/arm/boot/dts/imx6qdl.dtsi | 1 +
 arch/arm/boot/dts/imx6sl.dtsi  | 1 +
 arch/arm/boot/dts/imx6sx.dtsi  | 1 +
 3 files changed, 3 insertions(+)
arch/arm/boot/dts/imx6qdl.dtsi +1 -0
index 53e6e63..89b834f 100644
@@ -1100,6 +1100,7 @@
 				interrupts = <0 14 IRQ_TYPE_LEVEL_HIGH>;
 				clocks = <&clks IMX6QDL_CLK_EIM_SLOW>;
 				fsl,weim-cs-gpr = <&gpr>;
+				status = "disabled";
 			};
 
 			ocotp: ocotp at 021bc000 {
arch/arm/boot/dts/imx6sl.dtsi +1 -0
index 4fd6de2..19cbd87 100644
@@ -900,6 +900,7 @@
 				reg = <0x021b8000 0x4000>;
 				interrupts = <0 14 IRQ_TYPE_LEVEL_HIGH>;
 				fsl,weim-cs-gpr = <&gpr>;
+				status = "disabled";
 			};
 
 			ocotp: ocotp at 021bc000 {
arch/arm/boot/dts/imx6sx.dtsi +0 -0
index 076a30f..10f3330 100644

arch/arm/boot/dts/imx6sx.dtsi line 983

Quoted 7 lines
arch/arm/boot/dts/imx6sx.dtsi +1 -0
@@ -977,6 +977,7 @@
 				interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
 				clocks = <&clks IMX6SX_CLK_EIM_SLOW>;
 				fsl,weim-cs-gpr = <&gpr>;
+				status = "disabled";
 			};
 
 			ocotp: ocotp at 021bc000 {

I like this solution much better!

Joshua

Applied
#2 lore raw

PATCH v3 1/1 ARM: dts: imx6: Disable "weim" node in the dtsi files

In reply to Fabio Estevam
Quoted 16 lines · Fabio Estevam

From: Fabio Estevam <[email protected]>

Commit 1be81ea5860744520 ("ARM: dts: imx6: Add imx-weim parameters to dtsi's") causes the following probe error when the weim node is not present on the board dts (such as imx6q-sabresd):

imx-weim 21b8000.weim: Invalid 'ranges' configuration
imx-weim: probe of 21b8000.weim failed with error -22

There is no need to always enable the "weim" node on mx6. Do the same as in the other i.MX dtsi files where "weim" is disabled and only gets enabled on a per dts basis.

All the imx6 weim dts users explicitily provide 'status = "okay"', so this change has no impact on current imx6 weim users.

Quoted 6 lines

If a board does not use the weim driver it will not describe its 'ranges' property, so simply disable the 'weim' node in the imx6 dtsi files to avoid such probe error message.

Fixes 1be81ea5860744520 ("ARM: dts: imx6: Add imx-weim parameters to dtsi's")
Signed-off-by Fabio Estevam <[email protected]>

Applied, thanks.