From: Daniel Walker <dwalker@codeaurora.org>
To: Stepan Moskovchenko <stepanm@codeaurora.org>
Cc: davidb@codeaurora.org, linux-arm-msm@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH 2/3] msm: iommu: Generalize platform data for multiple targets
Date: Fri, 11 Feb 2011 12:42:14 -0800 [thread overview]
Message-ID: <1297456934.4852.11.camel@m0nster> (raw)
In-Reply-To: <1297456098-3241-2-git-send-email-stepanm@codeaurora.org>
On Fri, 2011-02-11 at 12:28 -0800, Stepan Moskovchenko wrote:
> Make the IOMMU platform data target-independent in
> preparation for adding MSM8960 IOMMU support. The IOMMU
> configuration on MSM8x60 and MSM8960 is identical and the
> same platform data can be used for both.
>
> Signed-off-by: Stepan Moskovchenko <stepanm@codeaurora.org>
> ---
> arch/arm/mach-msm/Makefile | 4 +-
> .../{devices-msm8x60-iommu.c => devices-iommu.c} | 54 +++++++++----------
> arch/arm/mach-msm/include/mach/msm_iomap-8x60.h | 36 -------------
> 3 files changed, 28 insertions(+), 66 deletions(-)
> rename arch/arm/mach-msm/{devices-msm8x60-iommu.c => devices-iommu.c} (93%)
>
> diff --git a/arch/arm/mach-msm/Makefile b/arch/arm/mach-msm/Makefile
> index 81f4811..2099c97 100644
> --- a/arch/arm/mach-msm/Makefile
> +++ b/arch/arm/mach-msm/Makefile
> @@ -4,12 +4,12 @@ obj-$(CONFIG_DEBUG_FS) += clock-debug.o
> endif
>
> obj-$(CONFIG_MSM_VIC) += irq-vic.o
> -obj-$(CONFIG_MSM_IOMMU) += iommu.o iommu_dev.o
> +obj-$(CONFIG_MSM_IOMMU) += iommu.o iommu_dev.o devices-iommu.o
>
> obj-$(CONFIG_ARCH_MSM7X00A) += dma.o irq.o acpuclock-arm11.o
> obj-$(CONFIG_ARCH_MSM7X30) += dma.o
> obj-$(CONFIG_ARCH_QSD8X50) += dma.o sirc.o
> -obj-$(CONFIG_ARCH_MSM8X60) += clock-dummy.o devices-msm8x60-iommu.o
> +obj-$(CONFIG_ARCH_MSM8X60) += clock-dummy.o
> obj-$(CONFIG_ARCH_MSM8960) += clock-dummy.o
>
> obj-$(CONFIG_MSM_PROC_COMM) += proc_comm.o clock-pcom.o vreg.o
> diff --git a/arch/arm/mach-msm/devices-msm8x60-iommu.c b/arch/arm/mach-msm/devices-iommu.c
> similarity index 93%
> rename from arch/arm/mach-msm/devices-msm8x60-iommu.c
> rename to arch/arm/mach-msm/devices-iommu.c
> index f9e7bd3..c0206b7 100644
> --- a/arch/arm/mach-msm/devices-msm8x60-iommu.c
> +++ b/arch/arm/mach-msm/devices-iommu.c
> @@ -1,4 +1,4 @@
> -/* Copyright (c) 2010, Code Aurora Forum. All rights reserved.
> +/* Copyright (c) 2010-2011, Code Aurora Forum. All rights reserved.
> *
> * This program is free software; you can redistribute it and/or modify
> * it under the terms of the GNU General Public License version 2 and
> @@ -18,15 +18,13 @@
> #include <linux/kernel.h>
> #include <linux/platform_device.h>
> #include <linux/bootmem.h>
> -
> -#include <mach/msm_iomap-8x60.h>
> -#include <mach/irqs-8x60.h>
> +#include <mach/irqs.h>
> #include <mach/iommu.h>
>
> static struct resource msm_iommu_jpegd_resources[] = {
> {
> - .start = MSM_IOMMU_JPEGD_PHYS,
> - .end = MSM_IOMMU_JPEGD_PHYS + MSM_IOMMU_JPEGD_SIZE - 1,
> + .start = 0x07300000,
> + .end = 0x07300000 + SZ_1M - 1,
Looks worse .. Just put the macros into a static header file for both.
Daniel
--
Sent by an consultant of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora
Forum.
next prev parent reply other threads:[~2011-02-11 20:45 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-11 20:28 [PATCH 1/3] msm: iommu: Create a Kconfig item for the IOMMU driver Stepan Moskovchenko
2011-02-11 20:28 ` [PATCH 2/3] msm: iommu: Generalize platform data for multiple targets Stepan Moskovchenko
2011-02-11 20:42 ` Daniel Walker [this message]
2011-02-11 20:51 ` Steve Muckle
2011-02-11 20:58 ` Daniel Walker
2011-02-11 21:00 ` Steve Muckle
2011-02-11 21:03 ` Daniel Walker
2011-02-11 21:03 ` David Brown
2011-02-11 21:14 ` Daniel Walker
2011-02-11 21:53 ` David Brown
2011-02-11 22:00 ` Daniel Walker
2011-02-11 22:12 ` Daniel Walker
2011-02-11 22:37 ` David Brown
2011-02-11 22:47 ` Daniel Walker
2011-02-11 23:16 ` David Brown
2011-02-11 23:35 ` Daniel Walker
2011-02-11 20:28 ` [PATCH 3/3] msm: iommu: Enable IOMMU support for MSM8960 Stepan Moskovchenko
2011-02-11 20:38 ` [PATCH 1/3] msm: iommu: Create a Kconfig item for the IOMMU driver Daniel Walker
2011-02-15 19:35 ` David Brown
2011-02-15 19:49 ` Daniel Walker
2011-02-25 0:12 ` David Brown
2011-02-16 0:36 ` Daniel Walker
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=1297456934.4852.11.camel@m0nster \
--to=dwalker@codeaurora.org \
--cc=davidb@codeaurora.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=stepanm@codeaurora.org \
/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