Skip to contentSkip to conversation

Two omap4/5 fixes

PATCH New Tony Lindgren 1 participant 3 messages Mar 8, 2021 Device tree bindings

lore
Share & tools
lore
#0 lore raw

cover Two omap4/5 fixes

Hi all,

Here two fixes noticed while testing my pending patches to drop legacy data in favor of device tree data for omap4/5.

Regards,

Tony

Tony Lindgren (2):
ARM: dts: Drop duplicate sha2md5_fck to fix clk_disable race
ARM: dts: Fix moving mmc devices with aliases for omap4 & 5

 arch/arm/boot/dts/omap4.dtsi           | 5 +++++
 arch/arm/boot/dts/omap44xx-clocks.dtsi | 8 --------
 arch/arm/boot/dts/omap5.dtsi           | 5 +++++
 3 files changed, 10 insertions(+), 8 deletions(-)
Signature · 1 line
2.30.1
#1 lore raw

PATCH 1/2 ARM: dts: Drop duplicate sha2md5_fck to fix clk_disable race

We have a duplicate legacy clock defined for sha2md5_fck that can sometimes race with clk_disable() with the dts configured clock for OMAP4_SHA2MD5_CLKCTRL when unused clocks are disabled during boot causing an "Unhandled fault: imprecise external abort".

---
 arch/arm/boot/dts/omap44xx-clocks.dtsi | 8 --------
 1 file changed, 8 deletions(-)
arch/arm/boot/dts/omap44xx-clocks.dtsi +0 -8
@@ -770,14 +770,6 @@ per_abe_nc_fclk: per_abe_nc_fclk@108 {
 		ti,max-div = <2>;
 	};
 
-	sha2md5_fck: sha2md5_fck@15c8 {
-		#clock-cells = <0>;
-		compatible = "ti,gate-clock";
-		clocks = <&l3_div_ck>;
-		ti,bit-shift = <1>;
-		reg = <0x15c8>;
-	};
-
 	usb_phy_cm_clk32k: usb_phy_cm_clk32k@640 {
 		#clock-cells = <0>;
 		compatible = "ti,gate-clock";
Signature · 1 line
2.30.1
#2 lore raw

PATCH 2/2 ARM: dts: Fix moving mmc devices with aliases for omap4 & 5

In reply to Tony Lindgren

Fix moving mmc devices with dts aliases as discussed on the lists. Without this we now have internal eMMC mmc1 show up as mmc2 compared to the earlier order of devices.

---
 arch/arm/boot/dts/omap4.dtsi | 5 +++++
 arch/arm/boot/dts/omap5.dtsi | 5 +++++
 2 files changed, 10 insertions(+)
arch/arm/boot/dts/omap4.dtsi +5 -0
@@ -22,6 +22,11 @@ aliases {
 		i2c1 = &i2c2;
 		i2c2 = &i2c3;
 		i2c3 = &i2c4;
+		mmc0 = &mmc1;
+		mmc1 = &mmc2;
+		mmc2 = &mmc3;
+		mmc3 = &mmc4;
+		mmc4 = &mmc5;
 		serial0 = &uart1;
 		serial1 = &uart2;
 		serial2 = &uart3;
arch/arm/boot/dts/omap5.dtsi +5 -0
@@ -25,6 +25,11 @@ aliases {
 		i2c2 = &i2c3;
 		i2c3 = &i2c4;
 		i2c4 = &i2c5;
+		mmc0 = &mmc1;
+		mmc1 = &mmc2;
+		mmc2 = &mmc3;
+		mmc3 = &mmc4;
+		mmc4 = &mmc5;
 		serial0 = &uart1;
 		serial1 = &uart2;
 		serial2 = &uart3;
Signature · 1 line
2.30.1