Skip to content

Commit

Permalink
video: fbdev: imxfb: support AUS mode
Browse files Browse the repository at this point in the history
Some displays require setting AUS mode in the LDCD AUS Mode Control
Register to work with the imxfb driver. Like the value of the Panel
Configuration Register, the AUS mode setting depends on the display
mode.

Allow setting AUS mode from the device tree by adding a boolean
property. Make this property optional to keep the DT ABI stable.
AUS mode can be set only on imx21 and compatible chipsets.

Signed-off-by: Martin Kaiser <martin@kaiser.cx>
Cc: Sascha Hauer <kernel@pengutronix.de>
Cc: Rob Herring <robh+dt@kernel.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
  • Loading branch information
Martin Kaiser authored and Bartlomiej Zolnierkiewicz committed Apr 21, 2017
1 parent 0cb51f6 commit b62ea41
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 0 deletions.
17 changes: 17 additions & 0 deletions drivers/video/fbdev/imxfb.c
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,9 @@

#define IMXFB_LSCR1_DEFAULT 0x00120300

#define LCDC_LAUSCR 0x80
#define LAUSCR_AUS_MODE (1<<31)

/* Used fb-mode. Can be set on kernel command line, therefore file-static. */
static const char *fb_mode;

Expand Down Expand Up @@ -158,6 +161,7 @@ struct imxfb_info {
dma_addr_t dbar2;

u_int pcr;
u_int lauscr;
u_int pwmr;
u_int lscr1;
u_int dmacr;
Expand Down Expand Up @@ -422,6 +426,11 @@ static int imxfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
pcr |= imxfb_mode->pcr & ~(0x3f | (7 << 25));

fbi->pcr = pcr;
/*
* The LCDC AUS Mode Control Register does not exist on imx1.
*/
if (!is_imx1_fb(fbi) && imxfb_mode->aus_mode)
fbi->lauscr = LAUSCR_AUS_MODE;

/*
* Copy the RGB parameters for this display
Expand Down Expand Up @@ -638,6 +647,9 @@ static int imxfb_activate_var(struct fb_var_screeninfo *var, struct fb_info *inf
if (fbi->dmacr)
writel(fbi->dmacr, fbi->regs + LCDC_DMACR);

if (fbi->lauscr)
writel(fbi->lauscr, fbi->regs + LCDC_LAUSCR);

return 0;
}

Expand Down Expand Up @@ -734,6 +746,11 @@ static int imxfb_of_read_mode(struct device *dev, struct device_node *np,
imxfb_mode->bpp = bpp;
imxfb_mode->pcr = pcr;

/*
* fsl,aus-mode is optional
*/
imxfb_mode->aus_mode = of_property_read_bool(np, "fsl,aus-mode");

return 0;
}

Expand Down
1 change: 1 addition & 0 deletions include/linux/platform_data/video-imxfb.h
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
struct imx_fb_videomode {
struct fb_videomode mode;
u32 pcr;
bool aus_mode;
unsigned char bpp;
};

Expand Down

0 comments on commit b62ea41

Please sign in to comment.