The DPI code only needs to differentiate between major OMAP revisions, which can be obtained from the DSS compatible string. Replace the OMAP SoC model checks to prepare for removal of the OMAP SoC version platform data.
Signed-off-by: Laurent Pinchart laurent.pinchart@ideasonboard.com --- drivers/gpu/drm/omapdrm/dss/dpi.c | 59 +++++++++++++++++---------------------- drivers/gpu/drm/omapdrm/dss/dss.c | 10 ++++++- drivers/gpu/drm/omapdrm/dss/dss.h | 13 +++++++-- 3 files changed, 45 insertions(+), 37 deletions(-)
diff --git a/drivers/gpu/drm/omapdrm/dss/dpi.c b/drivers/gpu/drm/omapdrm/dss/dpi.c index 3d87f3af72bb..b5cb23c167db 100644 --- a/drivers/gpu/drm/omapdrm/dss/dpi.c +++ b/drivers/gpu/drm/omapdrm/dss/dpi.c @@ -39,6 +39,7 @@
struct dpi_data { struct platform_device *pdev; + enum dss_device_type type;
struct regulator *vdds_dsi_reg; enum dss_clk_source clk_src; @@ -60,25 +61,21 @@ static struct dpi_data *dpi_get_data_from_dssdev(struct omap_dss_device *dssdev) return container_of(dssdev, struct dpi_data, output); }
-static enum dss_clk_source dpi_get_clk_src(enum omap_channel channel) +static enum dss_clk_source dpi_get_clk_src(struct dpi_data *dpi) { + enum omap_channel channel = dpi->output.dispc_channel; + /* * XXX we can't currently use DSI PLL for DPI with OMAP3, as the DSI PLL * would also be used for DISPC fclk. Meaning, when the DPI output is * disabled, DISPC clock will be disabled, and TV out will stop. */ - switch (omapdss_get_version()) { - case OMAPDSS_VER_OMAP24xx: - case OMAPDSS_VER_OMAP34xx_ES1: - case OMAPDSS_VER_OMAP34xx_ES3: - case OMAPDSS_VER_OMAP3630: - case OMAPDSS_VER_AM35xx: - case OMAPDSS_VER_AM43xx: + switch (dpi->type) { + case DSS_TYPE_OMAP2: + case DSS_TYPE_OMAP3: return DSS_CLK_SRC_FCK;
- case OMAPDSS_VER_OMAP4430_ES1: - case OMAPDSS_VER_OMAP4430_ES2: - case OMAPDSS_VER_OMAP4: + case DSS_TYPE_OMAP4: switch (channel) { case OMAP_DSS_CHANNEL_LCD: return DSS_CLK_SRC_PLL1_1; @@ -88,7 +85,7 @@ static enum dss_clk_source dpi_get_clk_src(enum omap_channel channel) return DSS_CLK_SRC_FCK; }
- case OMAPDSS_VER_OMAP5: + case DSS_TYPE_OMAP5: switch (channel) { case OMAP_DSS_CHANNEL_LCD: return DSS_CLK_SRC_PLL1_1; @@ -99,7 +96,7 @@ static enum dss_clk_source dpi_get_clk_src(enum omap_channel channel) return DSS_CLK_SRC_FCK; }
- case OMAPDSS_VER_DRA7xx: + case DSS_TYPE_DRA7: switch (channel) { case OMAP_DSS_CHANNEL_LCD: return DSS_CLK_SRC_PLL1_1; @@ -593,7 +590,7 @@ static void dpi_init_pll(struct dpi_data *dpi) if (dpi->pll) return;
- dpi->clk_src = dpi_get_clk_src(dpi->output.dispc_channel); + dpi->clk_src = dpi_get_clk_src(dpi);
pll = dss_pll_find_by_src(dpi->clk_src); if (!pll) @@ -613,18 +610,14 @@ static void dpi_init_pll(struct dpi_data *dpi) * the channel in some more dynamic manner, or get the channel as a user * parameter. */ -static enum omap_channel dpi_get_channel(int port_num) +static enum omap_channel dpi_get_channel(struct dpi_data *dpi, int port_num) { - switch (omapdss_get_version()) { - case OMAPDSS_VER_OMAP24xx: - case OMAPDSS_VER_OMAP34xx_ES1: - case OMAPDSS_VER_OMAP34xx_ES3: - case OMAPDSS_VER_OMAP3630: - case OMAPDSS_VER_AM35xx: - case OMAPDSS_VER_AM43xx: + switch (dpi->type) { + case DSS_TYPE_OMAP2: + case DSS_TYPE_OMAP3: return OMAP_DSS_CHANNEL_LCD;
- case OMAPDSS_VER_DRA7xx: + case DSS_TYPE_DRA7: switch (port_num) { case 2: return OMAP_DSS_CHANNEL_LCD3; @@ -635,12 +628,10 @@ static enum omap_channel dpi_get_channel(int port_num) return OMAP_DSS_CHANNEL_LCD; }
- case OMAPDSS_VER_OMAP4430_ES1: - case OMAPDSS_VER_OMAP4430_ES2: - case OMAPDSS_VER_OMAP4: + case DSS_TYPE_OMAP4: return OMAP_DSS_CHANNEL_LCD2;
- case OMAPDSS_VER_OMAP5: + case DSS_TYPE_OMAP5: return OMAP_DSS_CHANNEL_LCD3;
default: @@ -707,10 +698,8 @@ static const struct omapdss_dpi_ops dpi_ops = { .set_data_lines = dpi_set_data_lines, };
-static void dpi_init_output_port(struct platform_device *pdev, - struct device_node *port) +static void dpi_init_output_port(struct dpi_data *dpi, struct device_node *port) { - struct dpi_data *dpi = port->data; struct omap_dss_device *out = &dpi->output; int r; u32 port_num; @@ -732,10 +721,10 @@ static void dpi_init_output_port(struct platform_device *pdev, break; }
- out->dev = &pdev->dev; + out->dev = &dpi->pdev->dev; out->id = OMAP_DSS_OUTPUT_DPI; out->output_type = OMAP_DISPLAY_TYPE_DPI; - out->dispc_channel = dpi_get_channel(port_num); + out->dispc_channel = dpi_get_channel(dpi, port_num); out->port_num = port_num; out->ops.dpi = &dpi_ops; out->owner = THIS_MODULE; @@ -751,7 +740,8 @@ static void dpi_uninit_output_port(struct device_node *port) omapdss_unregister_output(out); }
-int dpi_init_port(struct platform_device *pdev, struct device_node *port) +int dpi_init_port(struct platform_device *pdev, struct device_node *port, + enum dss_device_type type) { struct dpi_data *dpi; struct device_node *ep; @@ -777,11 +767,12 @@ int dpi_init_port(struct platform_device *pdev, struct device_node *port) of_node_put(ep);
dpi->pdev = pdev; + dpi->type = type; port->data = dpi;
mutex_init(&dpi->lock);
- dpi_init_output_port(pdev, port); + dpi_init_output_port(dpi, port);
dpi->port_initialized = true;
diff --git a/drivers/gpu/drm/omapdrm/dss/dss.c b/drivers/gpu/drm/omapdrm/dss/dss.c index fb57c0471000..6196f3ab73b7 100644 --- a/drivers/gpu/drm/omapdrm/dss/dss.c +++ b/drivers/gpu/drm/omapdrm/dss/dss.c @@ -69,6 +69,7 @@ struct dss_reg { dss_write_reg(idx, FLD_MOD(dss_read_reg(idx), val, start, end))
struct dss_features { + enum dss_device_type type; u8 fck_div_max; u8 dss_fck_multiplier; const char *parent_clk_name; @@ -916,6 +917,7 @@ static const enum omap_display_type dra7xx_ports[] = { };
static const struct dss_features omap24xx_dss_feats = { + .type = DSS_TYPE_OMAP2, /* * fck div max is really 16, but the divider range has gaps. The range * from 1 to 6 has no gaps, so let's use that as a max. @@ -929,6 +931,7 @@ static const struct dss_features omap24xx_dss_feats = { };
static const struct dss_features omap34xx_dss_feats = { + .type = DSS_TYPE_OMAP3, .fck_div_max = 16, .dss_fck_multiplier = 2, .parent_clk_name = "dpll4_ck", @@ -938,6 +941,7 @@ static const struct dss_features omap34xx_dss_feats = { };
static const struct dss_features omap3630_dss_feats = { + .type = DSS_TYPE_OMAP3, .fck_div_max = 32, .dss_fck_multiplier = 1, .parent_clk_name = "dpll4_ck", @@ -947,6 +951,7 @@ static const struct dss_features omap3630_dss_feats = { };
static const struct dss_features omap44xx_dss_feats = { + .type = DSS_TYPE_OMAP4, .fck_div_max = 32, .dss_fck_multiplier = 1, .parent_clk_name = "dpll_per_x2_ck", @@ -957,6 +962,7 @@ static const struct dss_features omap44xx_dss_feats = { };
static const struct dss_features omap54xx_dss_feats = { + .type = DSS_TYPE_OMAP5, .fck_div_max = 64, .dss_fck_multiplier = 1, .parent_clk_name = "dpll_per_x2_ck", @@ -967,6 +973,7 @@ static const struct dss_features omap54xx_dss_feats = { };
static const struct dss_features am43xx_dss_feats = { + .type = DSS_TYPE_OMAP3, .fck_div_max = 0, .dss_fck_multiplier = 0, .parent_clk_name = NULL, @@ -976,6 +983,7 @@ static const struct dss_features am43xx_dss_feats = { };
static const struct dss_features dra7xx_dss_feats = { + .type = DSS_TYPE_DRA7, .fck_div_max = 64, .dss_fck_multiplier = 1, .parent_clk_name = "dpll_per_x2_ck", @@ -1070,7 +1078,7 @@ static int dss_init_ports(struct platform_device *pdev)
switch (port_type) { case OMAP_DISPLAY_TYPE_DPI: - dpi_init_port(pdev, port); + dpi_init_port(pdev, port, dss.feat->type); break; case OMAP_DISPLAY_TYPE_SDI: sdi_init_port(pdev, port); diff --git a/drivers/gpu/drm/omapdrm/dss/dss.h b/drivers/gpu/drm/omapdrm/dss/dss.h index 983838b4f45b..6360feea87cb 100644 --- a/drivers/gpu/drm/omapdrm/dss/dss.h +++ b/drivers/gpu/drm/omapdrm/dss/dss.h @@ -75,6 +75,14 @@ #define FLD_MOD(orig, val, start, end) \ (((orig) & ~FLD_MASK(start, end)) | FLD_VAL(val, start, end))
+enum dss_device_type { + DSS_TYPE_OMAP2, + DSS_TYPE_OMAP3, + DSS_TYPE_OMAP4, + DSS_TYPE_OMAP5, + DSS_TYPE_DRA7, +}; + enum dss_io_pad_mode { DSS_IO_PAD_MODE_RESET, DSS_IO_PAD_MODE_RFBI, @@ -330,11 +338,12 @@ static inline u8 dsi_get_pixel_size(enum omap_dss_dsi_pixel_format fmt)
/* DPI */ #ifdef CONFIG_OMAP2_DSS_DPI -int dpi_init_port(struct platform_device *pdev, struct device_node *port); +int dpi_init_port(struct platform_device *pdev, struct device_node *port, + enum dss_device_type type); void dpi_uninit_port(struct device_node *port); #else static inline int dpi_init_port(struct platform_device *pdev, - struct device_node *port) + struct device_node *port, enum dss_device_type type) { return 0; }