| Message ID | 1492760753-8374-1-git-send-email-martin@kaiser.cx (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi, On Friday, April 21, 2017 09:45:52 AM Martin Kaiser wrote: > 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> > --- > re-sending v3, rebased against current linux-next > it seems this got lost along the way, there was a bit of confusion > whether to split this in two patches or not It hadn't been lost, I've been waiting on v4, please see: https://lkml.org/lkml/2017/3/15/709 [ Rob has requested rename of the property to "fsl,aus-mode". ] Best regards, -- Bartlomiej Zolnierkiewicz Samsung R&D Institute Poland Samsung Electronics -- To unsubscribe from this list: send the line "unsubscribe linux-fbdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Thus wrote Bartlomiej Zolnierkiewicz (b.zolnierkie@samsung.com): > It hadn't been lost, I've been waiting on v4, please see: > https://lkml.org/lkml/2017/3/15/709 > [ Rob has requested rename of the property to "fsl,aus-mode". ] Sorry, I didn't notice that Rob wanted me to rename the property. I just sent out v4. Thanks, Martin -- To unsubscribe from this list: send the line "unsubscribe linux-fbdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/video/fbdev/imxfb.c b/drivers/video/fbdev/imxfb.c index 1b0faad..463fbf2 100644 --- a/drivers/video/fbdev/imxfb.c +++ b/drivers/video/fbdev/imxfb.c @@ -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; @@ -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; @@ -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 @@ -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; } @@ -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; } diff --git a/include/linux/platform_data/video-imxfb.h b/include/linux/platform_data/video-imxfb.h index a5c0a71..cf9348b 100644 --- a/include/linux/platform_data/video-imxfb.h +++ b/include/linux/platform_data/video-imxfb.h @@ -50,6 +50,7 @@ struct imx_fb_videomode { struct fb_videomode mode; u32 pcr; + bool aus_mode; unsigned char bpp; };
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> --- re-sending v3, rebased against current linux-next it seems this got lost along the way, there was a bit of confusion whether to split this in two patches or not v3: use a boolean DT property instead of the register value separate patches for DT binding and code changes v2: re-sending DT bindings and code changes as one patch drivers/video/fbdev/imxfb.c | 17 +++++++++++++++++ include/linux/platform_data/video-imxfb.h | 1 + 2 files changed, 18 insertions(+)