Commit 4c7f16d1 authored by Chen-Yu Tsai's avatar Chen-Yu Tsai Committed by Maxime Ripard

drm/sun4i: Fix TCON clock and regmap initialization sequence

The TCON driver calls sun4i_tcon_init_regmap and sun4i_tcon_init_clocks
in its bind function. The former creates a regmap and writes to several
register to clear its configuration to a known default. The latter
initializes various clocks. This includes enabling the bus clock for
register access and creating the dotclock.

In order for the first step's writes to work, the bus clock must be
enabled which is done in the second step. but the dotclock's ops use
the regmap created in the first step.

Rearrange the function calls such that the clocks are initialized before
the regmap, and split out the dot clock creation to after the regmap is
initialized.

Fixes: 9026e0d1 ("drm: Add Allwinner A10 Display Engine support")
Signed-off-by: default avatarChen-Yu Tsai <wens@csie.org>
Signed-off-by: default avatarMaxime Ripard <maxime.ripard@free-electrons.com>
parent 596afb6f
...@@ -335,12 +335,11 @@ static int sun4i_tcon_init_clocks(struct device *dev, ...@@ -335,12 +335,11 @@ static int sun4i_tcon_init_clocks(struct device *dev,
} }
} }
return sun4i_dclk_create(dev, tcon); return 0;
} }
static void sun4i_tcon_free_clocks(struct sun4i_tcon *tcon) static void sun4i_tcon_free_clocks(struct sun4i_tcon *tcon)
{ {
sun4i_dclk_free(tcon);
clk_disable_unprepare(tcon->clk); clk_disable_unprepare(tcon->clk);
} }
...@@ -505,22 +504,28 @@ static int sun4i_tcon_bind(struct device *dev, struct device *master, ...@@ -505,22 +504,28 @@ static int sun4i_tcon_bind(struct device *dev, struct device *master,
return ret; return ret;
} }
ret = sun4i_tcon_init_clocks(dev, tcon);
if (ret) {
dev_err(dev, "Couldn't init our TCON clocks\n");
goto err_assert_reset;
}
ret = sun4i_tcon_init_regmap(dev, tcon); ret = sun4i_tcon_init_regmap(dev, tcon);
if (ret) { if (ret) {
dev_err(dev, "Couldn't init our TCON regmap\n"); dev_err(dev, "Couldn't init our TCON regmap\n");
goto err_assert_reset; goto err_free_clocks;
} }
ret = sun4i_tcon_init_clocks(dev, tcon); ret = sun4i_dclk_create(dev, tcon);
if (ret) { if (ret) {
dev_err(dev, "Couldn't init our TCON clocks\n"); dev_err(dev, "Couldn't create our TCON dot clock\n");
goto err_assert_reset; goto err_free_clocks;
} }
ret = sun4i_tcon_init_irq(dev, tcon); ret = sun4i_tcon_init_irq(dev, tcon);
if (ret) { if (ret) {
dev_err(dev, "Couldn't init our TCON interrupts\n"); dev_err(dev, "Couldn't init our TCON interrupts\n");
goto err_free_clocks; goto err_free_dotclock;
} }
tcon->crtc = sun4i_crtc_init(drm); tcon->crtc = sun4i_crtc_init(drm);
...@@ -536,6 +541,8 @@ static int sun4i_tcon_bind(struct device *dev, struct device *master, ...@@ -536,6 +541,8 @@ static int sun4i_tcon_bind(struct device *dev, struct device *master,
return 0; return 0;
err_free_dotclock:
sun4i_dclk_free(tcon);
err_free_clocks: err_free_clocks:
sun4i_tcon_free_clocks(tcon); sun4i_tcon_free_clocks(tcon);
err_assert_reset: err_assert_reset:
...@@ -548,6 +555,7 @@ static void sun4i_tcon_unbind(struct device *dev, struct device *master, ...@@ -548,6 +555,7 @@ static void sun4i_tcon_unbind(struct device *dev, struct device *master,
{ {
struct sun4i_tcon *tcon = dev_get_drvdata(dev); struct sun4i_tcon *tcon = dev_get_drvdata(dev);
sun4i_dclk_free(tcon);
sun4i_tcon_free_clocks(tcon); sun4i_tcon_free_clocks(tcon);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment