Skip to contentSkip to conversation

clk: samsung: gs101: Fix missing USI7_USI DIV clock in peric0_clk_regs

PATCH Applied Kuan-Wei Chiu 4 participants 4 messages May 5 – May 14

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

PATCH 1/1 clk: samsung: gs101: Fix missing USI7_USI DIV clock in peric0_clk_regs

In the peric0_clk_regs array, the divider register offset for USI6 was accidentally listed twice, while the divider for USI7 was omitted.

Missing this DIV register causes the USI7 clock divider setting to be lost and reset to its hardware default value during a suspend/resume cycle.

Replace the duplicated USI6 DIV entry with the correct USI7 DIV register.

Fixes 893f133a040b ("clk: samsung: gs101: add support for cmu_peric0")

---
Build test only. Found via manual review.
Setting up an upstream kernel on hardware would probably take considerable effort right now. Since this is an obvious typo, I'm submitting it compile tested only.

 drivers/clk/samsung/clk-gs101.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/samsung/clk-gs101.c +1 -1
index d2bcd3a9daf8..b44bb31f38b3 100644
@@ -3921,7 +3921,7 @@ static const unsigned long peric0_clk_regs[] __initconst = {
 	CLK_CON_DIV_DIV_CLK_PERIC0_USI4_USI,
 	CLK_CON_DIV_DIV_CLK_PERIC0_USI5_USI,
 	CLK_CON_DIV_DIV_CLK_PERIC0_USI6_USI,
-	CLK_CON_DIV_DIV_CLK_PERIC0_USI6_USI,
+	CLK_CON_DIV_DIV_CLK_PERIC0_USI7_USI,
 	CLK_CON_DIV_DIV_CLK_PERIC0_USI8_USI,
 	CLK_CON_BUF_CLKBUF_PERIC0_IP,
 	CLK_CON_GAT_CLK_BLK_PERIC0_UID_PERIC0_CMU_PERIC0_IPCLKPORT_PCLK,
Signature · 1 line
2.54.0.545.g6539524ca2-goog
maintainer Reviewed-by on v1 1/1
#2 lore raw
In reply to Kuan-Wei Chiu
Quoted 8 lines · Kuan-Wei Chiu

In the peric0_clk_regs array, the divider register offset for USI6 was accidentally listed twice, while the divider for USI7 was omitted.

Missing this DIV register causes the USI7 clock divider setting to be lost and reset to its hardware default value during a suspend/resume cycle.

Quoted 6 lines

Replace the duplicated USI6 DIV entry with the correct USI7 DIV register.

Fixes 893f133a040b ("clk: samsung: gs101: add support for cmu_peric0")

---

maintainer Applied
#3 lore raw
In reply to Kuan-Wei Chiu
Quoted 8 lines · Kuan-Wei Chiu

In the peric0_clk_regs array, the divider register offset for USI6 was accidentally listed twice, while the divider for USI7 was omitted.

Missing this DIV register causes the USI7 clock divider setting to be lost and reset to its hardware default value during a suspend/resume cycle.

[...]

Applied, thanks!

[1/1] clk: samsung: gs101: Fix missing USI7_USI DIV clock in peric0_clk_regs

      https://git.kernel.org/krzk/linux/c/78ee734b36284d82454e87a92094fdb926985b47

Best regards,

Signature · 1 line
Krzysztof Kozlowski <[email protected]>