Skip to content

Commit e91d5f9

Browse files
JackyBaistorulf
authored andcommitted
pmdomain: imx8mp-blk-ctrl: Keep the NOC_HDCP clock enabled
Keep the NOC_HDCP clock always enabled to fix the potential hang caused by the NoC ADB400 port power down handshake. Fixes: 77b0ddb ("soc: imx: add i.MX8MP HDMI blk ctrl HDCP/HRV_MWR") Signed-off-by: Jacky Bai <ping.bai@nxp.com> Cc: stable@vger.kernel.org Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
1 parent 88c4bd9 commit e91d5f9

1 file changed

Lines changed: 1 addition & 7 deletions

File tree

drivers/pmdomain/imx/imx8mp-blk-ctrl.c

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -352,9 +352,6 @@ static void imx8mp_hdmi_blk_ctrl_power_on(struct imx8mp_blk_ctrl *bc,
352352
regmap_set_bits(bc->regmap, HDMI_RTX_RESET_CTL0, BIT(12));
353353
regmap_clear_bits(bc->regmap, HDMI_TX_CONTROL0, BIT(3));
354354
break;
355-
case IMX8MP_HDMIBLK_PD_HDCP:
356-
regmap_set_bits(bc->regmap, HDMI_RTX_CLK_CTL0, BIT(11));
357-
break;
358355
case IMX8MP_HDMIBLK_PD_HRV:
359356
regmap_set_bits(bc->regmap, HDMI_RTX_CLK_CTL1, BIT(3) | BIT(4) | BIT(5));
360357
regmap_set_bits(bc->regmap, HDMI_RTX_RESET_CTL0, BIT(15));
@@ -408,9 +405,6 @@ static void imx8mp_hdmi_blk_ctrl_power_off(struct imx8mp_blk_ctrl *bc,
408405
regmap_clear_bits(bc->regmap, HDMI_RTX_CLK_CTL0, BIT(7));
409406
regmap_clear_bits(bc->regmap, HDMI_RTX_CLK_CTL1, BIT(22) | BIT(24));
410407
break;
411-
case IMX8MP_HDMIBLK_PD_HDCP:
412-
regmap_clear_bits(bc->regmap, HDMI_RTX_CLK_CTL0, BIT(11));
413-
break;
414408
case IMX8MP_HDMIBLK_PD_HRV:
415409
regmap_clear_bits(bc->regmap, HDMI_RTX_RESET_CTL0, BIT(15));
416410
regmap_clear_bits(bc->regmap, HDMI_RTX_CLK_CTL1, BIT(3) | BIT(4) | BIT(5));
@@ -439,7 +433,7 @@ static int imx8mp_hdmi_power_notifier(struct notifier_block *nb,
439433
regmap_write(bc->regmap, HDMI_RTX_CLK_CTL0, 0x0);
440434
regmap_write(bc->regmap, HDMI_RTX_CLK_CTL1, 0x0);
441435
regmap_set_bits(bc->regmap, HDMI_RTX_CLK_CTL0,
442-
BIT(0) | BIT(1) | BIT(10));
436+
BIT(0) | BIT(1) | BIT(10) | BIT(11));
443437
regmap_set_bits(bc->regmap, HDMI_RTX_RESET_CTL0, BIT(0));
444438

445439
/*

0 commit comments

Comments
 (0)