* [PATCH] video: fbdev: au1200fb.c: Cleaning up variable that is never used
From: Rickard Strandqvist @ 2014-07-05 12:18 UTC (permalink / raw)
To: Jean-Christophe Plagniol-Villard, Tomi Valkeinen
Cc: Rickard Strandqvist, Rickard Strandqvist, Jingoo Han,
Daniel Vetter, Laurent Pinchart, Rob Clark, Hanjun Guo,
linux-fbdev, linux-kernel
From: Rickard Strandqvist <rickard.strandqvist@sonymobile.com>
Variable ar assigned a value that is never used.
I have also removed all the code that thereby serves no purpose.
This was found using a static code analysis program called cppcheck
Signed-off-by: Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
---
drivers/video/fbdev/au1200fb.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/video/fbdev/au1200fb.c b/drivers/video/fbdev/au1200fb.c
index 4cfba78..2249d3d 100644
--- a/drivers/video/fbdev/au1200fb.c
+++ b/drivers/video/fbdev/au1200fb.c
@@ -710,7 +710,7 @@ static int fbinfo2index (struct fb_info *fb_info)
static int au1200_setlocation (struct au1200fb_device *fbdev, int plane,
int xpos, int ypos)
{
- uint32 winctrl0, winctrl1, winenable, fb_offset = 0;
+ uint32 winctrl0, winctrl1, winenable;
int xsz, ysz;
/* FIX!!! NOT CHECKING FOR COMPLETE OFFSCREEN YET */
@@ -738,7 +738,6 @@ static int au1200_setlocation (struct au1200fb_device *fbdev, int plane,
if (xpos < 0) {
/* Off-screen to the left */
xsz = win->w[plane].xres + xpos;
- fb_offset += (((0 - xpos) * winbpp(lcd->window[plane].winctrl1))/8);
xpos = 0;
/*printk("off screen left\n");*/
}
--
1.7.10.4
^ permalink raw reply related
* [PATCH] video: fbdev: aty: radeon_base.c: Cleaning up variable that is never used
From: Rickard Strandqvist @ 2014-07-05 12:17 UTC (permalink / raw)
To: Jean-Christophe Plagniol-Villard, Tomi Valkeinen
Cc: Rickard Strandqvist, Rickard Strandqvist, Grant Likely,
Rob Herring, Jingoo Han, Daniel Vetter, Laurent Pinchart,
Rob Clark, Sachin Kamat, linux-fbdev, linux-kernel, devicetree
From: Rickard Strandqvist <rickard.strandqvist@sonymobile.com>
Variable ar assigned a value that is never used.
I have also removed all the code that thereby serves no purpose.
This was found using a static code analysis program called cppcheck
Signed-off-by: Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
---
drivers/video/fbdev/aty/radeon_base.c | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/drivers/video/fbdev/aty/radeon_base.c b/drivers/video/fbdev/aty/radeon_base.c
index 26d80a4..aee65ba 100644
--- a/drivers/video/fbdev/aty/radeon_base.c
+++ b/drivers/video/fbdev/aty/radeon_base.c
@@ -1532,14 +1532,14 @@ static int radeonfb_set_par(struct fb_info *info)
struct fb_var_screeninfo *mode = &info->var;
struct radeon_regs *newmode;
int hTotal, vTotal, hSyncStart, hSyncEnd,
- hSyncPol, vSyncStart, vSyncEnd, vSyncPol, cSync;
+ vSyncStart, vSyncEnd;
u8 hsync_adj_tab[] = {0, 0x12, 9, 9, 6, 5};
u8 hsync_fudge_fp[] = {2, 2, 0, 0, 5, 5};
u32 sync, h_sync_pol, v_sync_pol, dotClock, pixClock;
int i, freq;
int format = 0;
int nopllcalc = 0;
- int hsync_start, hsync_fudge, bytpp, hsync_wid, vsync_wid;
+ int hsync_start, hsync_fudge, hsync_wid, vsync_wid;
int primary_mon = PRIMARY_MONITOR(rinfo);
int depth = var_to_depth(mode);
int use_rmx = 0;
@@ -1612,13 +1612,7 @@ static int radeonfb_set_par(struct fb_info *info)
else if (vsync_wid > 0x1f) /* max */
vsync_wid = 0x1f;
- hSyncPol = mode->sync & FB_SYNC_HOR_HIGH_ACT ? 0 : 1;
- vSyncPol = mode->sync & FB_SYNC_VERT_HIGH_ACT ? 0 : 1;
-
- cSync = mode->sync & FB_SYNC_COMP_HIGH_ACT ? (1 << 4) : 0;
-
format = radeon_get_dstbpp(depth);
- bytpp = mode->bits_per_pixel >> 3;
if ((primary_mon = MT_DFP) || (primary_mon = MT_LCD))
hsync_fudge = hsync_fudge_fp[format-1];
--
1.7.10.4
^ permalink raw reply related
* [PATCH] video: fbdev: aty: mach64_gx.c: Cleaning up variable that is never used
From: Rickard Strandqvist @ 2014-07-05 12:16 UTC (permalink / raw)
To: Jean-Christophe Plagniol-Villard, Tomi Valkeinen
Cc: Rickard Strandqvist, Rickard Strandqvist, Jingoo Han,
Laurent Pinchart, Rob Clark, Daniel Vetter, linux-fbdev,
linux-kernel
From: Rickard Strandqvist <rickard.strandqvist@sonymobile.com>
Variable ar assigned a value that is never used.
I have also removed all the code that thereby serves no purpose.
This was found using a static code analysis program called cppcheck
Signed-off-by: Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
---
drivers/video/fbdev/aty/mach64_gx.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/video/fbdev/aty/mach64_gx.c b/drivers/video/fbdev/aty/mach64_gx.c
index 10c988a..fcb51b1 100644
--- a/drivers/video/fbdev/aty/mach64_gx.c
+++ b/drivers/video/fbdev/aty/mach64_gx.c
@@ -617,14 +617,13 @@ static int aty_var_to_pll_8398(const struct fb_info *info, u32 vclk_per,
u32 mhz100; /* in 0.01 MHz */
u32 program_bits;
/* u32 post_divider; */
- u32 mach64MinFreq, mach64MaxFreq, mach64RefFreq;
+ u32 mach64MinFreq, mach64MaxFreq;
u16 m, n, k = 0, save_m, save_n, twoToKth;
/* Calculate the programming word */
mhz100 = 100000000 / vclk_per;
mach64MinFreq = MIN_FREQ_2595;
mach64MaxFreq = MAX_FREQ_2595;
- mach64RefFreq = REF_FREQ_2595; /* 14.32 MHz */
save_m = 0;
save_n = 0;
--
1.7.10.4
^ permalink raw reply related
* [PATCH] video: fbdev: aty: atyfb_base.c: Cleaning up variable that is never used
From: Rickard Strandqvist @ 2014-07-05 12:15 UTC (permalink / raw)
To: Jean-Christophe Plagniol-Villard, Tomi Valkeinen
Cc: Rickard Strandqvist, Rickard Strandqvist, Mikulas Patocka,
Jingoo Han, Daniel Vetter, Randy Dunlap, Dan Carpenter,
Sachin Kamat, linux-fbdev, linux-kernel
From: Rickard Strandqvist <rickard.strandqvist@sonymobile.com>
Variable ar assigned a value that is never used.
I have also removed all the code that thereby serves no purpose.
This was found using a static code analysis program called cppcheck
Signed-off-by: Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
---
drivers/video/fbdev/aty/atyfb_base.c | 4 ----
1 file changed, 4 deletions(-)
diff --git a/drivers/video/fbdev/aty/atyfb_base.c b/drivers/video/fbdev/aty/atyfb_base.c
index c3d0074..46188a4 100644
--- a/drivers/video/fbdev/aty/atyfb_base.c
+++ b/drivers/video/fbdev/aty/atyfb_base.c
@@ -3088,7 +3088,6 @@ static int atyfb_setup_sparc(struct pci_dev *pdev, struct fb_info *info,
if (dp = of_console_device) {
struct fb_var_screeninfo *var = &default_var;
unsigned int N, P, Q, M, T, R;
- u32 v_total, h_total;
struct crtc crtc;
u8 pll_regs[16];
u8 clock_cntl;
@@ -3104,9 +3103,6 @@ static int atyfb_setup_sparc(struct pci_dev *pdev, struct fb_info *info,
crtc.gen_cntl = aty_ld_le32(CRTC_GEN_CNTL, par);
aty_crtc_to_var(&crtc, var);
- h_total = var->xres + var->right_margin + var->hsync_len + var->left_margin;
- v_total = var->yres + var->lower_margin + var->vsync_len + var->upper_margin;
-
/*
* Read the PLL to figure actual Refresh Rate.
*/
--
1.7.10.4
^ permalink raw reply related
* [PATCH] video: fbdev: atafb.c: Cleaning up variable that is never used
From: Rickard Strandqvist @ 2014-07-05 12:14 UTC (permalink / raw)
To: Jean-Christophe Plagniol-Villard, Tomi Valkeinen
Cc: Rickard Strandqvist, Rickard Strandqvist, Geert Uytterhoeven,
Jingoo Han, Daniel Vetter, Joe Perches, Michael Schmitz,
linux-fbdev, linux-kernel
From: Rickard Strandqvist <rickard.strandqvist@sonymobile.com>
Variable ar assigned a value that is never used.
I have also removed all the code that thereby serves no purpose.
This was found using a static code analysis program called cppcheck
Signed-off-by: Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
---
drivers/video/fbdev/atafb.c | 8 --------
1 file changed, 8 deletions(-)
diff --git a/drivers/video/fbdev/atafb.c b/drivers/video/fbdev/atafb.c
index 4953b65..1bedbf35 100644
--- a/drivers/video/fbdev/atafb.c
+++ b/drivers/video/fbdev/atafb.c
@@ -2546,7 +2546,6 @@ static void atafb_copyarea(struct fb_info *info, const struct fb_copyarea *area)
struct atafb_par *par = (struct atafb_par *)info->par;
int x2, y2;
u32 dx, dy, sx, sy, width, height;
- int rev_copy = 0;
#ifdef ATAFB_FALCON
if (info->var.bits_per_pixel = 16) {
@@ -2580,7 +2579,6 @@ static void atafb_copyarea(struct fb_info *info, const struct fb_copyarea *area)
if (dy > sy || (dy = sy && dx > sx)) {
dy += height;
sy += height;
- rev_copy = 1;
}
if (info->var.bits_per_pixel = 1)
@@ -2599,8 +2597,6 @@ static void atafb_imageblit(struct fb_info *info, const struct fb_image *image)
{
struct atafb_par *par = (struct atafb_par *)info->par;
int x2, y2;
- unsigned long *dst;
- int dst_idx;
const char *src;
u32 dx, dy, width, height, pitch;
@@ -2627,10 +2623,6 @@ static void atafb_imageblit(struct fb_info *info, const struct fb_image *image)
if (image->depth = 1) {
// used for font data
- dst = (unsigned long *)
- ((unsigned long)info->screen_base & ~(BYTES_PER_LONG - 1));
- dst_idx = ((unsigned long)info->screen_base & (BYTES_PER_LONG - 1)) * 8;
- dst_idx += dy * par->next_line * 8 + dx;
src = image->data;
pitch = (image->width + 7) / 8;
while (height--) {
--
1.7.10.4
^ permalink raw reply related
* [PATCH] video: fbdev: amifb.c: Cleaning up variable that is never used
From: Rickard Strandqvist @ 2014-07-05 12:13 UTC (permalink / raw)
To: Jean-Christophe Plagniol-Villard, Tomi Valkeinen
Cc: Rickard Strandqvist, Rickard Strandqvist, Geert Uytterhoeven,
Jingoo Han, Daniel Vetter, Joe Perches, Sachin Kamat, linux-fbdev,
linux-kernel
From: Rickard Strandqvist <rickard.strandqvist@sonymobile.com>
Variable ar assigned a value that is never used.
I have also removed all the code that thereby serves no purpose.
This was found using a static code analysis program called cppcheck
Signed-off-by: Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
---
drivers/video/fbdev/amifb.c | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/drivers/video/fbdev/amifb.c b/drivers/video/fbdev/amifb.c
index 518f790..19ed1fa 100644
--- a/drivers/video/fbdev/amifb.c
+++ b/drivers/video/fbdev/amifb.c
@@ -1124,7 +1124,6 @@ static int ami_decode_var(struct fb_var_screeninfo *var, struct amifb_par *par,
{
u_short clk_shift, line_shift;
u_long maxfetchstop, fstrt, fsize, fconst, xres_n, yres_n;
- u_int htotal, vtotal;
/*
* Find a matching Pixel Clock
@@ -1270,8 +1269,6 @@ static int ami_decode_var(struct fb_var_screeninfo *var, struct amifb_par *par,
DPRINTK("diwstrt_v too low for pal\n");
return -EINVAL;
}
- htotal = PAL_HTOTAL>>clk_shift;
- vtotal = PAL_VTOTAL>>1;
if (!IS_OCS) {
par->beamcon0 = BMC0_PAL;
par->bplcon3 |= BPC3_BRDRBLNK;
@@ -1300,8 +1297,6 @@ static int ami_decode_var(struct fb_var_screeninfo *var, struct amifb_par *par,
DPRINTK("diwstrt_v too low for ntsc\n");
return -EINVAL;
}
- htotal = NTSC_HTOTAL>>clk_shift;
- vtotal = NTSC_VTOTAL>>1;
if (!IS_OCS) {
par->beamcon0 = 0;
par->bplcon3 |= BPC3_BRDRBLNK;
@@ -1360,8 +1355,6 @@ static int ami_decode_var(struct fb_var_screeninfo *var, struct amifb_par *par,
par->beamcon0 |= BMC0_VSYTRUE;
if (var->sync & FB_SYNC_COMP_HIGH_ACT)
par->beamcon0 |= BMC0_CSYTRUE;
- htotal = par->htotal>>clk_shift;
- vtotal = par->vtotal>>1;
} else {
DPRINTK("only broadcast modes possible for ocs\n");
return -EINVAL;
@@ -1847,10 +1840,9 @@ static int ami_get_var_cursorinfo(struct fb_var_cursorinfo *var,
register short delta;
register u_char color;
short height, width, bits, words;
- int size, alloc;
+ int size;
size = par->crsr.height * par->crsr.width;
- alloc = var->height * var->width;
var->height = par->crsr.height;
var->width = par->crsr.width;
var->xspot = par->crsr.spot_x;
--
1.7.10.4
^ permalink raw reply related
* [PATCH] video: backlight: jornada720_lcd.c: Cleaning up variable that is never used
From: Rickard Strandqvist @ 2014-07-05 12:12 UTC (permalink / raw)
To: Jingoo Han, Bryan Wu
Cc: Rickard Strandqvist, Rickard Strandqvist, Lee Jones,
Jean-Christophe Plagniol-Villard, Tomi Valkeinen, linux-fbdev,
linux-kernel
From: Rickard Strandqvist <rickard.strandqvist@sonymobile.com>
Variable ar assigned a value that is never used.
I have also removed all the code that thereby serves no purpose.
This was found using a static code analysis program called cppcheck
Signed-off-by: Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
---
drivers/video/backlight/jornada720_lcd.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/video/backlight/jornada720_lcd.c b/drivers/video/backlight/jornada720_lcd.c
index da3876c..b304319 100644
--- a/drivers/video/backlight/jornada720_lcd.c
+++ b/drivers/video/backlight/jornada720_lcd.c
@@ -56,12 +56,10 @@ static int jornada_lcd_get_contrast(struct lcd_device *ld)
static int jornada_lcd_set_contrast(struct lcd_device *ld, int value)
{
- int ret;
-
jornada_ssp_start();
/* start by sending our set contrast cmd to mcu */
- ret = jornada_ssp_byte(SETCONTRAST);
+ jornada_ssp_byte(SETCONTRAST);
/* push the new value */
if (jornada_ssp_byte(value) != TXDUMMY) {
--
1.7.10.4
^ permalink raw reply related
* [PATCH] video: backlight: ili922x.c: Cleaning up variable that is never used
From: Rickard Strandqvist @ 2014-07-05 12:11 UTC (permalink / raw)
To: Jingoo Han, Bryan Wu
Cc: Rickard Strandqvist, Rickard Strandqvist, Lee Jones,
Jean-Christophe Plagniol-Villard, Tomi Valkeinen, linux-fbdev,
linux-kernel
From: Rickard Strandqvist <rickard.strandqvist@sonymobile.com>
Variable ar assigned a value that is never used.
I have also removed all the code that thereby serves no purpose.
This was found using a static code analysis program called cppcheck
Signed-off-by: Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
---
drivers/video/backlight/ili922x.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/video/backlight/ili922x.c b/drivers/video/backlight/ili922x.c
index ea67fe1..06936c8 100644
--- a/drivers/video/backlight/ili922x.c
+++ b/drivers/video/backlight/ili922x.c
@@ -251,7 +251,7 @@ static int ili922x_write(struct spi_device *spi, u8 reg, u16 value)
struct spi_transfer xfer_regindex, xfer_regvalue;
unsigned char tbuf[CMD_BUFSIZE];
unsigned char rbuf[CMD_BUFSIZE];
- int ret, len = 0;
+ int ret;
memset(&xfer_regindex, 0, sizeof(struct spi_transfer));
memset(&xfer_regvalue, 0, sizeof(struct spi_transfer));
@@ -273,7 +273,6 @@ static int ili922x_write(struct spi_device *spi, u8 reg, u16 value)
ret = spi_sync(spi, &msg);
spi_message_init(&msg);
- len = 0;
tbuf[0] = set_tx_byte(START_BYTE(ili922x_id, START_RS_REG,
START_RW_WRITE));
tbuf[1] = set_tx_byte((value & 0xFF00) >> 8);
--
1.7.10.4
^ permalink raw reply related
* Re: [RFC v4 2/2] backlight: device tree: add new tps611xx backlight binding
From: Mark Rutland @ 2014-07-04 16:31 UTC (permalink / raw)
To: Daniel Jeong
Cc: Jingoo Han, Bryan Wu, Lee Jones, Jean-Christophe Plagniol-Villard,
Tomi Valkeinen, grant.likely@linaro.org, Rob Herring,
Randy Dunlap, Daniel Jeong, linux-kernel@vger.kernel.org,
linux-fbdev@vger.kernel.org, devicetree@vger.kernel.org,
linux-doc@vger.kernel.org
In-Reply-To: <CAPqQCJUYqgireOiqK9DLpSAkw_4DdmKD+G7bXxVxf=bb0nTj6Q@mail.gmail.com>
> > +- rfa-enable: enable request for acknowledge.
> > + If RFA is enabled, the data byte includes the RFA bit and device will
> wait
> > + and check acknowledge from device.
>
> You didn't answer my question as to why this should be in the DT.
>
>
> According to the RFA enable, the easy scale pin works differently.
> This value should be set before the first data transfer.
Sure, things works differently if this is set. That I understood.
What I haven't heard is a rationale as to why this configuration option
shuold be in the DT.
Can I enable this on all implementations, or not?
When would I enable this and when would I not?
The property reads like a switch to turn a feature on, rather than the
description of the presence of a feature.
Mark.
^ permalink raw reply
* Re: [PATCH] drivers: video: fbdev: atmel_lcdfb.c: Add ability to inverted backlight PWM.
From: Nicolas Ferre @ 2014-07-04 13:28 UTC (permalink / raw)
To: Michael Welling, Jean-Christophe Plagniol-Villard,
devicetree-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
linux-fbdev-u79uwXL29TY76Z2rM5mHXA, Tomi Valkeinen
In-Reply-To: <1404440796-11090-1-git-send-email-mwelling-EkmVulN54Sk@public.gmane.org>
On 04/07/2014 04:26, Michael Welling :
> The code has a variable to change the polarity of the PWM backlight control but
> it was not being initialized. This patch adds a devicetree entry to set the
> variable if required.
>
> Signed-off-by: Michael Welling <mwelling@ieee.org>
Seems good
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
> ---
> .../devicetree/bindings/video/atmel,lcdc.txt | 1 +
> drivers/video/fbdev/atmel_lcdfb.c | 3 ++-
> 2 files changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/Documentation/devicetree/bindings/video/atmel,lcdc.txt b/Documentation/devicetree/bindings/video/atmel,lcdc.txt
> index 1ec175e..b75af94 100644
> --- a/Documentation/devicetree/bindings/video/atmel,lcdc.txt
> +++ b/Documentation/devicetree/bindings/video/atmel,lcdc.txt
> @@ -46,6 +46,7 @@ Required properties (as per of_videomode_helper):
>
> Optional properties (as per of_videomode_helper):
> - atmel,lcdcon-backlight: enable backlight
> + - atmel,lcdcon-backlight-inverted: invert backlight PWM polarity
> - atmel,lcd-wiring-mode: lcd wiring mode "RGB" or "BRG"
> - atmel,power-control-gpio: gpio to power on or off the LCD (as many as needed)
>
> diff --git a/drivers/video/fbdev/atmel_lcdfb.c b/drivers/video/fbdev/atmel_lcdfb.c
> index d36e830..92640d4 100644
> --- a/drivers/video/fbdev/atmel_lcdfb.c
> +++ b/drivers/video/fbdev/atmel_lcdfb.c
> @@ -290,7 +290,7 @@ static void init_contrast(struct atmel_lcdfb_info *sinfo)
>
> /* contrast pwm can be 'inverted' */
> if (pdata->lcdcon_pol_negative)
> - contrast_ctr &= ~(ATMEL_LCDC_POL_POSITIVE);
> + contrast_ctr &= ~(ATMEL_LCDC_POL_POSITIVE);
>
> /* have some default contrast/backlight settings */
> lcdc_writel(sinfo, ATMEL_LCDC_CONTRAST_CTR, contrast_ctr);
> @@ -1097,6 +1097,7 @@ static int atmel_lcdfb_of_init(struct atmel_lcdfb_info *sinfo)
> pdata->lcd_wiring_mode = ret;
>
> pdata->lcdcon_is_backlight = of_property_read_bool(display_np, "atmel,lcdcon-backlight");
> + pdata->lcdcon_pol_negative = of_property_read_bool(display_np, "atmel,lcdcon-backlight-inverted");
>
> timings = of_get_display_timings(display_np);
> if (!timings) {
>
--
Nicolas Ferre
^ permalink raw reply
* Re: [PATCH 2/2] video: clps711x: Fix sparse warnings
From: Alexander Shiyan @ 2014-07-04 8:35 UTC (permalink / raw)
To: linux-fbdev
In-Reply-To: <1374825597.724071106@f170.mail.ru>
RnJpLCA0IEp1bCAyMDE0IDExOjA2OjMxICswMzAwINC+0YIgVG9taSBWYWxrZWluZW4gPHRvbWku
dmFsa2VpbmVuQHRpLmNvbT46Cj4gT24gMDEvMDcvMTQgMTM6MzEsIEFsZXhhbmRlciBTaGl5YW4g
d3JvdGU6Cj4gPiBUdWUsIDEgSnVsIDIwMTQgMTM6MjI6NTEgKzAzMDAg0L7RgiBUb21pIFZhbGtl
aW5lbiA8dG9taS52YWxrZWluZW5AdGkuY29tPjoKPiA+PiBPbiAwMS8wNy8xNCAwOToyMywgQWxl
eGFuZGVyIFNoaXlhbiB3cm90ZToKPiA+Pj4gVHVlLCAxIEp1bCAyMDE0IDA5OjE0OjAyICswMzAw
INC+0YIgVG9taSBWYWxrZWluZW4gPHRvbWkudmFsa2VpbmVuQHRpLmNvbT46Cj4gPj4+PiBPbiAy
OC8wNi8xNCAwOTozNCwgQWxleGFuZGVyIFNoaXlhbiB3cm90ZToKPiA+Pj4+PiBUaGlzIHBhdGNo
IGZpeGVzIGJlbG93IHdhcm5pbmdzOgo+ID4+Pj4+IENIRUNLICAgZHJpdmVycy92aWRlby9mYmRl
di9jbHBzNzExeC1mYi5jCj4gPj4+Pj4gICBkcml2ZXJzL3ZpZGVvL2ZiZGV2L2NscHM3MTF4LWZi
LmM6MjQ3OjI0OiB3YXJuaW5nOiBpbmNvcnJlY3QgdHlwZSBpbiBhcmd1bWVudCAxIChkaWZmZXJl
bnQgYWRkcmVzcyBzcGFjZXMpCj4gPj4+Pj4gICBkcml2ZXJzL3ZpZGVvL2ZiZGV2L2NscHM3MTF4
LWZiLmM6MjQ3OjI0OiAgICBleHBlY3RlZCB2b2lkIGNvbnN0ICpwdHIKPiA+Pj4+PiAgIGRyaXZl
cnMvdmlkZW8vZmJkZXYvY2xwczcxMXgtZmIuYzoyNDc6MjQ6ICAgIGdvdCBjaGFyIFtub2RlcmVm
XSA8YXNuOjI+KnNjcmVlbl9iYXNlCj4gPj4+Pj4gICBkcml2ZXJzL3ZpZGVvL2ZiZGV2L2NscHM3
MTF4LWZiLmM6MjQ4OjM1OiB3YXJuaW5nOiBpbmNvcnJlY3QgdHlwZSBpbiBhcmd1bWVudCAxIChk
aWZmZXJlbnQgYWRkcmVzcyBzcGFjZXMpCj4gPj4+Pj4gICBkcml2ZXJzL3ZpZGVvL2ZiZGV2L2Ns
cHM3MTF4LWZiLmM6MjQ4OjM1OiAgICBleHBlY3RlZCB2b2lkIGNvbnN0ICpwdHIKPiA+Pj4+PiAg
IGRyaXZlcnMvdmlkZW8vZmJkZXYvY2xwczcxMXgtZmIuYzoyNDg6MzU6ICAgIGdvdCBjaGFyIFtu
b2RlcmVmXSA8YXNuOjI+KnNjcmVlbl9iYXNlCj4gPj4+IC4uLgo+ID4+Pj4+ICAJaW5mby0+c2Ny
ZWVuX2Jhc2UgPSBkZXZtX2lvcmVtYXBfcmVzb3VyY2UoZGV2LCByZXMpOwo+ID4+Pj4+IC0JaWYg
KElTX0VSUihpbmZvLT5zY3JlZW5fYmFzZSkpIHsKPiA+Pj4+PiAtCQlyZXQgPSBQVFJfRVJSKGlu
Zm8tPnNjcmVlbl9iYXNlKTsKPiA+Pj4+PiArCWlmIChJU19FUlIoKF9fZm9yY2Ugdm9pZCAqKWlu
Zm8tPnNjcmVlbl9iYXNlKSkgewo+ID4+Pj4+ICsJCXJldCA9IFBUUl9FUlIoKF9fZm9yY2Ugdm9p
ZCAqKWluZm8tPnNjcmVlbl9iYXNlKTsKPiA+Pj4+Cj4gPj4+PiBJIGRvbid0IHNlZSBhbnkgb3Ro
ZXIgdXNlciBvZiBkZXZtX2lvcmVtYXBfcmVzb3VyY2UoKSBoYXZpbmcgdGhhdCBraW5kCj4gPj4+
PiBvZiBjYXN0cy4gV2h5IGFyZSB0aGV5IG5lZWRlZCBoZXJlPwo+ID4+Pgo+ID4+PiBOb3QgbmVl
ZGVkLCB0eXBlIGNhc3Qgd2FzIGRvbmUgb25seSB0byByZW1vdmUgc3BhcnNlIHdhcm5pbmdzLgo+
ID4+Cj4gPj4gUmlnaHQsIGJ1dCBJIHRoaW5rIGVpdGhlciBzcGFyc2UgaXMgd3JvbmcgaGVyZSwg
b3IgdGhlIFBUUl9FUlIvSVNfRVJSCj4gPj4gYXJlIHdyb25nLiBZb3Ugc2hvdWxkbid0IGRvIHR5
cGVjYXN0cyBsaWtlIHRoYXQgdG8gaGlkZSB0aG9zZSB3YXJuaW5ncy4KPiA+IAo+ID4gV2VsbCwg
SSdsbCByZW1vdmUgdGhlc2UgY2hhbmdlcyBhbmQgc2VuZCBhIHNlY29uZCB2ZXJzaW9uIG9mIHRo
ZSBwYXRjaC4KPiAKPiBJIGFwcGxpZWQgdGhlc2UgdHdvIHBhdGNoZXMsIGFuZCByZW1vdmVkIHRo
ZSB0eXBlIGNhc3RzIGZyb20gdGhlIHNlY29uZCBvbmUuCgpPSywgVGhhbmtzIQoKLS0tCgo
^ permalink raw reply
* Re: [PATCH 2/2] video: clps711x: Fix sparse warnings
From: Tomi Valkeinen @ 2014-07-04 8:06 UTC (permalink / raw)
To: linux-fbdev
In-Reply-To: <1403937246-14506-2-git-send-email-shc_work@mail.ru>
[-- Attachment #1: Type: text/plain, Size: 1771 bytes --]
Hi,
On 01/07/14 13:31, Alexander Shiyan wrote:
> Tue, 1 Jul 2014 13:22:51 +0300 от Tomi Valkeinen <tomi.valkeinen@ti.com>:
>> On 01/07/14 09:23, Alexander Shiyan wrote:
>>> Tue, 1 Jul 2014 09:14:02 +0300 от Tomi Valkeinen <tomi.valkeinen@ti.com>:
>>>> On 28/06/14 09:34, Alexander Shiyan wrote:
>>>>> This patch fixes below warnings:
>>>>> CHECK drivers/video/fbdev/clps711x-fb.c
>>>>> drivers/video/fbdev/clps711x-fb.c:247:24: warning: incorrect type in argument 1 (different address spaces)
>>>>> drivers/video/fbdev/clps711x-fb.c:247:24: expected void const *ptr
>>>>> drivers/video/fbdev/clps711x-fb.c:247:24: got char [noderef] <asn:2>*screen_base
>>>>> drivers/video/fbdev/clps711x-fb.c:248:35: warning: incorrect type in argument 1 (different address spaces)
>>>>> drivers/video/fbdev/clps711x-fb.c:248:35: expected void const *ptr
>>>>> drivers/video/fbdev/clps711x-fb.c:248:35: got char [noderef] <asn:2>*screen_base
>>> ...
>>>>> info->screen_base = devm_ioremap_resource(dev, res);
>>>>> - if (IS_ERR(info->screen_base)) {
>>>>> - ret = PTR_ERR(info->screen_base);
>>>>> + if (IS_ERR((__force void *)info->screen_base)) {
>>>>> + ret = PTR_ERR((__force void *)info->screen_base);
>>>>
>>>> I don't see any other user of devm_ioremap_resource() having that kind
>>>> of casts. Why are they needed here?
>>>
>>> Not needed, type cast was done only to remove sparse warnings.
>>
>> Right, but I think either sparse is wrong here, or the PTR_ERR/IS_ERR
>> are wrong. You shouldn't do typecasts like that to hide those warnings.
>
> Well, I'll remove these changes and send a second version of the patch.
I applied these two patches, and removed the type casts from the second one.
Tomi
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply
* Re: [PATCH 0/4] SiI9022 HDMI encoder for AM4xxx boards
From: Tomi Valkeinen @ 2014-07-04 8:02 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <87k37u7bp5.fsf@lebrac.rtp-net.org>
[-- Attachment #1: Type: text/plain, Size: 1105 bytes --]
On 03/07/14 17:34, Arnaud Patard wrote:
> Tomi Valkeinen <tomi.valkeinen@ti.com> writes:
>
>> Hi,
>
> Hi,
>
>>
>> This series adds a driver for SiI9022 HDMI encoder, which is used on AM437x GP
>> and AM43x EPOS boards.
>>
>> The series is based on the OMAPDSS HDMI infoframe series sent earlier, as the
>> SiI9022 driver uses the new infoframe support.
>
> Is there any small possibility to not make it an omap specific driver?
> There are other boards with sii9022 out there. imx5x dev boards could
> receive a daughter board with this chip (both sold by Freescale) and
> efikamx platform has it too. I think that some old msm platforms has it
> too.
> I've not compared the code of the drivers and don't know how the sii9022
> works but would be annoying to have 2 or more drivers for the same piece
> of HW. imho, it would be nice if it could be avoided.
No, not at the moment. There is no framework to create generic drivers
for display components.
There has been work towards that (google for "Common Display
Framework"), but that is far from finished.
Tomi
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply
* Trouble with Virtual Terminal
From: Kewal Agola @ 2014-07-04 7:57 UTC (permalink / raw)
To: linux-fbdev
Hi,
I am using a customized ARM based platform with an LCD monitor. I am
having trouble with virtual terminal. Terminal emulator with X-serve
works fine. But as soon as I switch to virtual terminal (ctrl + alt +
F1), the characters get scrambled. If I type character 'a', at first
character 'a' looks as if it were written with a broken line,
gradually after few seconds proper shape comes up. If I enter command
"dmesg" the output looks garbled due to overlapping of two consecutive
lines.
Processor Family : ARMv7.
Linux Kernel version : 3.0.31
Operating system : ARM Ubuntu.
I know there is some issue with display driver. But I do not know what
changes could help me. Can someone suggest me the way out?
Thanks,
Kewal
^ permalink raw reply
* [PATCH] drivers: video: fbdev: atmel_lcdfb.c: Add ability to inverted backlight PWM.
From: Michael Welling @ 2014-07-04 2:26 UTC (permalink / raw)
To: Nicolas Ferre, Jean-Christophe Plagniol-Villard,
devicetree-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
linux-fbdev-u79uwXL29TY76Z2rM5mHXA
Cc: Michael Welling
The code has a variable to change the polarity of the PWM backlight control but
it was not being initialized. This patch adds a devicetree entry to set the
variable if required.
Signed-off-by: Michael Welling <mwelling@ieee.org>
---
.../devicetree/bindings/video/atmel,lcdc.txt | 1 +
drivers/video/fbdev/atmel_lcdfb.c | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/Documentation/devicetree/bindings/video/atmel,lcdc.txt b/Documentation/devicetree/bindings/video/atmel,lcdc.txt
index 1ec175e..b75af94 100644
--- a/Documentation/devicetree/bindings/video/atmel,lcdc.txt
+++ b/Documentation/devicetree/bindings/video/atmel,lcdc.txt
@@ -46,6 +46,7 @@ Required properties (as per of_videomode_helper):
Optional properties (as per of_videomode_helper):
- atmel,lcdcon-backlight: enable backlight
+ - atmel,lcdcon-backlight-inverted: invert backlight PWM polarity
- atmel,lcd-wiring-mode: lcd wiring mode "RGB" or "BRG"
- atmel,power-control-gpio: gpio to power on or off the LCD (as many as needed)
diff --git a/drivers/video/fbdev/atmel_lcdfb.c b/drivers/video/fbdev/atmel_lcdfb.c
index d36e830..92640d4 100644
--- a/drivers/video/fbdev/atmel_lcdfb.c
+++ b/drivers/video/fbdev/atmel_lcdfb.c
@@ -290,7 +290,7 @@ static void init_contrast(struct atmel_lcdfb_info *sinfo)
/* contrast pwm can be 'inverted' */
if (pdata->lcdcon_pol_negative)
- contrast_ctr &= ~(ATMEL_LCDC_POL_POSITIVE);
+ contrast_ctr &= ~(ATMEL_LCDC_POL_POSITIVE);
/* have some default contrast/backlight settings */
lcdc_writel(sinfo, ATMEL_LCDC_CONTRAST_CTR, contrast_ctr);
@@ -1097,6 +1097,7 @@ static int atmel_lcdfb_of_init(struct atmel_lcdfb_info *sinfo)
pdata->lcd_wiring_mode = ret;
pdata->lcdcon_is_backlight = of_property_read_bool(display_np, "atmel,lcdcon-backlight");
+ pdata->lcdcon_pol_negative = of_property_read_bool(display_np, "atmel,lcdcon-backlight-inverted");
timings = of_get_display_timings(display_np);
if (!timings) {
--
1.7.9.5
^ permalink raw reply related
* [PATCH] video: fbdev: sis: init.c: Cleaning up redundant condition is always true
From: Rickard Strandqvist @ 2014-07-03 21:15 UTC (permalink / raw)
To: Jean-Christophe Plagniol-Villard, Tomi Valkeinen
Cc: Rickard Strandqvist, Jingoo Han, Daniel Vetter,
Mauro Carvalho Chehab, Chen, Gong, Dan Carpenter, linux-fbdev,
linux-kernel
Removal of a redundant condition that is always true
This was found using a static code analysis program called cppcheck
Signed-off-by: Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
---
drivers/video/fbdev/sis/init.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/video/fbdev/sis/init.c b/drivers/video/fbdev/sis/init.c
index bd40f5e..9e2dd96 100644
--- a/drivers/video/fbdev/sis/init.c
+++ b/drivers/video/fbdev/sis/init.c
@@ -355,12 +355,12 @@ SiS_GetModeID(int VGAEngine, unsigned int VBFlags, int HDisplay, int VDisplay,
}
break;
case 400:
- if((!(VBFlags & CRT1_LCDA)) || ((LCDwidth >= 800) && (LCDwidth >= 600))) {
+ if ((!(VBFlags & CRT1_LCDA)) || (LCDwidth >= 600)) {
if(VDisplay = 300) ModeIndex = ModeIndex_400x300[Depth];
}
break;
case 512:
- if((!(VBFlags & CRT1_LCDA)) || ((LCDwidth >= 1024) && (LCDwidth >= 768))) {
+ if ((!(VBFlags & CRT1_LCDA)) || (LCDwidth >= 768)) {
if(VDisplay = 384) ModeIndex = ModeIndex_512x384[Depth];
}
break;
--
1.7.10.4
^ permalink raw reply related
* Re: [PATCH V2] video: fbdev: matrox: matroxfb_base.c: Cleaning up a null pointer checks that could
From: Mikulas Patocka @ 2014-07-03 20:47 UTC (permalink / raw)
To: Rickard Strandqvist
Cc: Jean-Christophe Plagniol-Villard, Tomi Valkeinen, Jingoo Han,
Alexandru Juncu, Daniel Vetter, Joe Perches, linux-fbdev,
linux-kernel
In-Reply-To: <1404414974-9676-1-git-send-email-rickard_strandqvist@spectrumdigital.se>
Acked-by: Mikulas Patocka <mpatocka@redhat.com>
On Thu, 3 Jul 2014, Rickard Strandqvist wrote:
> Removal of null pointer checks that could never happen
>
> Signed-off-by: Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
> ---
> drivers/video/fbdev/matrox/matroxfb_base.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/video/fbdev/matrox/matroxfb_base.c b/drivers/video/fbdev/matrox/matroxfb_base.c
> index 7116c53..cd9dc88 100644
> --- a/drivers/video/fbdev/matrox/matroxfb_base.c
> +++ b/drivers/video/fbdev/matrox/matroxfb_base.c
> @@ -1973,7 +1973,7 @@ static void matroxfb_register_device(struct matrox_fb_info* minfo) {
> for (drv = matroxfb_driver_l(matroxfb_driver_list.next);
> drv != matroxfb_driver_l(&matroxfb_driver_list);
> drv = matroxfb_driver_l(drv->node.next)) {
> - if (drv && drv->probe) {
> + if (drv->probe) {
> void *p = drv->probe(minfo);
> if (p) {
> minfo->drivers_data[i] = p;
> --
> 1.7.10.4
>
^ permalink raw reply
* [PATCH V2] video: fbdev: matrox: matroxfb_base.c: Cleaning up a null pointer checks that could neve
From: Rickard Strandqvist @ 2014-07-03 19:16 UTC (permalink / raw)
To: Jean-Christophe Plagniol-Villard, Tomi Valkeinen
Cc: Rickard Strandqvist, Jingoo Han, Alexandru Juncu, Mikulas Patocka,
Daniel Vetter, Joe Perches, linux-fbdev, linux-kernel
Removal of null pointer checks that could never happen
Signed-off-by: Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
---
drivers/video/fbdev/matrox/matroxfb_base.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/video/fbdev/matrox/matroxfb_base.c b/drivers/video/fbdev/matrox/matroxfb_base.c
index 7116c53..cd9dc88 100644
--- a/drivers/video/fbdev/matrox/matroxfb_base.c
+++ b/drivers/video/fbdev/matrox/matroxfb_base.c
@@ -1973,7 +1973,7 @@ static void matroxfb_register_device(struct matrox_fb_info* minfo) {
for (drv = matroxfb_driver_l(matroxfb_driver_list.next);
drv != matroxfb_driver_l(&matroxfb_driver_list);
drv = matroxfb_driver_l(drv->node.next)) {
- if (drv && drv->probe) {
+ if (drv->probe) {
void *p = drv->probe(minfo);
if (p) {
minfo->drivers_data[i] = p;
--
1.7.10.4
^ permalink raw reply related
* Re: [PATCH 0/4] SiI9022 HDMI encoder for AM4xxx boards
From: Arnaud Patard @ 2014-07-03 14:34 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1404394800-18138-1-git-send-email-tomi.valkeinen@ti.com>
Tomi Valkeinen <tomi.valkeinen@ti.com> writes:
> Hi,
Hi,
>
> This series adds a driver for SiI9022 HDMI encoder, which is used on AM437x GP
> and AM43x EPOS boards.
>
> The series is based on the OMAPDSS HDMI infoframe series sent earlier, as the
> SiI9022 driver uses the new infoframe support.
Is there any small possibility to not make it an omap specific driver?
There are other boards with sii9022 out there. imx5x dev boards could
receive a daughter board with this chip (both sold by Freescale) and
efikamx platform has it too. I think that some old msm platforms has it
too.
I've not compared the code of the drivers and don't know how the sii9022
works but would be annoying to have 2 or more drivers for the same piece
of HW. imho, it would be nice if it could be avoided.
Thanks,
Arnaud
^ permalink raw reply
* [PATCH] video: da8xx-fb: preserve display width when changing HSYNC
From: Ian Abbott @ 2014-07-03 13:46 UTC (permalink / raw)
To: linux-fbdev
Cc: Jean-Christophe Plagniol-Villard, Tomi Valkeinen, linux-kernel,
Ian Abbott
When looking at this driver for a client, I noticed the code that
configures the HSYNC pulse clobbers the display width in the same
register. It only preserves the MS part of the width in bit 3 and zeros
the LS part of the width in bits 9 to 4. This doesn't matter during
initialization as the width is configured afterwards, but subsequent use
of the FBIPUT_HSYNC ioctl would clobber the width.
Preserve bits 9 to 0 of LCD_RASTER_TIMING_0_REG when configuring the
horizontal sync.
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
I haven't tested this change, but it's pretty trivial.
---
drivers/video/fbdev/da8xx-fb.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/video/fbdev/da8xx-fb.c b/drivers/video/fbdev/da8xx-fb.c
index 788f6b3..10c876c 100644
--- a/drivers/video/fbdev/da8xx-fb.c
+++ b/drivers/video/fbdev/da8xx-fb.c
@@ -419,7 +419,7 @@ static void lcd_cfg_horizontal_sync(int back_porch, int pulse_width,
{
u32 reg;
- reg = lcdc_read(LCD_RASTER_TIMING_0_REG) & 0xf;
+ reg = lcdc_read(LCD_RASTER_TIMING_0_REG) & 0x3ff;
reg |= (((back_porch-1) & 0xff) << 24)
| (((front_porch-1) & 0xff) << 16)
| (((pulse_width-1) & 0x3f) << 10);
--
2.0.0
^ permalink raw reply related
* [PATCH 4/4] arm/dts: am437x GP HDMI support
From: Tomi Valkeinen @ 2014-07-03 13:40 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1404394800-18138-1-git-send-email-tomi.valkeinen@ti.com>
AM437x GP board has both LCD and HDMI outputs. The active display is
selected with a GPIO, which affects video and audio signal routing, and
LCD backlight.
Managing the gpio dynamically has proven rather difficult, so the
approach taken here is just to have two separate .dts files for LCD/HDMI
use cases. The HDMI dts file includes the base file, which has LCD
support, and overrides and adds the necessary items.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Cc: Tony Lindgren <tony@atomide.com>
---
arch/arm/boot/dts/Makefile | 3 +-
arch/arm/boot/dts/am437x-gp-evm-hdmi.dts | 70 ++++++++++++++++++++++++++++++++
2 files changed, 72 insertions(+), 1 deletion(-)
create mode 100644 arch/arm/boot/dts/am437x-gp-evm-hdmi.dts
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 5a1fba6d10b5..3065fb2d113b 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -302,7 +302,8 @@ dtb-$(CONFIG_ARCH_OMAP4) += omap4-duovero-parlor.dtb \
omap4-var-stk-om44.dtb
dtb-$(CONFIG_SOC_AM43XX) += am43x-epos-evm.dtb \
am437x-gp-evm.dtb \
- am43x-epos-evm-hdmi.dtb
+ am43x-epos-evm-hdmi.dtb \
+ am437x-gp-evm-hdmi.dtb
dtb-$(CONFIG_SOC_OMAP5) += omap5-cm-t54.dtb \
omap5-sbc-t54.dtb \
omap5-uevm.dtb
diff --git a/arch/arm/boot/dts/am437x-gp-evm-hdmi.dts b/arch/arm/boot/dts/am437x-gp-evm-hdmi.dts
new file mode 100644
index 000000000000..9380a422227b
--- /dev/null
+++ b/arch/arm/boot/dts/am437x-gp-evm-hdmi.dts
@@ -0,0 +1,70 @@
+/*
+ * Copyright (C) 2014 Texas Instruments Incorporated - http://www.ti.com/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+/* AM437x GP EVM with HDMI output */
+
+#include "am437x-gp-evm.dts"
+
+/ {
+ aliases {
+ display0 = &hdmi;
+ };
+
+ hdmi: connector {
+ compatible = "hdmi-connector";
+ label = "hdmi";
+
+ type = "b";
+
+ port {
+ hdmi_connector_in: endpoint {
+ remote-endpoint = <&sii9022_out>;
+ };
+ };
+ };
+};
+
+&i2c1 {
+ sii9022@3b {
+ compatible = "sil,sii9022";
+ reg = <0x3b>;
+
+ /* XXX 'SelLCDorHDMI' Gpio, LOW to select HDMI */
+ reset-gpios = <&gpio5 8 GPIO_ACTIVE_HIGH>;
+
+ ports {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ port@0 {
+ reg = <0>;
+
+ sii9022_in: endpoint {
+ remote-endpoint = <&dpi_out>;
+ };
+ };
+
+ port@1 {
+ reg = <1>;
+
+ sii9022_out: endpoint {
+ remote-endpoint = <&hdmi_connector_in>;
+ };
+ };
+ };
+ };
+};
+
+&dss {
+ port {
+ dpi_out: endpoint@0 {
+ remote-endpoint = <&sii9022_in>;
+ data-lines = <24>;
+ };
+ };
+};
--
1.9.1
^ permalink raw reply related
* [PATCH 3/4] arm/dts: am43x EPOS HDMI support
From: Tomi Valkeinen @ 2014-07-03 13:39 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1404394800-18138-1-git-send-email-tomi.valkeinen@ti.com>
AM43x EPOS board has both LCD and HDMI outputs. The active display is
selected with a GPIO, which affects video and audio signal routing, and
LCD backlight.
Managing the gpio dynamically has proven rather difficult, so the
approach taken here is just to have two separate .dts files for LCD/HDMI
use cases. The HDMI dts file includes the base file, which has LCD
support, and overrides and adds the necessary items.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Cc: Tony Lindgren <tony@atomide.com>
---
arch/arm/boot/dts/Makefile | 3 +-
arch/arm/boot/dts/am43x-epos-evm-hdmi.dts | 83 +++++++++++++++++++++++++++++++
2 files changed, 85 insertions(+), 1 deletion(-)
create mode 100644 arch/arm/boot/dts/am43x-epos-evm-hdmi.dts
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 5986ff63b901..5a1fba6d10b5 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -301,7 +301,8 @@ dtb-$(CONFIG_ARCH_OMAP4) += omap4-duovero-parlor.dtb \
omap4-var-dvk-om44.dtb \
omap4-var-stk-om44.dtb
dtb-$(CONFIG_SOC_AM43XX) += am43x-epos-evm.dtb \
- am437x-gp-evm.dtb
+ am437x-gp-evm.dtb \
+ am43x-epos-evm-hdmi.dtb
dtb-$(CONFIG_SOC_OMAP5) += omap5-cm-t54.dtb \
omap5-sbc-t54.dtb \
omap5-uevm.dtb
diff --git a/arch/arm/boot/dts/am43x-epos-evm-hdmi.dts b/arch/arm/boot/dts/am43x-epos-evm-hdmi.dts
new file mode 100644
index 000000000000..9e52b220084d
--- /dev/null
+++ b/arch/arm/boot/dts/am43x-epos-evm-hdmi.dts
@@ -0,0 +1,83 @@
+/*
+ * Copyright (C) 2014 Texas Instruments Incorporated - http://www.ti.com/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+/* AM43x EPOS EVM with HDMI output */
+
+#include "am43x-epos-evm.dts"
+
+/ {
+ aliases {
+ display0 = &hdmi;
+ };
+
+ hdmi: connector {
+ compatible = "hdmi-connector";
+ label = "hdmi";
+
+ type = "b";
+
+ port {
+ hdmi_connector_in: endpoint {
+ remote-endpoint = <&sii9022_out>;
+ };
+ };
+ };
+};
+
+&am43xx_pinmux {
+ sii9022_pins: sii9022_pins {
+ pinctrl-single,pins = <
+ 0x48 (PIN_INPUT | MUX_MODE7) /* gpmc_a2.gpio1_18 */
+ >;
+ };
+};
+
+&i2c2 {
+ sii9022@3b {
+ compatible = "sil,sii9022";
+ reg = <0x3b>;
+
+ pinctrl-names = "default";
+ pinctrl-0 = <&sii9022_pins>;
+
+ reset-gpio = <&gpio2 1 GPIO_ACTIVE_LOW>;/* 65'SelLCDorHDMI' Gpio, LOW to select HDMI */
+
+ interrupt-parent = <&gpio1>;
+ interrupts = <18 IRQ_TYPE_LEVEL_LOW>;
+
+ ports {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ port@0 {
+ reg = <0>;
+
+ sii9022_in: endpoint {
+ remote-endpoint = <&dpi_out>;
+ };
+ };
+
+ port@1 {
+ reg = <1>;
+
+ sii9022_out: endpoint {
+ remote-endpoint = <&hdmi_connector_in>;
+ };
+ };
+ };
+ };
+};
+
+&dss {
+ port {
+ dpi_out: endpoint@0 {
+ remote-endpoint = <&sii9022_in>;
+ data-lines = <24>;
+ };
+ };
+};
--
1.9.1
^ permalink raw reply related
* [PATCH 2/4] Doc/DT: Add SiI9022 binding documentation
From: Tomi Valkeinen @ 2014-07-03 13:39 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1404394800-18138-1-git-send-email-tomi.valkeinen@ti.com>
Add DT binding documentation for Silicon Image SiI9022 HDMI encoder.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Cc: devicetree@vger.kernel.org
---
.../devicetree/bindings/video/sil,sii9022.txt | 53 ++++++++++++++++++++++
1 file changed, 53 insertions(+)
create mode 100644 Documentation/devicetree/bindings/video/sil,sii9022.txt
diff --git a/Documentation/devicetree/bindings/video/sil,sii9022.txt b/Documentation/devicetree/bindings/video/sil,sii9022.txt
new file mode 100644
index 000000000000..0cd926636998
--- /dev/null
+++ b/Documentation/devicetree/bindings/video/sil,sii9022.txt
@@ -0,0 +1,53 @@
+Silicon Image SiI9022 HDMI Encoder
+=================
+
+Silicon Image SiI9022 is an HDMI encoder that encodes parallel RGB
+signal to HDMI signal. The SiI9022 is controlled with i2c command, and
+it has a single reset pin and single interrupt pin.
+
+Required properties:
+- compatible: "sil,sii9022"
+
+Optional properties:
+- reset-gpio: reset gpio
+- interrupts: interrupt line
+
+Required nodes:
+- Video port 0 for parallel video input
+- Video port 1 for HDMI output
+
+Example
+-------
+
+&i2c2 {
+ sii9022: sii9022@3b {
+ compatible = "sil,sii9022";
+ reg = <0x3b>;
+
+ reset-gpio = <&gpio2 1 GPIO_ACTIVE_LOW>;
+
+ interrupt-parent = <&gpio1>;
+ interrupts = <18 IRQ_TYPE_LEVEL_LOW>;
+
+ ports {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ port@0 {
+ reg = <0>;
+
+ sii9022_in: endpoint {
+ remote-endpoint = <&dpi_out>;
+ };
+ };
+
+ port@1 {
+ reg = <1>;
+
+ sii9022_out: endpoint {
+ remote-endpoint = <&hdmi_connector_in>;
+ };
+ };
+ };
+ };
+};
--
1.9.1
^ permalink raw reply related
* [PATCH 1/4] OMAPDSS: add SiI9022 encoder driver
From: Tomi Valkeinen @ 2014-07-03 13:39 UTC (permalink / raw)
To: linux-arm-kernel
In-Reply-To: <1404394800-18138-1-git-send-email-tomi.valkeinen@ti.com>
Add an OMAPDSS encoder driver for Silicon Image SiI9022 HDMI encoder.
The driver supports only video at the moment, audio support will be
added separately.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
---
drivers/video/fbdev/omap2/displays-new/Kconfig | 8 +
drivers/video/fbdev/omap2/displays-new/Makefile | 1 +
.../fbdev/omap2/displays-new/encoder-sii9022.c | 966 +++++++++++++++++++++
.../fbdev/omap2/displays-new/encoder-sii9022.h | 58 ++
4 files changed, 1033 insertions(+)
create mode 100644 drivers/video/fbdev/omap2/displays-new/encoder-sii9022.c
create mode 100644 drivers/video/fbdev/omap2/displays-new/encoder-sii9022.h
diff --git a/drivers/video/fbdev/omap2/displays-new/Kconfig b/drivers/video/fbdev/omap2/displays-new/Kconfig
index e6cfc38160d3..f0ca306edd25 100644
--- a/drivers/video/fbdev/omap2/displays-new/Kconfig
+++ b/drivers/video/fbdev/omap2/displays-new/Kconfig
@@ -12,6 +12,14 @@ config DISPLAY_ENCODER_TPD12S015
Driver for TPD12S015, which offers HDMI ESD protection and level
shifting.
+config DISPLAY_ENCODER_SII9022
+ tristate "SiI9022 HDMI Encoder"
+ depends on I2C
+ help
+ Driver for Silicon Image SiI9022 HDMI encoder.
+ A brief about SiI9022 can be found here:
+ http://www.semiconductorstore.com/pdf/newsite/siliconimage/SiI9022a_pb.pdf
+
config DISPLAY_CONNECTOR_DVI
tristate "DVI Connector"
depends on I2C
diff --git a/drivers/video/fbdev/omap2/displays-new/Makefile b/drivers/video/fbdev/omap2/displays-new/Makefile
index 0323a8a1c682..f7f034b1c2b7 100644
--- a/drivers/video/fbdev/omap2/displays-new/Makefile
+++ b/drivers/video/fbdev/omap2/displays-new/Makefile
@@ -1,5 +1,6 @@
obj-$(CONFIG_DISPLAY_ENCODER_TFP410) += encoder-tfp410.o
obj-$(CONFIG_DISPLAY_ENCODER_TPD12S015) += encoder-tpd12s015.o
+obj-$(CONFIG_DISPLAY_ENCODER_SII9022) += encoder-sii9022.o
obj-$(CONFIG_DISPLAY_CONNECTOR_DVI) += connector-dvi.o
obj-$(CONFIG_DISPLAY_CONNECTOR_HDMI) += connector-hdmi.o
obj-$(CONFIG_DISPLAY_CONNECTOR_ANALOG_TV) += connector-analog-tv.o
diff --git a/drivers/video/fbdev/omap2/displays-new/encoder-sii9022.c b/drivers/video/fbdev/omap2/displays-new/encoder-sii9022.c
new file mode 100644
index 000000000000..955beae57e71
--- /dev/null
+++ b/drivers/video/fbdev/omap2/displays-new/encoder-sii9022.c
@@ -0,0 +1,966 @@
+/*
+ * Silicon Image SiI9022 Encoder Driver
+ *
+ * Copyright (C) 2014 Texas Instruments
+ * Author: Tomi Valkeinen <tomi.valkeinen@ti.com>
+ *
+ * This file is licensed under the terms of the GNU General Public License
+ * version 2. This program is licensed "as is" without any warranty of any
+ * kind, whether express or implied.
+ *
+ */
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/errno.h>
+#include <linux/string.h>
+#include <linux/types.h>
+#include <linux/slab.h>
+#include <linux/io.h>
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/i2c.h>
+#include <linux/device.h>
+#include <linux/delay.h>
+#include <linux/gpio.h>
+#include <linux/platform_device.h>
+#include <linux/regmap.h>
+#include <linux/of_gpio.h>
+#include <linux/workqueue.h>
+#include <linux/of_irq.h>
+#include <linux/hdmi.h>
+
+#include <video/omapdss.h>
+#include <video/omap-panel-data.h>
+
+#include <drm/drm_edid.h>
+
+#include "encoder-sii9022.h"
+
+static const struct regmap_config sii9022_regmap_config = {
+ .reg_bits = 8,
+ .val_bits = 8,
+};
+
+struct panel_drv_data {
+ struct omap_dss_device dssdev;
+ struct omap_dss_device *in;
+ struct i2c_client *i2c_client;
+ struct gpio_desc *reset_gpio;
+ struct regmap *regmap;
+ struct omap_video_timings timings;
+ struct delayed_work work;
+ struct mutex lock;
+
+ int irq;
+ bool use_polling;
+
+ bool htplg_state;
+ bool rxsense_state;
+
+ bool hdmi_mode;
+ struct hdmi_avi_infoframe frame;
+};
+
+#define to_panel_data(x) container_of(x, struct panel_drv_data, dssdev)
+
+static int sii9022_set_power_state(struct panel_drv_data *ddata,
+ enum sii9022_power_state state)
+{
+ unsigned pwr;
+ unsigned cold;
+ int r;
+
+ switch (state) {
+ case SII9022_POWER_STATE_D0:
+ pwr = 0;
+ cold = 0;
+ break;
+ case SII9022_POWER_STATE_D2:
+ pwr = 2;
+ cold = 0;
+ break;
+ case SII9022_POWER_STATE_D3_HOT:
+ pwr = 3;
+ cold = 0;
+ break;
+ case SII9022_POWER_STATE_D3_COLD:
+ pwr = 3;
+ cold = 1;
+ break;
+ default:
+ return -EINVAL;
+ }
+
+ r = regmap_update_bits(ddata->regmap, SII9022_POWER_STATE_CTRL_REG,
+ 1 << 2, cold << 2);
+ if (r) {
+ dev_err(&ddata->i2c_client->dev, "failed to set hot/cold bit\n");
+ return r;
+ }
+
+ r = regmap_update_bits(ddata->regmap, SII9022_POWER_STATE_CTRL_REG,
+ 0x3, pwr);
+ if (r) {
+ dev_err(&ddata->i2c_client->dev,
+ "failed to set power state to %d\n", pwr);
+ return r;
+ }
+
+ return 0;
+}
+
+static int sii9022_ddc_read(struct i2c_adapter *adapter,
+ unsigned char *buf, u16 count, u8 offset)
+{
+ int r, retries;
+
+ for (retries = 3; retries > 0; retries--) {
+ struct i2c_msg msgs[] = {
+ {
+ .addr = HDMI_I2C_MONITOR_ADDRESS,
+ .flags = 0,
+ .len = 1,
+ .buf = &offset,
+ }, {
+ .addr = HDMI_I2C_MONITOR_ADDRESS,
+ .flags = I2C_M_RD,
+ .len = count,
+ .buf = buf,
+ }
+ };
+
+ r = i2c_transfer(adapter, msgs, 2);
+ if (r = 2)
+ return 0;
+
+ if (r != -EAGAIN)
+ break;
+ }
+
+ return r < 0 ? r : -EIO;
+}
+
+static int sii9022_request_ddc_access(struct panel_drv_data *ddata,
+ unsigned *ctrl_reg)
+{
+ struct device *dev = &ddata->i2c_client->dev;
+ unsigned int val;
+ int r;
+ unsigned retries;
+
+ *ctrl_reg = 0;
+
+ /* Read TPI system control register*/
+ r = regmap_read(ddata->regmap, SII9022_SYS_CTRL_DATA_REG, &val);
+ if (r) {
+ dev_err(dev, "error reading DDC BUS REQUEST\n");
+ return r;
+ }
+
+ /* set SII9022_SYS_CTRL_DDC_BUS_REQUEST to request the DDC bus */
+ val |= SII9022_SYS_CTRL_DDC_BUS_REQUEST;
+
+ r = regmap_write(ddata->regmap, SII9022_SYS_CTRL_DATA_REG, val);
+ if (r) {
+ dev_err(dev, "error writing DDC BUS REQUEST\n");
+ return r;
+ }
+
+ /* Poll for bus DDC Bus control to be granted */
+ retries = 0;
+ do {
+ r = regmap_read(ddata->regmap, SII9022_SYS_CTRL_DATA_REG, &val);
+ if (retries++ > 100)
+ return r;
+
+ } while ((val & SII9022_SYS_CTRL_DDC_BUS_GRANTED) = 0);
+
+ /* Close the switch to the DDC */
+ val |= SII9022_SYS_CTRL_DDC_BUS_REQUEST |
+ SII9022_SYS_CTRL_DDC_BUS_GRANTED;
+ r = regmap_write(ddata->regmap, SII9022_SYS_CTRL_DATA_REG, val);
+ if (r) {
+ dev_err(dev, "error closing switch to DDC BUS REQUEST\n");
+ return r;
+ }
+
+ *ctrl_reg = val;
+
+ return 0;
+}
+
+static int sii9022_release_ddc_access(struct panel_drv_data *ddata,
+ unsigned ctrl_reg)
+{
+ struct device *dev = &ddata->i2c_client->dev;
+ unsigned int val;
+ int r;
+ unsigned retries;
+
+ val = ctrl_reg;
+ val &= ~(SII9022_SYS_CTRL_DDC_BUS_REQUEST |
+ SII9022_SYS_CTRL_DDC_BUS_GRANTED);
+
+ /* retry write until we can read the register, and the bits are 0 */
+ for (retries = 5; retries > 0; --retries) {
+ unsigned v;
+
+ /* ignore error, as the chip won't ACK this. */
+ regmap_write(ddata->regmap, SII9022_SYS_CTRL_DATA_REG, val);
+
+ r = regmap_read(ddata->regmap, SII9022_SYS_CTRL_DATA_REG, &v);
+ if (r)
+ continue;
+
+ if (v = val)
+ break;
+ }
+
+ if (retries = 0) {
+ dev_err(dev, "error releasing DDC Bus Access\n");
+ return r;
+ }
+
+ return 0;
+}
+
+static int sii9022_write_avi_infoframe(struct panel_drv_data *ddata)
+{
+ struct regmap *regmap = ddata->regmap;
+ u8 data[HDMI_INFOFRAME_SIZE(AVI)];
+ int r;
+
+ r = hdmi_avi_infoframe_pack(&ddata->frame, data, sizeof(data));
+ if (r < 0)
+ return r;
+
+ print_hex_dump_debug("AVI: ", DUMP_PREFIX_NONE, 16, 1, data,
+ HDMI_INFOFRAME_SIZE(AVI), false);
+
+ /* SiI9022 wants the checksum + the avi infoframe */
+ r = regmap_bulk_write(regmap, SII9022_AVI_INFOFRAME_BASE_REG,
+ &data[3], 1 + HDMI_AVI_INFOFRAME_SIZE);
+
+ return r;
+}
+
+static int sii9022_clear_avi_infoframe(struct panel_drv_data *ddata)
+{
+ struct regmap *regmap = ddata->regmap;
+ u8 data[1 + HDMI_AVI_INFOFRAME_SIZE] = { 0 };
+ int r;
+
+ r = regmap_bulk_write(regmap, SII9022_AVI_INFOFRAME_BASE_REG,
+ data, 1 + HDMI_AVI_INFOFRAME_SIZE);
+
+ return r;
+}
+
+static int sii9022_probe_chip_version(struct panel_drv_data *ddata)
+{
+ struct device *dev = &ddata->i2c_client->dev;
+ int r = 0;
+ unsigned id, rev, tpi_id;
+
+ r = regmap_read(ddata->regmap, SII9022_DEVICE_ID_REG, &id);
+ if (r) {
+ dev_err(dev, "failed to read device ID\n");
+ return r;
+ }
+
+ if (id != SII9022_ID_902xA) {
+ dev_err(dev, "unsupported device ID: 0x%x\n", id);
+ return -ENODEV;
+ }
+
+ r = regmap_read(ddata->regmap, SII9022_DEVICE_REV_ID_REG, &rev);
+ if (r) {
+ dev_err(dev, "failed to read device revision\n");
+ return r;
+ }
+
+ r = regmap_read(ddata->regmap, SII9022_DEVICE_TPI_ID_REG, &tpi_id);
+ if (r) {
+ dev_err(dev, "failed to read TPI ID\n");
+ return r;
+ }
+
+ dev_info(dev, "SiI902xA HDMI device %x, rev %x, tpi %x\n",
+ id, rev, tpi_id);
+
+ return r;
+}
+
+static int sii9022_enable_tpi(struct panel_drv_data *ddata)
+{
+ struct device *dev = &ddata->i2c_client->dev;
+ int r;
+
+ r = regmap_write(ddata->regmap, SII9022_TPI_RQB_REG, 0);
+ if (r) {
+ dev_err(dev, "failed to enable TPI commands\n");
+ return r;
+ }
+
+ return 0;
+}
+
+static int sii9022_enable_tmds(struct panel_drv_data *ddata, bool enable)
+{
+ struct regmap *regmap = ddata->regmap;
+ struct device *dev = &ddata->i2c_client->dev;
+ int r;
+
+ r = regmap_update_bits(regmap, SII9022_SYS_CTRL_DATA_REG,
+ 1 << 4, (enable ? 0 : 1) << 4);
+ if (r) {
+ dev_err(dev, "failed to %s TMDS output\n",
+ enable ? "enable" : "disable");
+ return r;
+ }
+
+ return 0;
+}
+
+static int sii9022_setup_video(struct panel_drv_data *ddata,
+ struct omap_video_timings *timings)
+{
+ struct regmap *regmap = ddata->regmap;
+ struct device *dev = &ddata->i2c_client->dev;
+ int r;
+ unsigned pck = timings->pixelclock / 10000;
+ unsigned xres = timings->x_res;
+ unsigned yres = timings->y_res;
+ unsigned vfreq = 60;
+
+ u8 vals[] = {
+ pck & 0xff,
+ (pck & 0xff00) >> 8,
+ vfreq & 0xff,
+ (vfreq & 0xff00) >> 8,
+ (xres & 0xff),
+ (xres & 0xff00) >> 8,
+ (yres & 0xff),
+ (yres & 0xff00) >> 8,
+ };
+
+ r = regmap_bulk_write(regmap, SII9022_VIDEO_DATA_BASE_REG,
+ &vals, ARRAY_SIZE(vals));
+ if (r) {
+ dev_err(dev, "failed to write video mode config\n");
+ return r;
+ }
+
+ return 0;
+}
+
+static int sii9022_hw_enable(struct omap_dss_device *dssdev)
+{
+ struct panel_drv_data *ddata = to_panel_data(dssdev);
+ struct regmap *regmap = ddata->regmap;
+ struct device *dev = &ddata->i2c_client->dev;
+ int r;
+
+ /* make sure we're in D2 */
+ r = sii9022_set_power_state(ddata, SII9022_POWER_STATE_D2);
+ if (r)
+ return r;
+
+ r = sii9022_setup_video(ddata, &ddata->timings);
+ if (r)
+ return r;
+
+ /* configure input video format */
+ r = regmap_write(regmap, SII9022_AVI_IN_FORMAT_REG, 0);
+ if (r) {
+ dev_err(dev, "failed to set input format\n");
+ return r;
+ }
+
+ /* configure output video format */
+ r = regmap_write(regmap, SII9022_AVI_OUT_FORMAT_REG,
+ (1 << 4)); /* CONV_BT709 */
+ if (r) {
+ dev_err(dev, "failed to set output format\n");
+ return r;
+ }
+
+ if (ddata->hdmi_mode)
+ r = sii9022_write_avi_infoframe(ddata);
+ else
+ r = sii9022_clear_avi_infoframe(ddata);
+
+ if (r) {
+ dev_err(dev, "failed to write AVI infoframe\n");
+ return r;
+ }
+
+ /* select DVI / HDMI */
+ /* note: must be done before D0 */
+ r = regmap_update_bits(regmap, SII9022_SYS_CTRL_DATA_REG,
+ 1 << 0, ddata->hdmi_mode ? 1 : 0); /* 0 = DVI, 1 = HDMI */
+ if (r) {
+ dev_err(dev, "failed to set DVI/HDMI mode\n");
+ return r;
+ }
+
+ /* power up transmitter */
+ r = sii9022_set_power_state(ddata, SII9022_POWER_STATE_D0);
+ if (r)
+ return r;
+
+ /* enable TMDS */
+ r = sii9022_enable_tmds(ddata, true);
+ if (r)
+ return r;
+
+ /* configure input bus and pixel repetition */
+ /* Note: must be done after enabling TMDS */
+ r = regmap_write(regmap, SII9022_PIXEL_REPETITION_REG,
+ (1 << 5) | /* 24BIT */
+ (1 << 6) /* CLK_RATIO_1X */
+ );
+ if (r) {
+ dev_err(dev, "failed to write pixel repetition reg\n");
+ return r;
+ }
+
+ return 0;
+}
+
+static int sii9022_hw_disable(struct omap_dss_device *dssdev)
+{
+ struct panel_drv_data *ddata = to_panel_data(dssdev);
+ int r;
+
+ sii9022_enable_tmds(ddata, false);
+
+ r = sii9022_set_power_state(ddata, SII9022_POWER_STATE_D2);
+ if (r)
+ return r;
+
+ return 0;
+}
+
+static void sii9022_handle_hpd(struct panel_drv_data *ddata)
+{
+ struct device *dev = &ddata->i2c_client->dev;
+ unsigned int stat;
+ int r;
+ bool htplg, rxsense;
+ bool htplg_ev, rxsense_ev;
+
+ htplg_ev = rxsense_ev = false;
+
+ r = regmap_read(ddata->regmap, SII9022_IRQ_STATUS_REG, &stat);
+
+ if (stat & 0x3) {
+ if (stat & 1)
+ htplg_ev = true;
+ if (stat & 2)
+ rxsense_ev = true;
+
+ regmap_write(ddata->regmap, SII9022_IRQ_STATUS_REG, 0x3);
+ }
+
+ htplg = stat & (1 << 2);
+ rxsense = stat & (1 << 3);
+
+ if (ddata->htplg_state != htplg || htplg_ev) {
+ dev_dbg(dev, "hotplug %sconnect\n", htplg ? "" : "dis");
+ ddata->htplg_state = htplg;
+ }
+
+ if (ddata->rxsense_state != rxsense || rxsense_ev) {
+ dev_dbg(dev, "rxsense %sconnect\n", rxsense ? "" : "dis");
+ ddata->rxsense_state = rxsense;
+ }
+}
+
+static irqreturn_t dispc_irq_handler(int irq, void *arg)
+{
+ struct panel_drv_data *ddata = arg;
+
+ mutex_lock(&ddata->lock);
+
+ sii9022_handle_hpd(ddata);
+
+ mutex_unlock(&ddata->lock);
+
+ return IRQ_HANDLED;
+}
+
+static void sii9022_poll(struct work_struct *work)
+{
+ struct panel_drv_data *ddata;
+
+ ddata = container_of(work, struct panel_drv_data, work.work);
+
+ mutex_lock(&ddata->lock);
+
+ sii9022_handle_hpd(ddata);
+
+ mutex_unlock(&ddata->lock);
+
+ schedule_delayed_work(&ddata->work, msecs_to_jiffies(250));
+}
+
+static int sii9022_connect(struct omap_dss_device *dssdev,
+ struct omap_dss_device *dst)
+{
+ struct panel_drv_data *ddata = to_panel_data(dssdev);
+ struct device *dev = &ddata->i2c_client->dev;
+ struct omap_dss_device *in = ddata->in;
+ int r;
+
+ if (omapdss_device_is_connected(dssdev))
+ return -EBUSY;
+
+ r = in->ops.dpi->connect(in, dssdev);
+ if (r)
+ return r;
+
+ mutex_lock(&ddata->lock);
+
+ r = sii9022_set_power_state(ddata, SII9022_POWER_STATE_D2);
+ if (r)
+ goto err_pwr;
+
+ ddata->htplg_state = ddata->rxsense_state = false;
+
+ sii9022_handle_hpd(ddata);
+
+ regmap_write(ddata->regmap, SII9022_IRQ_ENABLE_REG, 0x3);
+
+ if (ddata->use_polling) {
+ INIT_DELAYED_WORK(&ddata->work, sii9022_poll);
+ schedule_delayed_work(&ddata->work, msecs_to_jiffies(250));
+ } else {
+ r = devm_request_threaded_irq(dev, ddata->irq,
+ NULL, dispc_irq_handler,
+ IRQF_TRIGGER_LOW | IRQF_ONESHOT,
+ "sii9022 int", ddata);
+ if (r) {
+ dev_err(dev, "failed to request irq\n");
+ goto err_irq;
+ }
+ }
+
+ dst->src = dssdev;
+ dssdev->dst = dst;
+
+ mutex_unlock(&ddata->lock);
+
+ return 0;
+
+err_irq:
+err_pwr:
+ mutex_unlock(&ddata->lock);
+ in->ops.dpi->disconnect(in, dssdev);
+ return r;
+}
+
+static void sii9022_disconnect(struct omap_dss_device *dssdev,
+ struct omap_dss_device *dst)
+{
+ struct panel_drv_data *ddata = to_panel_data(dssdev);
+ struct device *dev = &ddata->i2c_client->dev;
+ struct omap_dss_device *in = ddata->in;
+
+ WARN_ON(!omapdss_device_is_connected(dssdev));
+ if (!omapdss_device_is_connected(dssdev))
+ return;
+
+ WARN_ON(dst != dssdev->dst);
+ if (dst != dssdev->dst)
+ return;
+
+ if (ddata->use_polling)
+ cancel_delayed_work_sync(&ddata->work);
+ else
+ devm_free_irq(dev, ddata->irq, ddata);
+
+ dst->src = NULL;
+ dssdev->dst = NULL;
+
+ in->ops.dpi->disconnect(in, dssdev);
+}
+
+static int sii9022_enable(struct omap_dss_device *dssdev)
+{
+ struct panel_drv_data *ddata = to_panel_data(dssdev);
+ struct omap_dss_device *in = ddata->in;
+ int r;
+
+ if (!omapdss_device_is_connected(dssdev))
+ return -ENODEV;
+
+ if (omapdss_device_is_enabled(dssdev))
+ return 0;
+
+ in->ops.dpi->set_timings(in, &ddata->timings);
+
+ r = in->ops.dpi->enable(in);
+ if (r)
+ return r;
+
+ if (ddata->reset_gpio)
+ gpiod_set_value_cansleep(ddata->reset_gpio, 0);
+
+ mutex_lock(&ddata->lock);
+
+ r = sii9022_hw_enable(dssdev);
+ if (r)
+ goto err_hw_enable;
+
+ mutex_unlock(&ddata->lock);
+
+ dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;
+
+ return 0;
+
+err_hw_enable:
+ mutex_unlock(&ddata->lock);
+
+ if (ddata->reset_gpio)
+ gpiod_set_value_cansleep(ddata->reset_gpio, 1);
+
+ in->ops.dpi->disable(in);
+
+ return r;
+}
+
+static void sii9022_disable(struct omap_dss_device *dssdev)
+{
+ struct panel_drv_data *ddata = to_panel_data(dssdev);
+ struct omap_dss_device *in = ddata->in;
+
+ if (!omapdss_device_is_enabled(dssdev))
+ return;
+
+ mutex_lock(&ddata->lock);
+
+ sii9022_hw_disable(dssdev);
+
+ mutex_unlock(&ddata->lock);
+
+ if (ddata->reset_gpio)
+ gpiod_set_value_cansleep(ddata->reset_gpio, 1);
+
+ in->ops.dpi->disable(in);
+
+ dssdev->state = OMAP_DSS_DISPLAY_DISABLED;
+}
+
+static void sii9022_set_timings(struct omap_dss_device *dssdev,
+ struct omap_video_timings *timings)
+{
+ struct panel_drv_data *ddata = to_panel_data(dssdev);
+ struct omap_dss_device *in = ddata->in;
+ struct omap_video_timings t = *timings;
+
+ /* update DPI specific timing info */
+ t.data_pclk_edge = OMAPDSS_DRIVE_SIG_RISING_EDGE;
+ t.de_level = OMAPDSS_SIG_ACTIVE_HIGH;
+ t.sync_pclk_edge = OMAPDSS_DRIVE_SIG_OPPOSITE_EDGES;
+
+ ddata->timings = t;
+ dssdev->panel.timings = t;
+
+ in->ops.dpi->set_timings(in, &t);
+}
+
+static void sii9022_get_timings(struct omap_dss_device *dssdev,
+ struct omap_video_timings *timings)
+{
+ struct panel_drv_data *ddata = to_panel_data(dssdev);
+ *timings = ddata->timings;
+}
+
+static int sii9022_check_timings(struct omap_dss_device *dssdev,
+ struct omap_video_timings *timings)
+{
+ struct panel_drv_data *ddata = to_panel_data(dssdev);
+ struct omap_dss_device *in = ddata->in;
+
+ /* update DPI specific timing info */
+ timings->data_pclk_edge = OMAPDSS_DRIVE_SIG_RISING_EDGE;
+ timings->de_level = OMAPDSS_SIG_ACTIVE_HIGH;
+ timings->sync_pclk_edge = OMAPDSS_DRIVE_SIG_OPPOSITE_EDGES;
+
+ return in->ops.dpi->check_timings(in, timings);
+}
+
+static int sii9022_read_edid(struct omap_dss_device *dssdev,
+ u8 *edid, int len)
+{
+ struct panel_drv_data *ddata = to_panel_data(dssdev);
+ struct i2c_client *client = ddata->i2c_client;
+ unsigned ctrl_reg;
+ int r, l, bytes_read;
+
+ mutex_lock(&ddata->lock);
+
+ if (ddata->use_polling)
+ sii9022_handle_hpd(ddata);
+
+ if (ddata->htplg_state = false) {
+ r = -ENODEV;
+ goto err_hpd;
+ }
+
+ r = sii9022_request_ddc_access(ddata, &ctrl_reg);
+ if (r)
+ goto err_ddc_request;
+
+ l = min(len, EDID_LENGTH);
+
+ r = sii9022_ddc_read(client->adapter, edid, l, 0);
+ if (r)
+ goto err_ddc_read;
+
+ bytes_read = l;
+
+ /* if there are extensions, read second block */
+ if (len > EDID_LENGTH && edid[0x7e] > 0) {
+ l = min(EDID_LENGTH, len - EDID_LENGTH);
+
+ r = sii9022_ddc_read(client->adapter, edid + EDID_LENGTH,
+ l, EDID_LENGTH);
+ if (r)
+ goto err_ddc_read;
+
+ bytes_read += l;
+ }
+
+ r = sii9022_release_ddc_access(ddata, ctrl_reg);
+ if (r)
+ goto err_ddc_read;
+
+ print_hex_dump_debug("EDID: ", DUMP_PREFIX_NONE, 16, 1, edid,
+ bytes_read, false);
+
+ mutex_unlock(&ddata->lock);
+
+ return bytes_read;
+
+err_ddc_read:
+ sii9022_release_ddc_access(ddata, ctrl_reg);
+err_ddc_request:
+err_hpd:
+ mutex_unlock(&ddata->lock);
+
+ return r;
+}
+
+static bool sii9022_detect(struct omap_dss_device *dssdev)
+{
+ struct panel_drv_data *ddata = to_panel_data(dssdev);
+ bool hpd;
+
+ mutex_lock(&ddata->lock);
+
+ if (ddata->use_polling)
+ sii9022_handle_hpd(ddata);
+
+ hpd = ddata->htplg_state;
+
+ mutex_unlock(&ddata->lock);
+
+ return hpd;
+}
+
+static int sii9022_set_infoframe(struct omap_dss_device *dssdev,
+ const struct hdmi_avi_infoframe *infoframe)
+{
+ struct panel_drv_data *ddata = to_panel_data(dssdev);
+
+ ddata->frame = *infoframe;
+
+ return 0;
+}
+
+
+static int sii9022_set_hdmi_mode(struct omap_dss_device *dssdev, bool hdmi_mode)
+{
+ struct panel_drv_data *ddata = to_panel_data(dssdev);
+
+ ddata->hdmi_mode = hdmi_mode;
+
+ return 0;
+}
+
+static bool sii9022_audio_supported(struct omap_dss_device *dssdev)
+{
+ return false;
+}
+
+static const struct omapdss_hdmi_ops sii9022_hdmi_ops = {
+ .connect = sii9022_connect,
+ .disconnect = sii9022_disconnect,
+
+ .enable = sii9022_enable,
+ .disable = sii9022_disable,
+
+ .check_timings = sii9022_check_timings,
+ .set_timings = sii9022_set_timings,
+ .get_timings = sii9022_get_timings,
+
+ .read_edid = sii9022_read_edid,
+ .detect = sii9022_detect,
+ .set_hdmi_mode = sii9022_set_hdmi_mode,
+ .set_infoframe = sii9022_set_infoframe,
+
+ .audio_supported = sii9022_audio_supported,
+};
+
+static int sii9022_probe_of(struct i2c_client *client)
+{
+ struct panel_drv_data *ddata = dev_get_drvdata(&client->dev);
+ struct device_node *node = client->dev.of_node;
+ struct omap_dss_device *in;
+ struct gpio_desc *gpio;
+
+ gpio = devm_gpiod_get(&client->dev, "reset");
+
+ if (IS_ERR(gpio)) {
+ if (PTR_ERR(gpio) != -ENOENT)
+ return PTR_ERR(gpio);
+ else
+ gpio = NULL;
+ } else {
+ gpiod_direction_output(gpio, 0);
+ }
+
+ ddata->reset_gpio = gpio;
+
+ ddata->irq = irq_of_parse_and_map(node, 0);
+ if (ddata->irq > 0)
+ ddata->use_polling = false;
+ else
+ ddata->use_polling = true;
+
+ in = omapdss_of_find_source_for_first_ep(node);
+ if (IS_ERR(in)) {
+ dev_err(&client->dev, "failed to find video source\n");
+ return PTR_ERR(in);
+ }
+
+ ddata->in = in;
+
+ return 0;
+}
+
+static int sii9022_probe(struct i2c_client *client,
+ const struct i2c_device_id *id)
+{
+ struct panel_drv_data *ddata;
+ struct omap_dss_device *dssdev;
+ struct regmap *regmap;
+ int r = 0;
+
+ regmap = devm_regmap_init_i2c(client, &sii9022_regmap_config);
+ if (IS_ERR(regmap)) {
+ r = PTR_ERR(regmap);
+ dev_err(&client->dev, "Failed to init regmap: %d\n", r);
+ return r;
+ }
+
+ ddata = devm_kzalloc(&client->dev, sizeof(*ddata), GFP_KERNEL);
+ if (ddata = NULL)
+ return -ENOMEM;
+
+ dev_set_drvdata(&client->dev, ddata);
+
+ mutex_init(&ddata->lock);
+
+ if (client->dev.of_node) {
+ r = sii9022_probe_of(client);
+ if (r)
+ return r;
+ } else {
+ return -ENODEV;
+ }
+
+ ddata->regmap = regmap;
+ ddata->i2c_client = client;
+
+ dssdev = &ddata->dssdev;
+ dssdev->dev = &client->dev;
+ dssdev->ops.hdmi = &sii9022_hdmi_ops;
+ dssdev->type = OMAP_DISPLAY_TYPE_DPI;
+ dssdev->output_type = OMAP_DISPLAY_TYPE_HDMI;
+ dssdev->owner = THIS_MODULE;
+
+ r = sii9022_enable_tpi(ddata);
+ if (r)
+ goto err_tpi;
+
+ r = sii9022_probe_chip_version(ddata);
+ if (r)
+ goto err_i2c;
+
+ r = omapdss_register_output(dssdev);
+ if (r) {
+ dev_err(&client->dev, "Failed to register output\n");
+ goto err_reg;
+ }
+
+ return 0;
+
+err_reg:
+err_i2c:
+err_tpi:
+ omap_dss_put_device(ddata->in);
+ return r;
+}
+
+static int sii9022_remove(struct i2c_client *client)
+{
+ struct panel_drv_data *ddata = dev_get_drvdata(&client->dev);
+ struct omap_dss_device *dssdev = &ddata->dssdev;
+
+ omapdss_unregister_output(dssdev);
+
+ WARN_ON(omapdss_device_is_enabled(dssdev));
+ if (omapdss_device_is_enabled(dssdev))
+ sii9022_disable(dssdev);
+
+ WARN_ON(omapdss_device_is_connected(dssdev));
+ if (omapdss_device_is_connected(dssdev))
+ sii9022_disconnect(dssdev, dssdev->dst);
+
+ omap_dss_put_device(ddata->in);
+
+ return 0;
+}
+
+static const struct i2c_device_id sii9022_id[] = {
+ { "sii9022", 0 },
+ { },
+};
+
+static const struct of_device_id sii9022_of_match[] = {
+ { .compatible = "omapdss,sil,sii9022", },
+ {},
+};
+
+MODULE_DEVICE_TABLE(i2c, sii9022_id);
+
+static struct i2c_driver sii9022_driver = {
+ .driver = {
+ .name = "sii9022",
+ .owner = THIS_MODULE,
+ .of_match_table = sii9022_of_match,
+ },
+ .probe = sii9022_probe,
+ .remove = sii9022_remove,
+ .id_table = sii9022_id,
+};
+
+module_i2c_driver(sii9022_driver);
+
+MODULE_AUTHOR("Tomi Valkeinen <tomi.valkeinen@ti.com>");
+MODULE_DESCRIPTION("SiI9022 HDMI Encoder Driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/video/fbdev/omap2/displays-new/encoder-sii9022.h b/drivers/video/fbdev/omap2/displays-new/encoder-sii9022.h
new file mode 100644
index 000000000000..f9a340437b08
--- /dev/null
+++ b/drivers/video/fbdev/omap2/displays-new/encoder-sii9022.h
@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) 2014 Texas Instruments
+ * Author : Tomi Valkeinen <tomi.valkeinen@ti.com>
+ *
+ * This file is licensed under the terms of the GNU General Public License
+ * version 2. This program is licensed "as is" without any warranty of any
+ * kind, whether express or implied.
+ *
+ */
+
+#ifndef __ENCODER_SII9022_H_
+#define __ENCODER_SII9022_H_
+
+#define SII9022_ID_902xA 0xb0
+
+#define HDMI_I2C_MONITOR_ADDRESS 0x50
+
+#define SII9022_VIDEO_DATA_BASE_REG 0x00
+#define SII9022_PIXEL_CLK_LSB_REG (SII9022_VIDEO_DATA_BASE_REG + 0x00)
+#define SII9022_PIXEL_CLK_MSB_REG (SII9022_VIDEO_DATA_BASE_REG + 0x01)
+#define SII9022_VFREQ_LSB_REG (SII9022_VIDEO_DATA_BASE_REG + 0x02)
+#define SII9022_VFREQ_MSB_REG (SII9022_VIDEO_DATA_BASE_REG + 0x03)
+#define SII9022_PIXELS_LSB_REG (SII9022_VIDEO_DATA_BASE_REG + 0x04)
+#define SII9022_PIXELS_MSB_REG (SII9022_VIDEO_DATA_BASE_REG + 0x05)
+#define SII9022_LINES_LSB_REG (SII9022_VIDEO_DATA_BASE_REG + 0x06)
+#define SII9022_LINES_MSB_REG (SII9022_VIDEO_DATA_BASE_REG + 0x07)
+
+#define SII9022_PIXEL_REPETITION_REG 0x08
+
+#define SII9022_AVI_IN_FORMAT_REG 0x09
+#define SII9022_AVI_OUT_FORMAT_REG 0x0a
+#define SII9022_AVI_INFOFRAME_BASE_REG 0x0c
+
+#define SII9022_SYS_CTRL_DATA_REG 0x1a
+#define SII9022_DEVICE_ID_REG 0x1b
+#define SII9022_DEVICE_REV_ID_REG 0x1c
+#define SII9022_DEVICE_TPI_ID_REG 0x1d
+
+#define SII9022_POWER_STATE_CTRL_REG 0x1e
+
+#define SII9022_IRQ_ENABLE_REG 0x3c
+#define SII9022_IRQ_STATUS_REG 0x3d
+
+#define SII9022_TPI_RQB_REG 0xc7
+
+/* SII9022_SYS_CTRL_DATA_REG */
+#define SII9022_SYS_CTRL_DDC_BUS_GRANTED BIT(1)
+#define SII9022_SYS_CTRL_DDC_BUS_REQUEST BIT(2)
+
+
+enum sii9022_power_state {
+ SII9022_POWER_STATE_D0,
+ SII9022_POWER_STATE_D2,
+ SII9022_POWER_STATE_D3_HOT,
+ SII9022_POWER_STATE_D3_COLD,
+};
+
+#endif
--
1.9.1
^ permalink raw reply related
* [PATCH 0/4] SiI9022 HDMI encoder for AM4xxx boards
From: Tomi Valkeinen @ 2014-07-03 13:39 UTC (permalink / raw)
To: linux-arm-kernel
Hi,
This series adds a driver for SiI9022 HDMI encoder, which is used on AM437x GP
and AM43x EPOS boards.
The series is based on the OMAPDSS HDMI infoframe series sent earlier, as the
SiI9022 driver uses the new infoframe support.
Tomi
Tomi Valkeinen (4):
OMAPDSS: add SiI9022 encoder driver
Doc/DT: Add SiI9022 binding documentation
arm/dts: am43x EPOS HDMI support
arm/dts: am437x GP HDMI support
.../devicetree/bindings/video/sil,sii9022.txt | 53 ++
arch/arm/boot/dts/Makefile | 4 +-
arch/arm/boot/dts/am437x-gp-evm-hdmi.dts | 70 ++
arch/arm/boot/dts/am43x-epos-evm-hdmi.dts | 83 ++
drivers/video/fbdev/omap2/displays-new/Kconfig | 8 +
drivers/video/fbdev/omap2/displays-new/Makefile | 1 +
.../fbdev/omap2/displays-new/encoder-sii9022.c | 966 +++++++++++++++++++++
.../fbdev/omap2/displays-new/encoder-sii9022.h | 58 ++
8 files changed, 1242 insertions(+), 1 deletion(-)
create mode 100644 Documentation/devicetree/bindings/video/sil,sii9022.txt
create mode 100644 arch/arm/boot/dts/am437x-gp-evm-hdmi.dts
create mode 100644 arch/arm/boot/dts/am43x-epos-evm-hdmi.dts
create mode 100644 drivers/video/fbdev/omap2/displays-new/encoder-sii9022.c
create mode 100644 drivers/video/fbdev/omap2/displays-new/encoder-sii9022.h
--
1.9.1
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox