Skip to contentSkip to conversation

clk: ux500: fix erroneous bit assignment

PATCH New Linus Walleij 2 participants 2 messages Oct 18, 2013

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 2/5 clk: ux500: fix erroneous bit assignment

Due to a typo or similar, the peripheral group 2 clock 11 gate was set to bit 1 instead of bit 11. We need to fix this to be able to set the correct enable bit in the device tree:
when trying to correct the bit assignment in the device tree, the system would hang.

Cc Lee Jones <[email protected]>
Cc Mike Turquette <[email protected]>

---
Mike: seeking an ACK for this as it needs to be taken into ARM SoC with the rest of the fixes so as not to cause bisection problems between the trees.

---
 drivers/clk/ux500/u8500_of_clk.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/ux500/u8500_of_clk.c +1 -1
index b768b50..cdeff29 100644
@@ -339,7 +339,7 @@ void u8500_of_clk_init(u32 clkrst1_base, u32 clkrst2_base, u32 clkrst3_base,
 
 	clk = clk_reg_prcc_pclk("p2_pclk11", "per2clk", clkrst2_base,
 				BIT(11), 0);
-	PRCC_PCLK_STORE(clk, 2, 1);
+	PRCC_PCLK_STORE(clk, 2, 11);
 
 	clk = clk_reg_prcc_pclk("p2_pclk12", "per2clk", clkrst2_base,
 				BIT(12), 0);
Signature · 1 line
1.8.3.1
#1 lore raw

PATCH 2/5 clk: ux500: fix erroneous bit assignment

Quoted 22 lines · Linus Walleij

Due to a typo or similar, the peripheral group 2 clock 11 gate was set to bit 1 instead of bit 11. We need to fix this to be able to set the correct enable bit in the device tree:
when trying to correct the bit assignment in the device tree, the system would hang.

Cc Lee Jones <[email protected]>
Cc Mike Turquette <[email protected]>

---
Mike: seeking an ACK for this as it needs to be taken into ARM SoC with the rest of the fixes so as not to cause bisection problems between the trees.

---
 drivers/clk/ux500/u8500_of_clk.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/ux500/u8500_of_clk.c +0 -0
index b768b50..cdeff29 100644

drivers/clk/ux500/u8500_of_clk.c void u8500_of_clk_init(u32 clkrst1_base, u32 clkrst2_base, u32 clkrst3_base, · line 342

Quoted 5 lines
drivers/clk/ux500/u8500_of_clk.c +1 -1
@@ -339,7 +339,7 @@ void u8500_of_clk_init(u32 clkrst1_base, u32 clkrst2_base, u32 clkrst3_base,
 
 	clk = clk_reg_prcc_pclk("p2_pclk11", "per2clk", clkrst2_base,
 				BIT(11), 0);
-	PRCC_PCLK_STORE(clk, 2, 1);
+	PRCC_PCLK_STORE(clk, 2, 11);

Ah, you found it already. Nice.

Signature · 4 lines
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org ? Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog