From: Tony Lindgren <tony@atomide.com> To: linux-arm-kernel@lists.infradead.org Cc: Imre Deak <imre.deak@nokia.com>, Tomi Valkeinen <tomi.valkeinen@nokia.com>, linux-omap@vger.kernel.org Subject: [PATCH 09/14] omap: Use ioremap in dispc.c Date: Fri, 16 Oct 2009 16:41:49 -0700 [thread overview] Message-ID: <20091016234149.2463.92822.stgit@localhost> (raw) In-Reply-To: <20091016233624.2463.26653.stgit@localhost> Use ioremap in dispc.c Cc: Imre Deak <imre.deak@nokia.com> Cc: Tomi Valkeinen <tomi.valkeinen@nokia.com> Signed-off-by: Tony Lindgren <tony@atomide.com> --- drivers/video/omap/dispc.c | 20 +++++++++++++++++--- 1 files changed, 17 insertions(+), 3 deletions(-) diff --git a/drivers/video/omap/dispc.c b/drivers/video/omap/dispc.c index f16e421..6f957ce 100644 --- a/drivers/video/omap/dispc.c +++ b/drivers/video/omap/dispc.c @@ -204,6 +204,7 @@ static u32 inline dispc_read_reg(int idx) /* Select RFBI or bypass mode */ static void enable_rfbi_mode(int enable) { + void __iomem *rfbi_control; u32 l; l = dispc_read_reg(DISPC_CONTROL); @@ -216,9 +217,15 @@ static void enable_rfbi_mode(int enable) dispc_write_reg(DISPC_CONTROL, l); /* Set bypass mode in RFBI module */ - l = __raw_readl(OMAP2_IO_ADDRESS(RFBI_CONTROL)); + rfbi_control = ioremap(RFBI_CONTROL, SZ_1K); + if (!rfbi_control) { + pr_err("Unable to ioremap rfbi_control\n"); + return; + } + l = __raw_readl(rfbi_control); l |= enable ? 0 : (1 << 1); - __raw_writel(l, OMAP2_IO_ADDRESS(RFBI_CONTROL)); + __raw_writel(l, rfbi_control); + iounmap(rfbi_control); } static void set_lcd_data_lines(int data_lines) @@ -1367,6 +1374,7 @@ static int omap_dispc_init(struct omapfb_device *fbdev, int ext_mode, int r; u32 l; struct lcd_panel *panel = fbdev->panel; + void __iomem *ram_fw_base; int tmo = 10000; int skip_init = 0; int i; @@ -1441,7 +1449,13 @@ static int omap_dispc_init(struct omapfb_device *fbdev, int ext_mode, } /* L3 firewall setting: enable access to OCM RAM */ - __raw_writel(0x402000b0, OMAP2_IO_ADDRESS(0x680050a0)); + ram_fw_base = ioremap(0x68005000, SZ_1K); + if (!ram_fw_base) { + dev_err(dispc.fbdev->dev, "Cannot ioremap to enable OCM RAM\n"); + goto fail1; + } + __raw_writel(0x402000b0, ram_fw_base + 0xa0); + iounmap(ram_fw_base); if ((r = alloc_palette_ram()) < 0) goto fail2;
WARNING: multiple messages have this Message-ID (diff)
From: tony@atomide.com (Tony Lindgren) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 09/14] omap: Use ioremap in dispc.c Date: Fri, 16 Oct 2009 16:41:49 -0700 [thread overview] Message-ID: <20091016234149.2463.92822.stgit@localhost> (raw) In-Reply-To: <20091016233624.2463.26653.stgit@localhost> Use ioremap in dispc.c Cc: Imre Deak <imre.deak@nokia.com> Cc: Tomi Valkeinen <tomi.valkeinen@nokia.com> Signed-off-by: Tony Lindgren <tony@atomide.com> --- drivers/video/omap/dispc.c | 20 +++++++++++++++++--- 1 files changed, 17 insertions(+), 3 deletions(-) diff --git a/drivers/video/omap/dispc.c b/drivers/video/omap/dispc.c index f16e421..6f957ce 100644 --- a/drivers/video/omap/dispc.c +++ b/drivers/video/omap/dispc.c @@ -204,6 +204,7 @@ static u32 inline dispc_read_reg(int idx) /* Select RFBI or bypass mode */ static void enable_rfbi_mode(int enable) { + void __iomem *rfbi_control; u32 l; l = dispc_read_reg(DISPC_CONTROL); @@ -216,9 +217,15 @@ static void enable_rfbi_mode(int enable) dispc_write_reg(DISPC_CONTROL, l); /* Set bypass mode in RFBI module */ - l = __raw_readl(OMAP2_IO_ADDRESS(RFBI_CONTROL)); + rfbi_control = ioremap(RFBI_CONTROL, SZ_1K); + if (!rfbi_control) { + pr_err("Unable to ioremap rfbi_control\n"); + return; + } + l = __raw_readl(rfbi_control); l |= enable ? 0 : (1 << 1); - __raw_writel(l, OMAP2_IO_ADDRESS(RFBI_CONTROL)); + __raw_writel(l, rfbi_control); + iounmap(rfbi_control); } static void set_lcd_data_lines(int data_lines) @@ -1367,6 +1374,7 @@ static int omap_dispc_init(struct omapfb_device *fbdev, int ext_mode, int r; u32 l; struct lcd_panel *panel = fbdev->panel; + void __iomem *ram_fw_base; int tmo = 10000; int skip_init = 0; int i; @@ -1441,7 +1449,13 @@ static int omap_dispc_init(struct omapfb_device *fbdev, int ext_mode, } /* L3 firewall setting: enable access to OCM RAM */ - __raw_writel(0x402000b0, OMAP2_IO_ADDRESS(0x680050a0)); + ram_fw_base = ioremap(0x68005000, SZ_1K); + if (!ram_fw_base) { + dev_err(dispc.fbdev->dev, "Cannot ioremap to enable OCM RAM\n"); + goto fail1; + } + __raw_writel(0x402000b0, ram_fw_base + 0xa0); + iounmap(ram_fw_base); if ((r = alloc_palette_ram()) < 0) goto fail2;
next prev parent reply other threads:[~2009-10-16 23:41 UTC|newest] Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top 2009-10-16 23:40 [PATCH 00/14] Use ioremap for omap, split OMAP2_IO_ADDRESS for more space Tony Lindgren 2009-10-16 23:40 ` Tony Lindgren 2009-10-16 23:40 ` [PATCH 01/14] omap: Change low-level serial init to use ioremap Tony Lindgren 2009-10-16 23:40 ` Tony Lindgren 2009-10-16 23:40 ` [PATCH 02/14] omap: Use ioremap in irq.c Tony Lindgren 2009-10-16 23:40 ` Tony Lindgren 2009-10-16 23:40 ` [PATCH 03/14] omap: Use ioremap in dma.c Tony Lindgren 2009-10-16 23:40 ` Tony Lindgren 2009-10-16 23:40 ` [PATCH 04/14] omap: Use ioremap in dmtimer.c Tony Lindgren 2009-10-16 23:40 ` Tony Lindgren 2009-10-16 23:41 ` [PATCH 05/14] omap: Use ioremap in gpio.c Tony Lindgren 2009-10-16 23:41 ` Tony Lindgren 2009-10-17 8:10 ` Russell King - ARM Linux 2009-10-17 8:10 ` Russell King - ARM Linux 2009-10-17 16:13 ` Tony Lindgren 2009-10-17 16:13 ` Tony Lindgren 2009-10-19 0:19 ` Tony Lindgren 2009-10-19 0:19 ` Tony Lindgren 2009-10-16 23:41 ` [PATCH 06/14] omap: Use ioremap in omap_hwmod.c Tony Lindgren 2009-10-16 23:41 ` Tony Lindgren 2009-10-16 23:41 ` [PATCH 07/14] omap: Use getnstimeofday for omap_device Tony Lindgren 2009-10-16 23:41 ` Tony Lindgren 2009-10-16 23:41 ` [PATCH 08/14] omap: Use ioremap for omap4 L4 code Tony Lindgren 2009-10-16 23:41 ` Tony Lindgren 2009-10-16 23:46 ` Tony Lindgren 2009-10-16 23:46 ` Tony Lindgren 2009-10-17 10:48 ` Shilimkar, Santosh 2009-10-17 10:48 ` Shilimkar, Santosh 2009-10-17 16:19 ` Tony Lindgren 2009-10-17 16:19 ` Tony Lindgren 2009-10-19 0:24 ` Tony Lindgren 2009-10-19 0:24 ` Tony Lindgren 2009-10-19 7:27 ` Shilimkar, Santosh 2009-10-19 7:27 ` Shilimkar, Santosh 2009-10-19 17:12 ` Tony Lindgren 2009-10-19 17:12 ` Tony Lindgren 2009-10-19 17:21 ` Aguirre Rodriguez, Sergio Alberto 2009-10-19 17:21 ` Aguirre Rodriguez, Sergio Alberto 2009-10-19 17:38 ` Tony Lindgren 2009-10-19 17:38 ` Tony Lindgren 2009-10-19 18:07 ` Aguirre Rodriguez, Sergio Alberto 2009-10-19 18:07 ` Aguirre Rodriguez, Sergio Alberto 2009-10-20 6:34 ` Shilimkar, Santosh 2009-10-20 6:34 ` Shilimkar, Santosh 2009-10-16 23:41 ` Tony Lindgren [this message] 2009-10-16 23:41 ` [PATCH 09/14] omap: Use ioremap in dispc.c Tony Lindgren 2009-10-16 23:42 ` [PATCH 10/14] omap: Split OMAP2_IO_ADDRESS to L3 and L4 Tony Lindgren 2009-10-16 23:42 ` Tony Lindgren 2009-10-16 23:42 ` [PATCH 11/14] omap: Remap L3, L4 to get more kernel io address space Tony Lindgren 2009-10-16 23:42 ` Tony Lindgren 2009-10-20 0:20 ` Tony Lindgren 2009-10-20 0:20 ` Tony Lindgren 2009-10-20 6:32 ` Shilimkar, Santosh 2009-10-20 6:32 ` Shilimkar, Santosh 2009-10-16 23:42 ` [PATCH 12/14] omap: Move SRAM map to claim more io space Tony Lindgren 2009-10-16 23:42 ` Tony Lindgren 2009-10-16 23:42 ` [PATCH 13/14] omap: Fix DEBUG_LL UART io address Tony Lindgren 2009-10-16 23:42 ` Tony Lindgren 2009-10-16 23:42 ` [PATCH 14/14] omap: Add OMAP4 L3 and L4 peripherals Tony Lindgren 2009-10-16 23:42 ` Tony Lindgren
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=20091016234149.2463.92822.stgit@localhost \ --to=tony@atomide.com \ --cc=imre.deak@nokia.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-omap@vger.kernel.org \ --cc=tomi.valkeinen@nokia.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: 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.