diff options
author | Philipp Zabel <p.zabel@pengutronix.de> | 2015-02-24 05:41:28 -0500 |
---|---|---|
committer | Philipp Zabel <p.zabel@pengutronix.de> | 2016-03-01 02:33:38 -0500 |
commit | 53141e42cfab7c7910688bbcee813acf4b478f5b (patch) | |
tree | cbbda782ab48a7159fa1ef550b018087f1b2f7bd /drivers/gpu/drm/imx/imx-ldb.c | |
parent | 4cacf91fcb1d7118e93caf9cb6651d7f7b56e58d (diff) |
drm/imx: remove imx_drm_encoder_get_mux_id
It is replaced by drm_of_encoder_active_port_id.
Suggested-by: Daniel Kurtz <djkurtz@chromium.org>
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Diffstat (limited to 'drivers/gpu/drm/imx/imx-ldb.c')
-rw-r--r-- | drivers/gpu/drm/imx/imx-ldb.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/imx/imx-ldb.c b/drivers/gpu/drm/imx/imx-ldb.c index 22ac482231ed..0ec3b1d56080 100644 --- a/drivers/gpu/drm/imx/imx-ldb.c +++ b/drivers/gpu/drm/imx/imx-ldb.c | |||
@@ -19,6 +19,7 @@ | |||
19 | #include <drm/drmP.h> | 19 | #include <drm/drmP.h> |
20 | #include <drm/drm_fb_helper.h> | 20 | #include <drm/drm_fb_helper.h> |
21 | #include <drm/drm_crtc_helper.h> | 21 | #include <drm/drm_crtc_helper.h> |
22 | #include <drm/drm_of.h> | ||
22 | #include <drm/drm_panel.h> | 23 | #include <drm/drm_panel.h> |
23 | #include <linux/mfd/syscon.h> | 24 | #include <linux/mfd/syscon.h> |
24 | #include <linux/mfd/syscon/imx6q-iomuxc-gpr.h> | 25 | #include <linux/mfd/syscon/imx6q-iomuxc-gpr.h> |
@@ -215,7 +216,7 @@ static void imx_ldb_encoder_commit(struct drm_encoder *encoder) | |||
215 | struct imx_ldb_channel *imx_ldb_ch = enc_to_imx_ldb_ch(encoder); | 216 | struct imx_ldb_channel *imx_ldb_ch = enc_to_imx_ldb_ch(encoder); |
216 | struct imx_ldb *ldb = imx_ldb_ch->ldb; | 217 | struct imx_ldb *ldb = imx_ldb_ch->ldb; |
217 | int dual = ldb->ldb_ctrl & LDB_SPLIT_MODE_EN; | 218 | int dual = ldb->ldb_ctrl & LDB_SPLIT_MODE_EN; |
218 | int mux = imx_drm_encoder_get_mux_id(imx_ldb_ch->child, encoder); | 219 | int mux = drm_of_encoder_active_port_id(imx_ldb_ch->child, encoder); |
219 | 220 | ||
220 | drm_panel_prepare(imx_ldb_ch->panel); | 221 | drm_panel_prepare(imx_ldb_ch->panel); |
221 | 222 | ||
@@ -265,7 +266,7 @@ static void imx_ldb_encoder_mode_set(struct drm_encoder *encoder, | |||
265 | int dual = ldb->ldb_ctrl & LDB_SPLIT_MODE_EN; | 266 | int dual = ldb->ldb_ctrl & LDB_SPLIT_MODE_EN; |
266 | unsigned long serial_clk; | 267 | unsigned long serial_clk; |
267 | unsigned long di_clk = mode->clock * 1000; | 268 | unsigned long di_clk = mode->clock * 1000; |
268 | int mux = imx_drm_encoder_get_mux_id(imx_ldb_ch->child, encoder); | 269 | int mux = drm_of_encoder_active_port_id(imx_ldb_ch->child, encoder); |
269 | 270 | ||
270 | if (mode->clock > 170000) { | 271 | if (mode->clock > 170000) { |
271 | dev_warn(ldb->dev, | 272 | dev_warn(ldb->dev, |