From: Omar Ramirez Luna <omar.ramirez@copitl.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Victor Manuel Jaquez Leal <vjaquez@igalia.com>,
devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org,
Omar Ramirez Luna <omar.ramirez@copitl.com>
Subject: [PATCH 3/6] staging: tidspbridge: change type to __iomem for per and core addresses
Date: Wed, 24 Oct 2012 17:09:17 -0500 [thread overview]
Message-ID: <1351116560-6918-4-git-send-email-omar.ramirez@copitl.com> (raw)
In-Reply-To: <1351116560-6918-1-git-send-email-omar.ramirez@copitl.com>
Currently per_pm_base and core_pm_base are declared as u32, however
_raw_* changed the data type, since:
195bbca ARM: 7500/1: io: avoid writeback addressing modes for __raw_ accessors
This should fix warnings for per and core accesses:
warning: passing argument 2 of '__raw_writel' makes pointer from integer without a cast
../io.h:88: note: expected 'volatile void *' but argument is of type 'u32'
Signed-off-by: Omar Ramirez Luna <omar.ramirez@copitl.com>
---
Intended for 3.7 due to code changes during rc1.
.../tidspbridge/include/dspbridge/cfgdefs.h | 4 ++--
drivers/staging/tidspbridge/rmgr/drv.c | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/staging/tidspbridge/include/dspbridge/cfgdefs.h b/drivers/staging/tidspbridge/include/dspbridge/cfgdefs.h
index 60a2781..b32c756 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/cfgdefs.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/cfgdefs.h
@@ -53,8 +53,8 @@ struct cfg_hostres {
u32 chnl_buf_size;
u32 num_chnls;
void __iomem *per_base;
- u32 per_pm_base;
- u32 core_pm_base;
+ void __iomem *per_pm_base;
+ void __iomem *core_pm_base;
void __iomem *dmmu_base;
};
diff --git a/drivers/staging/tidspbridge/rmgr/drv.c b/drivers/staging/tidspbridge/rmgr/drv.c
index 6795205..db1da28 100644
--- a/drivers/staging/tidspbridge/rmgr/drv.c
+++ b/drivers/staging/tidspbridge/rmgr/drv.c
@@ -667,10 +667,10 @@ int drv_request_bridge_res_dsp(void **phost_resources)
OMAP_DSP_MEM3_SIZE);
host_res->per_base = ioremap(OMAP_PER_CM_BASE,
OMAP_PER_CM_SIZE);
- host_res->per_pm_base = (u32) ioremap(OMAP_PER_PRM_BASE,
- OMAP_PER_PRM_SIZE);
- host_res->core_pm_base = (u32) ioremap(OMAP_CORE_PRM_BASE,
- OMAP_CORE_PRM_SIZE);
+ host_res->per_pm_base = ioremap(OMAP_PER_PRM_BASE,
+ OMAP_PER_PRM_SIZE);
+ host_res->core_pm_base = ioremap(OMAP_CORE_PRM_BASE,
+ OMAP_CORE_PRM_SIZE);
host_res->dmmu_base = ioremap(OMAP_DMMU_BASE,
OMAP_DMMU_SIZE);
--
1.7.9.5
next prev parent reply other threads:[~2012-10-24 22:11 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-24 22:09 [PATCH 0/6] staging: tidspbridge fixes for 3.7 Omar Ramirez Luna
2012-10-24 22:09 ` [PATCH 1/6] staging: tidspbridge: request the right irq for mmu Omar Ramirez Luna
2012-10-24 22:09 ` [PATCH 2/6] staging: tidspbridge: drop const from custom mmu implementation Omar Ramirez Luna
2012-10-24 22:09 ` Omar Ramirez Luna [this message]
2012-10-24 22:09 ` [PATCH 4/6] staging: tidspbridge: ioremap dsp sync addr Omar Ramirez Luna
2012-10-24 22:09 ` [PATCH 5/6] staging: tidspbridge: ioremap physical address of the stack segment in shm Omar Ramirez Luna
2012-10-24 22:09 ` [PATCH 6/6] staging: tidspbridge: delete unused mmu functions Omar Ramirez Luna
2012-10-24 22:28 ` [PATCH 0/6] staging: tidspbridge fixes for 3.7 Greg Kroah-Hartman
2012-10-24 23:25 ` Omar Ramirez Luna
2012-10-24 23:35 ` Greg Kroah-Hartman
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=1351116560-6918-4-git-send-email-omar.ramirez@copitl.com \
--to=omar.ramirez@copitl.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=vjaquez@igalia.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;
as well as URLs for NNTP newsgroup(s).