@@ -111,7 +111,6 @@
#define HDMITX_TOP_G12A_OFFSET 0x8000
/* HHI Registers */
-#define HHI_HDMI_CLK_CNTL 0x1cc /* 0x73 */
#define HHI_HDMI_PHY_CNTL0 0x3a0 /* 0xe8 */
#define HHI_HDMI_PHY_CNTL1 0x3a4 /* 0xe9 */
#define PHY_CNTL1_INIT 0x03900000
@@ -419,9 +418,6 @@ static void meson_dw_hdmi_init(struct meson_dw_hdmi *meson_dw_hdmi)
{
struct meson_drm *priv = meson_dw_hdmi->priv;
- /* Enable clocks */
- regmap_update_bits(priv->hhi, HHI_HDMI_CLK_CNTL, 0xffff, 0x100);
-
/* Bring out of reset */
regmap_write(meson_dw_hdmi->top, HDMITX_TOP_SW_RESET, 0);
msleep(20);
Poking the HHI syscon is a way to setup clocks behind CCF's back. Drop these poke and let CCF handle this using DT assigned-clocks. HHI is a collection of Amlogic devices, such as clocks, reset, power domains and phys. This is another step to get rid of HHI access in Amlogic display drivers and possibly stop using the component API. Signed-off-by: Jerome Brunet <jbrunet@baylibre.com> --- This change depends on: * 0602ba0dcd0e ("arm64: dts: amlogic: gx: correct hdmi clocks") * 1443b6ea806d ("arm64: dts: amlogic: setup hdmi system clock") Time is needed for these changes to sink in u-boot and distros, making this change safe to apply. drivers/gpu/drm/meson/meson_dw_hdmi.c | 4 ---- 1 file changed, 4 deletions(-)