devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Suman Anna <s-anna-l0cyMroinI0@public.gmane.org>
To: Tony Lindgren <tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org>,
	Benoit Cousson <bcousson-rdvid1DuHRBWk0Htik3J/w@public.gmane.org>
Cc: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org,
	devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	Paul Walmsley <paul-DWxLp4Yu+b8AvxtiuMwx3w@public.gmane.org>,
	iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org,
	Laurent Pinchart
	<laurent.pinchart-ryLnwIuWjnjg/C1BVhZhaw@public.gmane.org>,
	linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	Florian Vaussard <florian.vaussard-p8DiymsW2f8@public.gmane.org>
Subject: [PATCH 03/10] ARM: OMAP2+: change the ISP device archdata MMU name for DT
Date: Wed, 5 Mar 2014 18:24:12 -0600	[thread overview]
Message-ID: <1394065459-16409-4-git-send-email-s-anna@ti.com> (raw)
In-Reply-To: <1394065459-16409-1-git-send-email-s-anna-l0cyMroinI0@public.gmane.org>

The IOMMU DT adaptation support uses the device name instead
of an iommu object name. Fixup the ISP device archdata MMU
name at runtime if using DT-boot. This allows the OMAP3 camera
to be functional in both legacy and DT boots. The iommu object
names should eventually vanish when all the IOMMU users have
been converted to DT nodes.

Signed-off-by: Suman Anna <s-anna-l0cyMroinI0@public.gmane.org>
---
 arch/arm/mach-omap2/devices.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
index 0dd6398..e58609b 100644
--- a/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@ -229,6 +229,9 @@ static struct omap_iommu_arch_data omap3_isp_iommu = {
 
 int omap3_init_camera(struct isp_platform_data *pdata)
 {
+	if (of_have_populated_dt())
+		omap3_isp_iommu.name = "480bd400.mmu";
+
 	omap3isp_device.dev.platform_data = pdata;
 	omap3isp_device.dev.archdata.iommu = &omap3_isp_iommu;
 
-- 
1.9.0

  parent reply	other threads:[~2014-03-06  0:24 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-03-06  0:24 [PATCH 00/10] arch/arm OMAP IOMMU patches for 3.15 Suman Anna
     [not found] ` <1394065459-16409-1-git-send-email-s-anna-l0cyMroinI0@public.gmane.org>
2014-03-06  0:24   ` [PATCH 01/10] ARM: OMAP3: remove deprecated CONFIG_OMAP_IOMMU_IVA2 Suman Anna
2014-03-06  0:24   ` [PATCH 02/10] ARM: OMAP3: fix iva mmu programming issues Suman Anna
     [not found]     ` <1394065459-16409-3-git-send-email-s-anna-l0cyMroinI0@public.gmane.org>
2014-03-12 15:15       ` Paul Walmsley
2014-03-06  0:24   ` Suman Anna [this message]
2014-03-06  0:24   ` [PATCH 04/10] ARM: OMAP2+: use pdata quirks for iommu reset lines Suman Anna
2014-03-06  0:24   ` [PATCH 05/10] ARM: OMAP5: hwmod data: add mmu data for ipu & dsp Suman Anna
2014-03-12 15:18     ` Paul Walmsley
2014-03-06  0:24   ` [PATCH 06/10] ARM: OMAP2+: extend iommu pdata-quirks to OMAP5 Suman Anna
2014-03-06  0:24   ` [PATCH 07/10] ARM: dts: OMAP3: Update ISP IOMMU node Suman Anna
2014-03-06  0:24   ` [PATCH 08/10] ARM: dts: OMAP3: Add IVA " Suman Anna
2014-03-06  0:24   ` [PATCH 09/10] ARM: dts: OMAP4: Add IOMMU nodes Suman Anna
2014-03-06  0:24   ` [PATCH 10/10] ARM: dts: OMAP5: " Suman Anna
2014-03-11 21:49   ` [PATCH 00/10] arch/arm OMAP IOMMU patches for 3.15 Suman Anna
     [not found]     ` <531F84D6.8070101-l0cyMroinI0@public.gmane.org>
2014-03-12 17:04       ` Tony Lindgren
     [not found]         ` <20140312170424.GA30897-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org>
2014-03-12 17:22           ` Suman Anna
     [not found]             ` <532097D2.4000002-l0cyMroinI0@public.gmane.org>
2014-03-12 17:29               ` 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=1394065459-16409-4-git-send-email-s-anna@ti.com \
    --to=s-anna-l0cymroini0@public.gmane.org \
    --cc=bcousson-rdvid1DuHRBWk0Htik3J/w@public.gmane.org \
    --cc=devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=florian.vaussard-p8DiymsW2f8@public.gmane.org \
    --cc=iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org \
    --cc=laurent.pinchart-ryLnwIuWjnjg/C1BVhZhaw@public.gmane.org \
    --cc=linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \
    --cc=linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=paul-DWxLp4Yu+b8AvxtiuMwx3w@public.gmane.org \
    --cc=tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.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;
as well as URLs for NNTP newsgroup(s).