From 4010d32fa7a870aa4653a2cfdf607d182cf8be5e Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Tue, 14 Aug 2012 12:21:17 +0200 Subject: [PATCH] --- yaml --- r: 344506 b: refs/heads/master c: 86c82c43365b0c06002aa69a8185219be9437317 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/video/sh_mipi_dsi.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 517c068eadf5..a4efb277ba1f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 772f5d1b78f1427be0abe54dbde82c51678316b9 +refs/heads/master: 86c82c43365b0c06002aa69a8185219be9437317 diff --git a/trunk/drivers/video/sh_mipi_dsi.c b/trunk/drivers/video/sh_mipi_dsi.c index 3951fdae5f68..7f6ce6515b6d 100644 --- a/trunk/drivers/video/sh_mipi_dsi.c +++ b/trunk/drivers/video/sh_mipi_dsi.c @@ -369,7 +369,7 @@ static int sh_mipi_setup(struct sh_mipi *mipi, struct sh_mipi_dsi_info *pdata) /* setup LCD panel */ /* cf. drivers/video/omap/lcd_mipid.c */ - sh_mipi_dcs(ch->chan, MIPI_DCS_EXIT_SLEEP_MODE); + sh_mipi_dcs(pdata->channel, MIPI_DCS_EXIT_SLEEP_MODE); msleep(120); /* * [7] - Page Address Mode @@ -381,11 +381,11 @@ static int sh_mipi_setup(struct sh_mipi *mipi, struct sh_mipi_dsi_info *pdata) * [1] - Flip Horizontal * [0] - Flip Vertical */ - sh_mipi_dcs_param(ch->chan, MIPI_DCS_SET_ADDRESS_MODE, 0x00); + sh_mipi_dcs_param(pdata->channel, MIPI_DCS_SET_ADDRESS_MODE, 0x00); /* cf. set_data_lines() */ - sh_mipi_dcs_param(ch->chan, MIPI_DCS_SET_PIXEL_FORMAT, + sh_mipi_dcs_param(pdata->channel, MIPI_DCS_SET_PIXEL_FORMAT, pixfmt << 4); - sh_mipi_dcs(ch->chan, MIPI_DCS_SET_DISPLAY_ON); + sh_mipi_dcs(pdata->channel, MIPI_DCS_SET_DISPLAY_ON); /* Enable timeout counters */ iowrite32(0x00000f00, base + DSICTRL);