From: Denis Carikli <denis@eukrea.com> To: linux-arm-kernel@lists.infradead.org Subject: [PATCHv3][ 4/5] video: mx3fb: Introduce regulator support. Date: Wed, 23 Oct 2013 12:43:48 +0000 [thread overview] Message-ID: <1382532229-32755-4-git-send-email-denis@eukrea.com> (raw) In-Reply-To: <1382532229-32755-1-git-send-email-denis@eukrea.com> This commit is based on the following commit by Fabio Estevam: 4344429 video: mxsfb: Introduce regulator support Cc: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com> Cc: Tomi Valkeinen <tomi.valkeinen@ti.com> Cc: linux-fbdev@vger.kernel.org Cc: Sascha Hauer <kernel@pengutronix.de> Cc: linux-arm-kernel@lists.infradead.org Cc: Eric Bénard <eric@eukrea.com> Signed-off-by: Denis Carikli <denis@eukrea.com> --- ChangeLog v2->v3: - The prints are now replaced with non line wrapped prints. - The regulator retrival has been adapted to the new DT bindings which looks more like the IPUv3 ones. - The regulator_is_enabled checks were kept, because regulator_disable do not do such check. --- drivers/video/mx3fb.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 66 insertions(+), 1 deletion(-) diff --git a/drivers/video/mx3fb.c b/drivers/video/mx3fb.c index de5a6c8..1f2ce6d 100644 --- a/drivers/video/mx3fb.c +++ b/drivers/video/mx3fb.c @@ -27,6 +27,7 @@ #include <linux/clk.h> #include <linux/mutex.h> #include <linux/dma/ipu-dma.h> +#include <linux/regulator/consumer.h> #include <linux/platform_data/dma-imx.h> #include <linux/platform_data/video-mx3fb.h> @@ -269,6 +270,7 @@ struct mx3fb_info { struct dma_async_tx_descriptor *txd; dma_cookie_t cookie; struct scatterlist sg[2]; + struct regulator *reg_lcd; struct fb_var_screeninfo cur_var; /* current var info */ }; @@ -1005,6 +1007,7 @@ static void __blank(int blank, struct fb_info *fbi) struct mx3fb_info *mx3_fbi = fbi->par; struct mx3fb_data *mx3fb = mx3_fbi->mx3fb; int was_blank = mx3_fbi->blank; + int ret; mx3_fbi->blank = blank; @@ -1023,6 +1026,15 @@ static void __blank(int blank, struct fb_info *fbi) case FB_BLANK_HSYNC_SUSPEND: case FB_BLANK_NORMAL: sdc_set_brightness(mx3fb, 0); + if (mx3_fbi->reg_lcd) { + if (regulator_is_enabled(mx3_fbi->reg_lcd)) { + ret = regulator_disable(mx3_fbi->reg_lcd); + if (ret) + dev_warn(fbi->device, + "lcd regulator disable failed with error: %d\n", + ret); + } + } memset((char *)fbi->screen_base, 0, fbi->fix.smem_len); /* Give LCD time to update - enough for 50 and 60 Hz */ msleep(25); @@ -1030,6 +1042,15 @@ static void __blank(int blank, struct fb_info *fbi) break; case FB_BLANK_UNBLANK: sdc_enable_channel(mx3_fbi); + if (mx3_fbi->reg_lcd) { + if (!regulator_is_enabled(mx3_fbi->reg_lcd)) { + ret = regulator_enable(mx3_fbi->reg_lcd); + if (ret) + dev_warn(fbi->device, + "lcd regulator enable failed with error: %d\n", + ret); + } + } sdc_set_brightness(mx3fb, mx3fb->backlight_level); break; } @@ -1206,6 +1227,7 @@ static int mx3fb_suspend(struct platform_device *pdev, pm_message_t state) { struct mx3fb_data *mx3fb = platform_get_drvdata(pdev); struct mx3fb_info *mx3_fbi = mx3fb->fbi->par; + int ret; console_lock(); fb_set_suspend(mx3fb->fbi, 1); @@ -1214,7 +1236,15 @@ static int mx3fb_suspend(struct platform_device *pdev, pm_message_t state) if (mx3_fbi->blank = FB_BLANK_UNBLANK) { sdc_disable_channel(mx3_fbi); sdc_set_brightness(mx3fb, 0); - + if (mx3_fbi->reg_lcd) { + if (regulator_is_enabled(mx3_fbi->reg_lcd)) { + ret = regulator_disable(mx3_fbi->reg_lcd); + if (ret) + dev_warn(&pdev->dev, + "lcd regulator disable failed with error: %d\n", + ret); + } + } } return 0; } @@ -1226,10 +1256,20 @@ static int mx3fb_resume(struct platform_device *pdev) { struct mx3fb_data *mx3fb = platform_get_drvdata(pdev); struct mx3fb_info *mx3_fbi = mx3fb->fbi->par; + int ret; if (mx3_fbi->blank = FB_BLANK_UNBLANK) { sdc_enable_channel(mx3_fbi); sdc_set_brightness(mx3fb, mx3fb->backlight_level); + if (mx3_fbi->reg_lcd) { + if (!regulator_is_enabled(mx3_fbi->reg_lcd)) { + ret = regulator_enable(mx3_fbi->reg_lcd); + if (ret) + dev_warn(&pdev->dev, + "lcd regulator enable failed with error: %d\n", + ret); + } + } } console_lock(); @@ -1373,6 +1413,7 @@ static int init_fb_chan(struct mx3fb_data *mx3fb, struct idmac_channel *ichan) struct mx3fb_platform_data *mx3fb_pdata = dev_get_platdata(dev); struct device_node *np = dev->of_node; const char *name; + const char *regulator_name; const char *ipu_disp_format; unsigned int irq; struct fb_info *fbi; @@ -1395,6 +1436,9 @@ static int init_fb_chan(struct mx3fb_data *mx3fb, struct idmac_channel *ichan) return -EINVAL; } + of_property_read_string(display_np, "regulator-name", + ®ulator_name); + of_property_read_string(display_np, "interface-pix-fmt", &ipu_disp_format); if (!ipu_disp_format) { @@ -1509,6 +1553,24 @@ static int init_fb_chan(struct mx3fb_data *mx3fb, struct idmac_channel *ichan) if (ret < 0) goto erfb; + /* In dt mode, + * using devm_regulator_get would require that the proprety referencing + * the regulator phandle has to be inside the mx3fb node. + */ + if (np) { + if (regulator_name) + mx3fbi->reg_lcd = regulator_get(NULL, regulator_name); + } else { + mx3fbi->reg_lcd = devm_regulator_get(dev, "lcd"); + } + + if (IS_ERR(mx3fbi->reg_lcd)) { + dev_warn(mx3fb->dev, "Operating without regulator \"lcd\"\n"); + mx3fbi->reg_lcd = NULL; + } else { + dev_info(mx3fb->dev, "Using \"lcd\" Regulator\n"); + } + return 0; erfb: @@ -1575,6 +1637,7 @@ static int mx3fb_probe(struct platform_device *pdev) dma_cap_mask_t mask; struct dma_chan *chan; struct dma_chan_request rq; + struct mx3fb_info *mx3_fbi; /* * Display Interface (DI) and Synchronous Display Controller (SDC) @@ -1630,6 +1693,8 @@ ersdc0: dmaengine_put(); iounmap(mx3fb->reg_base); eremap: + mx3_fbi = mx3fb->fbi->par; + regulator_put(mx3_fbi->reg_lcd); kfree(mx3fb); dev_err(dev, "mx3fb: failed to register fb\n"); return ret; -- 1.7.9.5
WARNING: multiple messages have this Message-ID (diff)
From: denis@eukrea.com (Denis Carikli) To: linux-arm-kernel@lists.infradead.org Subject: [PATCHv3][ 4/5] video: mx3fb: Introduce regulator support. Date: Wed, 23 Oct 2013 14:43:48 +0200 [thread overview] Message-ID: <1382532229-32755-4-git-send-email-denis@eukrea.com> (raw) In-Reply-To: <1382532229-32755-1-git-send-email-denis@eukrea.com> This commit is based on the following commit by Fabio Estevam: 4344429 video: mxsfb: Introduce regulator support Cc: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com> Cc: Tomi Valkeinen <tomi.valkeinen@ti.com> Cc: linux-fbdev at vger.kernel.org Cc: Sascha Hauer <kernel@pengutronix.de> Cc: linux-arm-kernel at lists.infradead.org Cc: Eric B?nard <eric@eukrea.com> Signed-off-by: Denis Carikli <denis@eukrea.com> --- ChangeLog v2->v3: - The prints are now replaced with non line wrapped prints. - The regulator retrival has been adapted to the new DT bindings which looks more like the IPUv3 ones. - The regulator_is_enabled checks were kept, because regulator_disable do not do such check. --- drivers/video/mx3fb.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 66 insertions(+), 1 deletion(-) diff --git a/drivers/video/mx3fb.c b/drivers/video/mx3fb.c index de5a6c8..1f2ce6d 100644 --- a/drivers/video/mx3fb.c +++ b/drivers/video/mx3fb.c @@ -27,6 +27,7 @@ #include <linux/clk.h> #include <linux/mutex.h> #include <linux/dma/ipu-dma.h> +#include <linux/regulator/consumer.h> #include <linux/platform_data/dma-imx.h> #include <linux/platform_data/video-mx3fb.h> @@ -269,6 +270,7 @@ struct mx3fb_info { struct dma_async_tx_descriptor *txd; dma_cookie_t cookie; struct scatterlist sg[2]; + struct regulator *reg_lcd; struct fb_var_screeninfo cur_var; /* current var info */ }; @@ -1005,6 +1007,7 @@ static void __blank(int blank, struct fb_info *fbi) struct mx3fb_info *mx3_fbi = fbi->par; struct mx3fb_data *mx3fb = mx3_fbi->mx3fb; int was_blank = mx3_fbi->blank; + int ret; mx3_fbi->blank = blank; @@ -1023,6 +1026,15 @@ static void __blank(int blank, struct fb_info *fbi) case FB_BLANK_HSYNC_SUSPEND: case FB_BLANK_NORMAL: sdc_set_brightness(mx3fb, 0); + if (mx3_fbi->reg_lcd) { + if (regulator_is_enabled(mx3_fbi->reg_lcd)) { + ret = regulator_disable(mx3_fbi->reg_lcd); + if (ret) + dev_warn(fbi->device, + "lcd regulator disable failed with error: %d\n", + ret); + } + } memset((char *)fbi->screen_base, 0, fbi->fix.smem_len); /* Give LCD time to update - enough for 50 and 60 Hz */ msleep(25); @@ -1030,6 +1042,15 @@ static void __blank(int blank, struct fb_info *fbi) break; case FB_BLANK_UNBLANK: sdc_enable_channel(mx3_fbi); + if (mx3_fbi->reg_lcd) { + if (!regulator_is_enabled(mx3_fbi->reg_lcd)) { + ret = regulator_enable(mx3_fbi->reg_lcd); + if (ret) + dev_warn(fbi->device, + "lcd regulator enable failed with error: %d\n", + ret); + } + } sdc_set_brightness(mx3fb, mx3fb->backlight_level); break; } @@ -1206,6 +1227,7 @@ static int mx3fb_suspend(struct platform_device *pdev, pm_message_t state) { struct mx3fb_data *mx3fb = platform_get_drvdata(pdev); struct mx3fb_info *mx3_fbi = mx3fb->fbi->par; + int ret; console_lock(); fb_set_suspend(mx3fb->fbi, 1); @@ -1214,7 +1236,15 @@ static int mx3fb_suspend(struct platform_device *pdev, pm_message_t state) if (mx3_fbi->blank == FB_BLANK_UNBLANK) { sdc_disable_channel(mx3_fbi); sdc_set_brightness(mx3fb, 0); - + if (mx3_fbi->reg_lcd) { + if (regulator_is_enabled(mx3_fbi->reg_lcd)) { + ret = regulator_disable(mx3_fbi->reg_lcd); + if (ret) + dev_warn(&pdev->dev, + "lcd regulator disable failed with error: %d\n", + ret); + } + } } return 0; } @@ -1226,10 +1256,20 @@ static int mx3fb_resume(struct platform_device *pdev) { struct mx3fb_data *mx3fb = platform_get_drvdata(pdev); struct mx3fb_info *mx3_fbi = mx3fb->fbi->par; + int ret; if (mx3_fbi->blank == FB_BLANK_UNBLANK) { sdc_enable_channel(mx3_fbi); sdc_set_brightness(mx3fb, mx3fb->backlight_level); + if (mx3_fbi->reg_lcd) { + if (!regulator_is_enabled(mx3_fbi->reg_lcd)) { + ret = regulator_enable(mx3_fbi->reg_lcd); + if (ret) + dev_warn(&pdev->dev, + "lcd regulator enable failed with error: %d\n", + ret); + } + } } console_lock(); @@ -1373,6 +1413,7 @@ static int init_fb_chan(struct mx3fb_data *mx3fb, struct idmac_channel *ichan) struct mx3fb_platform_data *mx3fb_pdata = dev_get_platdata(dev); struct device_node *np = dev->of_node; const char *name; + const char *regulator_name; const char *ipu_disp_format; unsigned int irq; struct fb_info *fbi; @@ -1395,6 +1436,9 @@ static int init_fb_chan(struct mx3fb_data *mx3fb, struct idmac_channel *ichan) return -EINVAL; } + of_property_read_string(display_np, "regulator-name", + ®ulator_name); + of_property_read_string(display_np, "interface-pix-fmt", &ipu_disp_format); if (!ipu_disp_format) { @@ -1509,6 +1553,24 @@ static int init_fb_chan(struct mx3fb_data *mx3fb, struct idmac_channel *ichan) if (ret < 0) goto erfb; + /* In dt mode, + * using devm_regulator_get would require that the proprety referencing + * the regulator phandle has to be inside the mx3fb node. + */ + if (np) { + if (regulator_name) + mx3fbi->reg_lcd = regulator_get(NULL, regulator_name); + } else { + mx3fbi->reg_lcd = devm_regulator_get(dev, "lcd"); + } + + if (IS_ERR(mx3fbi->reg_lcd)) { + dev_warn(mx3fb->dev, "Operating without regulator \"lcd\"\n"); + mx3fbi->reg_lcd = NULL; + } else { + dev_info(mx3fb->dev, "Using \"lcd\" Regulator\n"); + } + return 0; erfb: @@ -1575,6 +1637,7 @@ static int mx3fb_probe(struct platform_device *pdev) dma_cap_mask_t mask; struct dma_chan *chan; struct dma_chan_request rq; + struct mx3fb_info *mx3_fbi; /* * Display Interface (DI) and Synchronous Display Controller (SDC) @@ -1630,6 +1693,8 @@ ersdc0: dmaengine_put(); iounmap(mx3fb->reg_base); eremap: + mx3_fbi = mx3fb->fbi->par; + regulator_put(mx3_fbi->reg_lcd); kfree(mx3fb); dev_err(dev, "mx3fb: failed to register fb\n"); return ret; -- 1.7.9.5
next prev parent reply other threads:[~2013-10-23 12:43 UTC|newest] Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top 2013-10-23 12:43 [PATCHv3][ 1/5] fbdev: Add the lacking FB_SYNC_* for matching the DISPLAY_FLAGS_* Denis Carikli 2013-10-23 12:43 ` Denis Carikli 2013-10-23 12:43 ` Denis Carikli [not found] ` <1382532229-32755-1-git-send-email-denis-fO0SIAKYzcbQT0dZR+AlfA@public.gmane.org> 2013-10-23 12:43 ` [PATCHv3][ 2/5] dma: ipu: Add devicetree support Denis Carikli 2013-10-23 12:43 ` Denis Carikli 2013-10-23 12:43 ` [PATCHv3][ 3/5] video: mx3fb: Add device tree suport Denis Carikli 2013-10-23 12:43 ` Denis Carikli 2013-10-23 12:43 ` Denis Carikli 2013-10-25 19:50 ` Grant Likely 2013-10-25 19:50 ` Grant Likely [not found] ` <20131025195040.0CCC3C404DA-WNowdnHR2B42iJbIjFUEsiwD8/FfD2ys@public.gmane.org> 2013-10-26 0:18 ` Sascha Hauer 2013-10-26 0:18 ` Sascha Hauer 2013-10-26 0:18 ` Sascha Hauer [not found] ` <20131026001854.GE17135-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> 2013-10-26 6:43 ` Kumar Gala 2013-10-26 6:43 ` Kumar Gala 2013-10-26 6:43 ` Kumar Gala 2013-10-27 13:56 ` Grant Likely 2013-10-27 13:56 ` Grant Likely [not found] ` <1382532229-32755-3-git-send-email-denis-fO0SIAKYzcbQT0dZR+AlfA@public.gmane.org> 2013-10-26 6:40 ` Kumar Gala 2013-10-26 6:40 ` Kumar Gala 2013-10-26 6:40 ` Kumar Gala 2013-10-23 12:43 ` [PATCHv3][ 5/5] ARM: dts: mbimxsd35 Add video and displays support Denis Carikli 2013-10-23 12:43 ` Denis Carikli 2013-10-23 12:43 ` Denis Carikli 2013-10-23 12:43 ` Denis Carikli [this message] 2013-10-23 12:43 ` [PATCHv3][ 4/5] video: mx3fb: Introduce regulator support Denis Carikli 2013-10-29 10:35 ` [PATCHv3][ 1/5] fbdev: Add the lacking FB_SYNC_* for matching the DISPLAY_FLAGS_* Tomi Valkeinen 2013-10-29 10:35 ` Tomi Valkeinen 2013-10-29 10:35 ` Tomi Valkeinen
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1382532229-32755-4-git-send-email-denis@eukrea.com \ --to=denis@eukrea.com \ --cc=linux-arm-kernel@lists.infradead.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.