diff --git a/drivers/clk/samsung/clk-zumapro.c b/drivers/clk/samsung/clk-zumapro.c index 2db80e4f45..4e47c45c12 100644 --- a/drivers/clk/samsung/clk-zumapro.c +++ b/drivers/clk/samsung/clk-zumapro.c @@ -287,10 +287,11 @@ static const struct samsung_gate_clock hsi2_gates[] __initconst = { 0x20d0, 21, CLK_IGNORE_UNUSED, 0), GATE(CLK_GOUT_SYSREG_HSI2, "zumapro_sysreg_hsi2", "zumapro_hsi2_noc_user", 0x20e8, 21, CLK_IGNORE_UNUSED, 0), + /* GPIO bus clocks stay on, as for PERIC0's below */ GATE(CLK_GOUT_GPIO_HSI2UFS, "zumapro_gpio_hsi2ufs", "zumapro_hsi2_noc_user", - 0x2008, 21, CLK_IGNORE_UNUSED, 0), + 0x2008, 21, CLK_IS_CRITICAL, 0), GATE(CLK_GOUT_GPIO_HSI2, "zumapro_gpio_hsi2", "zumapro_hsi2_noc_user", - 0x2060, 21, CLK_IGNORE_UNUSED, 0), + 0x2060, 21, CLK_IS_CRITICAL, 0), GATE(CLK_GOUT_PCIE1_CTL_APB, "zumapro_pcie1_ctl_apb", "zumapro_hsi2_noc_user", 0x2094, 21, CLK_IGNORE_UNUSED, 0), GATE(CLK_GOUT_PCIE1_DBI_ACLK, "zumapro_pcie1_dbi_aclk", @@ -759,9 +760,15 @@ static const struct samsung_div_clock peric0_dividers[] __initconst = { "zumapro_mout_peric0_usi6_user", 0x1824, 0, 4, 0, CLK_DIVIDER_READ_ONLY), }; +/* + * The GPIO block's bus clock stays on. The gate is in manual mode (no + * automatic clock gating on this CMU here), and the pin controller turns + * it off after every register access; with the modem's AP2CP lines on + * this block toggling twice a second, the SoC hung within minutes. + */ static const struct samsung_gate_clock peric0_gates[] __initconst = { GATE(CLK_GOUT_GPIO_PERIC0, "zumapro_gpio_peric0", "zumapro_peric0_noc_user", - 0x20b8, 21, CLK_IGNORE_UNUSED, 0), + 0x20b8, 21, CLK_IS_CRITICAL, 0), }; static const struct samsung_gate_clock peric0_ro_gates[] __initconst = {