From: Sascha Hauer <s.hauer@pengutronix.de>
To: Eric Benard <eric@eukrea.com>
Cc: barebox@lists.infradead.org
Subject: Re: [PATCH 1/3] i.MX25 : add Framebuffer support
Date: Mon, 17 May 2010 11:16:52 +0200 [thread overview]
Message-ID: <20100517091652.GM31199@pengutronix.de> (raw)
In-Reply-To: <1273754207-7763-1-git-send-email-eric@eukrea.com>
On Thu, May 13, 2010 at 02:36:45PM +0200, Eric Benard wrote:
> Signed-off-by: Eric Benard <eric@eukrea.com>
Ok, applied to -next.
Sascha
> ---
> drivers/video/Kconfig | 4 ++--
> drivers/video/imx.c | 19 ++++++++++++++++++-
> 2 files changed, 20 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
> index dbdc7e2..7a89a3f 100644
> --- a/drivers/video/Kconfig
> +++ b/drivers/video/Kconfig
> @@ -7,11 +7,11 @@ if VIDEO
>
> config DRIVER_VIDEO_IMX
> bool "i.MX framebuffer driver"
> - depends on ARCH_IMX1 || ARCH_IMX21 || ARCH_IMX27
> + depends on ARCH_IMX1 || ARCH_IMX21 || ARCH_IMX25 || ARCH_IMX27
>
> config IMXFB_DRIVER_VIDEO_IMX_OVERLAY
> bool "i.MX framebuffer overlay support"
> - depends on DRIVER_VIDEO_IMX && (ARCH_IMX27 || ARCH_IMX21)
> + depends on DRIVER_VIDEO_IMX && (ARCH_IMX27 || ARCH_IMX25 || ARCH_IMX21)
>
> config DRIVER_VIDEO_IMX_IPU
> bool "i.MX31/35 framebuffer driver"
> diff --git a/drivers/video/imx.c b/drivers/video/imx.c
> index 87c08d3..67cae34 100644
> --- a/drivers/video/imx.c
> +++ b/drivers/video/imx.c
> @@ -258,7 +258,12 @@ static void imxfb_enable_controller(struct fb_info *info)
> PCCR0 |= PCCR0_LCDC_EN;
> PCCR1 |= PCCR1_HCLK_LCDC;
> #endif
> -
> +#ifdef CONFIG_ARCH_IMX25
> + writel(readl(IMX_CCM_BASE + CCM_CGCR0) | (1 << 24) | (1 << 7),
> + IMX_CCM_BASE + CCM_CGCR0);
> + writel(readl(IMX_CCM_BASE + CCM_CGCR1) | (1 << 29),
> + IMX_CCM_BASE + CCM_CGCR1);
> +#endif
> }
>
> static void imxfb_disable_controller(struct fb_info *info)
> @@ -273,6 +278,12 @@ static void imxfb_disable_controller(struct fb_info *info)
> PCCR0 &= ~PCCR0_LCDC_EN;
> PCCR1 &= ~PCCR1_HCLK_LCDC;
> #endif
> +#ifdef CONFIG_ARCH_IMX25
> + writel(readl(IMX_CCM_BASE + CCM_CGCR0) & ~((1 << 24) | (1 << 7)),
> + IMX_CCM_BASE + CCM_CGCR0);
> + writel(readl(IMX_CCM_BASE + CCM_CGCR1) & ~(1 << 29),
> + IMX_CCM_BASE + CCM_CGCR1);
> +#endif
> }
>
> /*
> @@ -518,6 +529,12 @@ static int imxfb_probe(struct device_d *dev)
> PCCR0 &= ~PCCR0_LCDC_EN;
> PCCR1 &= ~PCCR1_HCLK_LCDC;
> #endif
> +#ifdef CONFIG_ARCH_IMX25
> + writel(readl(IMX_CCM_BASE + CCM_CGCR0) & ~((1 << 24) | (1 << 7)),
> + IMX_CCM_BASE + CCM_CGCR0);
> + writel(readl(IMX_CCM_BASE + CCM_CGCR1) & ~(1 << 29),
> + IMX_CCM_BASE + CCM_CGCR1);
> +#endif
>
> fbi = xzalloc(sizeof(*fbi));
> info = &fbi->info;
> --
> 1.6.3.3
>
>
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
>
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
prev parent reply other threads:[~2010-05-17 9:16 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-13 12:36 Eric Benard
2010-05-13 12:36 ` [PATCH 2/3] Add support for Eukrea's CPUIMX25 Eric Benard
2010-05-13 12:36 ` [PATCH 3/3] freescale-mx*5-3-stack : fix __flash_header_start Eric Benard
2010-05-17 9:17 ` Sascha Hauer
2010-05-17 9:14 ` [PATCH 2/3] Add support for Eukrea's CPUIMX25 Sascha Hauer
2010-05-17 9:43 ` [PATCH v2] " Eric Bénard
2010-05-17 9:57 ` Sascha Hauer
2010-05-17 9:45 ` [PATCH 2/3] " Eric Bénard
2010-05-17 9:58 ` Sascha Hauer
2010-05-17 9:16 ` Sascha Hauer [this message]
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=20100517091652.GM31199@pengutronix.de \
--to=s.hauer@pengutronix.de \
--cc=barebox@lists.infradead.org \
--cc=eric@eukrea.com \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox