From: Denis Carikli <denis@eukrea.com> To: linux-arm-kernel@lists.infradead.org Subject: [PATCHv3][ 02/11] video: imxfb: Introduce regulator support. Date: Fri, 18 Oct 2013 15:16:53 +0000 [thread overview] Message-ID: <1382109422-24454-2-git-send-email-denis@eukrea.com> (raw) In-Reply-To: <1382109422-24454-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: Fabio Estevam <fabio.estevam@freescale.com> Cc: Sascha Hauer <kernel@pengutronix.de> Cc: linux-arm-kernel@lists.infradead.org Cc: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com> Cc: Tomi Valkeinen <tomi.valkeinen@ti.com> Cc: linux-fbdev@vger.kernel.org Cc: Eric Bénard <eric@eukrea.com> Signed-off-by: Denis Carikli <denis@eukrea.com> --- drivers/video/imxfb.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/drivers/video/imxfb.c b/drivers/video/imxfb.c index 44ee678..4dd7678 100644 --- a/drivers/video/imxfb.c +++ b/drivers/video/imxfb.c @@ -28,6 +28,7 @@ #include <linux/cpufreq.h> #include <linux/clk.h> #include <linux/platform_device.h> +#include <linux/regulator/consumer.h> #include <linux/dma-mapping.h> #include <linux/io.h> #include <linux/math64.h> @@ -145,6 +146,7 @@ struct imxfb_info { struct clk *clk_ipg; struct clk *clk_ahb; struct clk *clk_per; + struct regulator *reg_lcd; enum imxfb_type devtype; bool enabled; @@ -563,12 +565,23 @@ static void imxfb_exit_backlight(struct imxfb_info *fbi) static void imxfb_enable_controller(struct imxfb_info *fbi) { + int ret; if (fbi->enabled) return; pr_debug("Enabling LCD controller\n"); + if (fbi->reg_lcd) { + ret = regulator_enable(fbi->reg_lcd); + if (ret) { + dev_err(&fbi->pdev->dev, + "lcd regulator enable failed with error: %d\n", + ret); + return; + } + } + writel(fbi->screen_dma, fbi->regs + LCDC_SSA); /* panning offset 0 (0 pixel offset) */ @@ -597,6 +610,8 @@ static void imxfb_enable_controller(struct imxfb_info *fbi) static void imxfb_disable_controller(struct imxfb_info *fbi) { + int ret; + if (!fbi->enabled) return; @@ -613,6 +628,14 @@ static void imxfb_disable_controller(struct imxfb_info *fbi) fbi->enabled = false; writel(0, fbi->regs + LCDC_RMCR); + + if (fbi->reg_lcd) { + ret = regulator_disable(fbi->reg_lcd); + if (ret) + dev_err(&fbi->pdev->dev, + "lcd regulator disable failed with error: %d\n", + ret); + } } static int imxfb_blank(int blank, struct fb_info *info) @@ -1020,6 +1043,10 @@ static int imxfb_probe(struct platform_device *pdev) goto failed_register; } + fbi->reg_lcd = devm_regulator_get(&pdev->dev, "lcd"); + if (IS_ERR(fbi->reg_lcd)) + fbi->reg_lcd = NULL; + imxfb_enable_controller(fbi); fbi->pdev = pdev; #ifdef PWMR_BACKLIGHT_AVAILABLE -- 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][ 02/11] video: imxfb: Introduce regulator support. Date: Fri, 18 Oct 2013 17:16:53 +0200 [thread overview] Message-ID: <1382109422-24454-2-git-send-email-denis@eukrea.com> (raw) In-Reply-To: <1382109422-24454-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: Fabio Estevam <fabio.estevam@freescale.com> Cc: Sascha Hauer <kernel@pengutronix.de> Cc: linux-arm-kernel at lists.infradead.org Cc: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com> Cc: Tomi Valkeinen <tomi.valkeinen@ti.com> Cc: linux-fbdev at vger.kernel.org Cc: Eric B?nard <eric@eukrea.com> Signed-off-by: Denis Carikli <denis@eukrea.com> --- drivers/video/imxfb.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/drivers/video/imxfb.c b/drivers/video/imxfb.c index 44ee678..4dd7678 100644 --- a/drivers/video/imxfb.c +++ b/drivers/video/imxfb.c @@ -28,6 +28,7 @@ #include <linux/cpufreq.h> #include <linux/clk.h> #include <linux/platform_device.h> +#include <linux/regulator/consumer.h> #include <linux/dma-mapping.h> #include <linux/io.h> #include <linux/math64.h> @@ -145,6 +146,7 @@ struct imxfb_info { struct clk *clk_ipg; struct clk *clk_ahb; struct clk *clk_per; + struct regulator *reg_lcd; enum imxfb_type devtype; bool enabled; @@ -563,12 +565,23 @@ static void imxfb_exit_backlight(struct imxfb_info *fbi) static void imxfb_enable_controller(struct imxfb_info *fbi) { + int ret; if (fbi->enabled) return; pr_debug("Enabling LCD controller\n"); + if (fbi->reg_lcd) { + ret = regulator_enable(fbi->reg_lcd); + if (ret) { + dev_err(&fbi->pdev->dev, + "lcd regulator enable failed with error: %d\n", + ret); + return; + } + } + writel(fbi->screen_dma, fbi->regs + LCDC_SSA); /* panning offset 0 (0 pixel offset) */ @@ -597,6 +610,8 @@ static void imxfb_enable_controller(struct imxfb_info *fbi) static void imxfb_disable_controller(struct imxfb_info *fbi) { + int ret; + if (!fbi->enabled) return; @@ -613,6 +628,14 @@ static void imxfb_disable_controller(struct imxfb_info *fbi) fbi->enabled = false; writel(0, fbi->regs + LCDC_RMCR); + + if (fbi->reg_lcd) { + ret = regulator_disable(fbi->reg_lcd); + if (ret) + dev_err(&fbi->pdev->dev, + "lcd regulator disable failed with error: %d\n", + ret); + } } static int imxfb_blank(int blank, struct fb_info *info) @@ -1020,6 +1043,10 @@ static int imxfb_probe(struct platform_device *pdev) goto failed_register; } + fbi->reg_lcd = devm_regulator_get(&pdev->dev, "lcd"); + if (IS_ERR(fbi->reg_lcd)) + fbi->reg_lcd = NULL; + imxfb_enable_controller(fbi); fbi->pdev = pdev; #ifdef PWMR_BACKLIGHT_AVAILABLE -- 1.7.9.5
next prev parent reply other threads:[~2013-10-18 15:16 UTC|newest] Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top 2013-10-18 15:16 [PATCHv3][ 01/11] of: add vendor prefix for Eukrea Electromatique Denis Carikli 2013-10-18 15:16 ` Denis Carikli 2013-10-18 15:16 ` Denis Carikli [this message] 2013-10-18 15:16 ` [PATCHv3][ 02/11] video: imxfb: Introduce regulator support Denis Carikli [not found] ` <1382109422-24454-1-git-send-email-denis-fO0SIAKYzcbQT0dZR+AlfA@public.gmane.org> 2013-10-18 15:16 ` [PATCHv3][ 03/11] video: imxfb: Also add pwmr for the device tree Denis Carikli 2013-10-18 15:16 ` Denis Carikli 2013-10-18 15:16 ` Denis Carikli 2013-10-18 15:16 ` [PATCHv3][ 04/11] ARM: imx{25,27} DT: Permit the selection of the imxfb framebuffer driver Denis Carikli 2013-10-18 15:16 ` [PATCHv3][ 04/11] ARM: imx{25, 27} " Denis Carikli 2013-10-18 15:16 ` [PATCHv3][ 05/11] pinctrl: pinctrl-imx: add imx25 pinctrl driver Denis Carikli 2013-10-18 15:16 ` Denis Carikli 2013-10-18 15:16 ` [PATCHv3][ 06/11] ARM: dts: imx25.dtsi: Add some pinmux pins Denis Carikli 2013-10-18 15:16 ` Denis Carikli 2013-10-18 15:16 ` [PATCHv3][ 07/11] ARM: dts: i.MX25: Add ssi clocks and DMA events Denis Carikli 2013-10-18 15:16 ` Denis Carikli 2013-10-18 15:16 ` [PATCHv3][ 08/11] ARM: dts: i.MX25: Add sdma script path Denis Carikli 2013-10-18 15:16 ` Denis Carikli 2013-10-18 15:17 ` [PATCHv3][ 09/11] ARM: dts: imx25.dtsi: Add an alias for the Audio Multiplexer Denis Carikli 2013-10-18 15:17 ` Denis Carikli 2013-10-18 15:17 ` [PATCHv3][ 10/11] ARM: dts: Add support for the cpuimx25 board from Eukrea and its baseboard Denis Carikli 2013-10-18 15:17 ` Denis Carikli 2013-10-18 15:17 ` [PATCHv3][ 11/11] ARM: imx_v4_v5_defconfig: Enable gpio regulator and gpio button/keyboard Denis Carikli
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=1382109422-24454-2-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.