diff options
| author | Scott Williams <scwilliams@nvidia.com> | 2011-04-12 17:47:52 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-04-26 15:55:42 -0700 |
| commit | 790b41bd41628f1d303c1114b79e8078c7a31101 (patch) | |
| tree | fb7695d9be5f9cd79a9d914efdacfacf1e9828c3 /arch/arm | |
| parent | 30b8391f773fc2edfb07ac8bd1b3a8e53f6938db (diff) | |
ARM: tegra: Use proper type for physical addresses
Original-Change-Id: I158d2be97c795313e7e74ce9fb4ec0bdc7d95496
Reviewed-on: http://git-master/r/27559
Tested-by: Scott Williams <scwilliams@nvidia.com>
Reviewed-by: Hiro Sugawara <hsugawara@nvidia.com>
Reviewed-by: Jin Qian <jqian@nvidia.com>
Reviewed-by: Kaz Fukuoka <kfukuoka@nvidia.com>
Reviewed-by: Scott Williams <scwilliams@nvidia.com>
Change-Id: I0ff198daa548ed2837f7fb1794013bf0adf7e5a1
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-tegra/include/mach/nvmap.h | 8 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/spi_tegra_slave.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/suspend.c | 18 |
3 files changed, 14 insertions, 14 deletions
diff --git a/arch/arm/mach-tegra/include/mach/nvmap.h b/arch/arm/mach-tegra/include/mach/nvmap.h index 7422d1a44d8a..b19ccf6ae7dd 100644 --- a/arch/arm/mach-tegra/include/mach/nvmap.h +++ b/arch/arm/mach-tegra/include/mach/nvmap.h @@ -3,7 +3,7 @@ * * structure declarations for nvmem and nvmap user-space ioctls * - * Copyright (c) 2009, NVIDIA Corporation. + * Copyright (c) 2009-2011, NVIDIA Corporation. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -84,9 +84,9 @@ struct nvmap_client *nvmap_client_get(struct nvmap_client *client); void nvmap_client_put(struct nvmap_client *c); -unsigned long nvmap_pin(struct nvmap_client *c, struct nvmap_handle_ref *r); +phys_addr_t nvmap_pin(struct nvmap_client *c, struct nvmap_handle_ref *r); -unsigned long nvmap_handle_address(struct nvmap_client *c, unsigned long id); +phys_addr_t nvmap_handle_address(struct nvmap_client *c, unsigned long id); void nvmap_unpin(struct nvmap_client *client, struct nvmap_handle_ref *r); @@ -100,7 +100,7 @@ void nvmap_unpin_handles(struct nvmap_client *client, struct nvmap_platform_carveout { const char *name; unsigned int usage_mask; - unsigned long base; + phys_addr_t base; size_t size; size_t buddy_size; }; diff --git a/arch/arm/mach-tegra/spi_tegra_slave.c b/arch/arm/mach-tegra/spi_tegra_slave.c index 89469a863054..c4b7ab1ee400 100644 --- a/arch/arm/mach-tegra/spi_tegra_slave.c +++ b/arch/arm/mach-tegra/spi_tegra_slave.c @@ -166,7 +166,7 @@ struct spi_tegra_data { struct clk *clk; void __iomem *base; - unsigned long phys; + phys_addr_t phys; u32 cur_speed; diff --git a/arch/arm/mach-tegra/suspend.c b/arch/arm/mach-tegra/suspend.c index b75bdd4892a6..15b33c08f9b2 100644 --- a/arch/arm/mach-tegra/suspend.c +++ b/arch/arm/mach-tegra/suspend.c @@ -171,7 +171,7 @@ unsigned long tegra_wfi_fail_count[CONFIG_NR_CPUS]; #define EMC_MRW_DEV_SELECTN 30 #define EMC_MRW_DEV_NONE (3 << EMC_MRW_DEV_SELECTN) -unsigned long tegra_pgd_phys; /* pgd used by hotplug & LP2 bootup */ +phys_addr_t tegra_pgd_phys; /* pgd used by hotplug & LP2 bootup */ static pgd_t *tegra_pgd; void *tegra_context_area = NULL; @@ -292,16 +292,16 @@ static int create_suspend_pgtable(void) (unsigned long)virt_to_phys(__shut_off_mmu), (unsigned long)virt_to_phys(__put_cpu_in_reset), }; - unsigned long addr_p[] = { - PHYS_OFFSET, - IO_IRAM_PHYS, - (unsigned long)virt_to_phys(tegra_context_area), + phys_addr_t addr_p[] = { + (phys_addr_t)PHYS_OFFSET, + (phys_addr_t)IO_IRAM_PHYS, + virt_to_phys(tegra_context_area), #ifdef CONFIG_HOTPLUG_CPU - (unsigned long)virt_to_phys(tegra_hotplug_startup), + virt_to_phys(tegra_hotplug_startup), #endif - (unsigned long)virt_to_phys(__cortex_a9_restore), - (unsigned long)virt_to_phys(__shut_off_mmu), - (unsigned long)virt_to_phys(__put_cpu_in_reset), + virt_to_phys(__cortex_a9_restore), + virt_to_phys(__shut_off_mmu), + virt_to_phys(__put_cpu_in_reset), }; unsigned int flags = PMD_TYPE_SECT | PMD_SECT_AP_WRITE | PMD_SECT_WBWA | PMD_SECT_S; |