Commit 5627c9d8 authored by Andrey Lebedev's avatar Andrey Lebedev Committed by Maxime Ripard

drm/sun4i: tcon: Introduce LVDS setup routine setting

Different sunxi flavors require slightly different sequence for enabling
LVDS output. This allows to differentiate between them.
Signed-off-by: default avatarAndrey Lebedev <andrey@lebedev.lt>
Signed-off-by: default avatarMaxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20200219180858.4806-2-andrey.lebedev@gmail.com
parent 80579bf3
...@@ -114,22 +114,11 @@ static void sun4i_tcon_channel_set_status(struct sun4i_tcon *tcon, int channel, ...@@ -114,22 +114,11 @@ static void sun4i_tcon_channel_set_status(struct sun4i_tcon *tcon, int channel,
} }
} }
static void sun4i_tcon_lvds_set_status(struct sun4i_tcon *tcon, static void sun6i_tcon_setup_lvds_phy(struct sun4i_tcon *tcon,
const struct drm_encoder *encoder, const struct drm_encoder *encoder)
bool enabled)
{ {
if (enabled) {
u8 val; u8 val;
regmap_update_bits(tcon->regs, SUN4I_TCON0_LVDS_IF_REG,
SUN4I_TCON0_LVDS_IF_EN,
SUN4I_TCON0_LVDS_IF_EN);
/*
* As their name suggest, these values only apply to the A31
* and later SoCs. We'll have to rework this when merging
* support for the older SoCs.
*/
regmap_write(tcon->regs, SUN4I_TCON0_LVDS_ANA0_REG, regmap_write(tcon->regs, SUN4I_TCON0_LVDS_ANA0_REG,
SUN6I_TCON0_LVDS_ANA0_C(2) | SUN6I_TCON0_LVDS_ANA0_C(2) |
SUN6I_TCON0_LVDS_ANA0_V(3) | SUN6I_TCON0_LVDS_ANA0_V(3) |
...@@ -154,6 +143,18 @@ static void sun4i_tcon_lvds_set_status(struct sun4i_tcon *tcon, ...@@ -154,6 +143,18 @@ static void sun4i_tcon_lvds_set_status(struct sun4i_tcon *tcon,
regmap_write_bits(tcon->regs, SUN4I_TCON0_LVDS_ANA0_REG, regmap_write_bits(tcon->regs, SUN4I_TCON0_LVDS_ANA0_REG,
SUN6I_TCON0_LVDS_ANA0_EN_DRVD(0xf), SUN6I_TCON0_LVDS_ANA0_EN_DRVD(0xf),
SUN6I_TCON0_LVDS_ANA0_EN_DRVD(val)); SUN6I_TCON0_LVDS_ANA0_EN_DRVD(val));
}
static void sun4i_tcon_lvds_set_status(struct sun4i_tcon *tcon,
const struct drm_encoder *encoder,
bool enabled)
{
if (enabled) {
regmap_update_bits(tcon->regs, SUN4I_TCON0_LVDS_IF_REG,
SUN4I_TCON0_LVDS_IF_EN,
SUN4I_TCON0_LVDS_IF_EN);
if (tcon->quirks->setup_lvds_phy)
tcon->quirks->setup_lvds_phy(tcon, encoder);
} else { } else {
regmap_update_bits(tcon->regs, SUN4I_TCON0_LVDS_IF_REG, regmap_update_bits(tcon->regs, SUN4I_TCON0_LVDS_IF_REG,
SUN4I_TCON0_LVDS_IF_EN, 0); SUN4I_TCON0_LVDS_IF_EN, 0);
...@@ -1465,12 +1466,14 @@ static const struct sun4i_tcon_quirks sun8i_a33_quirks = { ...@@ -1465,12 +1466,14 @@ static const struct sun4i_tcon_quirks sun8i_a33_quirks = {
.has_channel_0 = true, .has_channel_0 = true,
.has_lvds_alt = true, .has_lvds_alt = true,
.dclk_min_div = 1, .dclk_min_div = 1,
.setup_lvds_phy = sun6i_tcon_setup_lvds_phy,
}; };
static const struct sun4i_tcon_quirks sun8i_a83t_lcd_quirks = { static const struct sun4i_tcon_quirks sun8i_a83t_lcd_quirks = {
.supports_lvds = true, .supports_lvds = true,
.has_channel_0 = true, .has_channel_0 = true,
.dclk_min_div = 1, .dclk_min_div = 1,
.setup_lvds_phy = sun6i_tcon_setup_lvds_phy,
}; };
static const struct sun4i_tcon_quirks sun8i_a83t_tv_quirks = { static const struct sun4i_tcon_quirks sun8i_a83t_tv_quirks = {
......
...@@ -228,6 +228,9 @@ struct sun4i_tcon_quirks { ...@@ -228,6 +228,9 @@ struct sun4i_tcon_quirks {
/* callback to handle tcon muxing options */ /* callback to handle tcon muxing options */
int (*set_mux)(struct sun4i_tcon *, const struct drm_encoder *); int (*set_mux)(struct sun4i_tcon *, const struct drm_encoder *);
/* handler for LVDS setup routine */
void (*setup_lvds_phy)(struct sun4i_tcon *tcon,
const struct drm_encoder *encoder);
}; };
struct sun4i_tcon { struct sun4i_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