From 179961e8fe89510a2cf52ea20c0a9f891234ae14 Mon Sep 17 00:00:00 2001 From: Scott Williams Date: Tue, 12 Apr 2011 17:47:52 -0700 Subject: ARM: tegra: Use proper type for physical addresses Original-Change-Id: I158d2be97c795313e7e74ce9fb4ec0bdc7d95496 Reviewed-on: http://git-master/r/27559 Tested-by: Scott Williams Reviewed-by: Hiro Sugawara Reviewed-by: Jin Qian Reviewed-by: Kaz Fukuoka Reviewed-by: Scott Williams Original-Change-Id: I0ff198daa548ed2837f7fb1794013bf0adf7e5a1 Rebase-Id: R83df5f3b5104183bfe774d8eed8ce94427c9b7fc --- drivers/video/tegra/host/debug.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'drivers/video/tegra/host/debug.c') diff --git a/drivers/video/tegra/host/debug.c b/drivers/video/tegra/host/debug.c index 28dc52f75212..c7c6a0c19f03 100644 --- a/drivers/video/tegra/host/debug.c +++ b/drivers/video/tegra/host/debug.c @@ -123,7 +123,7 @@ static int show_channel_command(struct output *o, u32 val, int *count) } } -static void show_channel_gather(struct output *o, u32 phys_addr, +static void show_channel_gather(struct output *o, phys_addr_t phys_addr, u32 words); static void show_channel_word(struct output *o, int *state, int *count, @@ -162,13 +162,13 @@ static void show_channel_word(struct output *o, int *state, int *count, * TODO: This uses ioremap_xxx on memory which is deprecated. * Also, it won't work properly with SMMU. */ -static void show_channel_gather(struct output *o, u32 phys_addr, +static void show_channel_gather(struct output *o, phys_addr_t phys_addr, u32 words) { - u32 map_base = phys_addr & PAGE_MASK; - u32 map_end = (phys_addr + words * 4 + PAGE_SIZE - 1) & PAGE_MASK; - u32 map_size = map_end - map_base; - u32 map_offset = phys_addr - map_base; + phys_addr_t map_base = phys_addr & PAGE_MASK; + phys_addr_t map_end = (phys_addr + words * 4 + PAGE_SIZE - 1) & PAGE_MASK; + phys_addr_t map_size = map_end - map_base; + phys_addr_t map_offset = phys_addr - map_base; void *map_addr = ioremap_nocache(map_base, map_size); int state = NVHOST_DBG_STATE_CMD; int count, i; -- cgit v1.2.3