iommu: msm: Change driver name
Change the driver name used in the code and device tree for
IOMMU. The driver and compatible string formerly known as iommu-v1
is now called iommu-v0 and the one formerly known as iommu-v2
is now called iommu-v1 to match file names.
Change-Id: Ida38a0a788e28e820907b93e05187cd61235400c
Signed-off-by: Olav Haugan <ohaugan@codeaurora.org>
diff --git a/arch/arm/mach-msm/clock-8960.c b/arch/arm/mach-msm/clock-8960.c
index 128f9f5..aefaa5c 100644
--- a/arch/arm/mach-msm/clock-8960.c
+++ b/arch/arm/mach-msm/clock-8960.c
@@ -5506,18 +5506,18 @@
CLK_LOOKUP("mem_iface_clk", imem_p_clk.c, "kgsl-3d0.0"),
CLK_LOOKUP("iface_clk", mdp_p_clk.c, "mdp.0"),
CLK_LOOKUP("iface_clk", mdp_p_clk.c, "footswitch-8x60.4"),
- CLK_LOOKUP("iface_clk", smmu_p_clk.c, "msm_iommu.0"),
- CLK_LOOKUP("iface_clk", smmu_p_clk.c, "msm_iommu.1"),
- CLK_LOOKUP("iface_clk", smmu_p_clk.c, "msm_iommu.2"),
- CLK_LOOKUP("iface_clk", smmu_p_clk.c, "msm_iommu.3"),
- CLK_LOOKUP("iface_clk", smmu_p_clk.c, "msm_iommu.4"),
- CLK_LOOKUP("iface_clk", smmu_p_clk.c, "msm_iommu.5"),
- CLK_LOOKUP("iface_clk", smmu_p_clk.c, "msm_iommu.6"),
- CLK_LOOKUP("iface_clk", smmu_p_clk.c, "msm_iommu.7"),
- CLK_LOOKUP("iface_clk", smmu_p_clk.c, "msm_iommu.8"),
- CLK_LOOKUP("iface_clk", smmu_p_clk.c, "msm_iommu.9"),
- CLK_LOOKUP("iface_clk", smmu_p_clk.c, "msm_iommu.10"),
- CLK_LOOKUP("iface_clk", smmu_p_clk.c, "msm_iommu.11"),
+ CLK_LOOKUP("iface_clk", smmu_p_clk.c, "msm_iommu-v0.0"),
+ CLK_LOOKUP("iface_clk", smmu_p_clk.c, "msm_iommu-v0.1"),
+ CLK_LOOKUP("iface_clk", smmu_p_clk.c, "msm_iommu-v0.2"),
+ CLK_LOOKUP("iface_clk", smmu_p_clk.c, "msm_iommu-v0.3"),
+ CLK_LOOKUP("iface_clk", smmu_p_clk.c, "msm_iommu-v0.4"),
+ CLK_LOOKUP("iface_clk", smmu_p_clk.c, "msm_iommu-v0.5"),
+ CLK_LOOKUP("iface_clk", smmu_p_clk.c, "msm_iommu-v0.6"),
+ CLK_LOOKUP("iface_clk", smmu_p_clk.c, "msm_iommu-v0.7"),
+ CLK_LOOKUP("iface_clk", smmu_p_clk.c, "msm_iommu-v0.8"),
+ CLK_LOOKUP("iface_clk", smmu_p_clk.c, "msm_iommu-v0.9"),
+ CLK_LOOKUP("iface_clk", smmu_p_clk.c, "msm_iommu-v0.10"),
+ CLK_LOOKUP("iface_clk", smmu_p_clk.c, "msm_iommu-v0.11"),
CLK_LOOKUP("iface_clk", rot_p_clk.c, "msm_rotator.0"),
CLK_LOOKUP("iface_clk", rot_p_clk.c, "footswitch-8x60.6"),
CLK_LOOKUP("iface_clk", vcodec_p_clk.c, "msm_vidc.0"),
@@ -5584,19 +5584,19 @@
CLK_LOOKUP("core_clk", usb_hsic_system_clk.c, "msm_hsic_host"),
CLK_LOOKUP("iface_clk", usb_hsic_p_clk.c, "msm_hsic_host"),
- CLK_LOOKUP("core_clk", jpegd_axi_clk.c, "msm_iommu.0"),
- CLK_LOOKUP("core_clk", vpe_axi_clk.c, "msm_iommu.1"),
- CLK_LOOKUP("core_clk", mdp_axi_clk.c, "msm_iommu.2"),
- CLK_LOOKUP("core_clk", mdp_axi_clk.c, "msm_iommu.3"),
- CLK_LOOKUP("core_clk", rot_axi_clk.c, "msm_iommu.4"),
- CLK_LOOKUP("core_clk", ijpeg_axi_clk.c, "msm_iommu.5"),
- CLK_LOOKUP("core_clk", vfe_axi_clk.c, "msm_iommu.6"),
- CLK_LOOKUP("core_clk", vcodec_axi_a_clk.c, "msm_iommu.7"),
- CLK_LOOKUP("core_clk", vcodec_axi_b_clk.c, "msm_iommu.8"),
- CLK_LOOKUP("core_clk", gfx3d_axi_clk.c, "msm_iommu.9"),
- CLK_LOOKUP("core_clk", gfx3d_axi_clk.c, "msm_iommu.10"),
+ CLK_LOOKUP("core_clk", jpegd_axi_clk.c, "msm_iommu-v0.0"),
+ CLK_LOOKUP("core_clk", vpe_axi_clk.c, "msm_iommu-v0.1"),
+ CLK_LOOKUP("core_clk", mdp_axi_clk.c, "msm_iommu-v0.2"),
+ CLK_LOOKUP("core_clk", mdp_axi_clk.c, "msm_iommu-v0.3"),
+ CLK_LOOKUP("core_clk", rot_axi_clk.c, "msm_iommu-v0.4"),
+ CLK_LOOKUP("core_clk", ijpeg_axi_clk.c, "msm_iommu-v0.5"),
+ CLK_LOOKUP("core_clk", vfe_axi_clk.c, "msm_iommu-v0.6"),
+ CLK_LOOKUP("core_clk", vcodec_axi_a_clk.c, "msm_iommu-v0.7"),
+ CLK_LOOKUP("core_clk", vcodec_axi_b_clk.c, "msm_iommu-v0.8"),
+ CLK_LOOKUP("core_clk", gfx3d_axi_clk.c, "msm_iommu-v0.9"),
+ CLK_LOOKUP("core_clk", gfx3d_axi_clk.c, "msm_iommu-v0.10"),
- CLK_LOOKUP("core_clk", vcap_axi_clk.c, "msm_iommu.11"),
+ CLK_LOOKUP("core_clk", vcap_axi_clk.c, "msm_iommu-v0.11"),
CLK_LOOKUP("mdp_iommu_clk", mdp_axi_clk.c, "msm_vidc.0"),
CLK_LOOKUP("rot_iommu_clk", rot_axi_clk.c, "msm_vidc.0"),
@@ -5865,16 +5865,16 @@
CLK_LOOKUP("mem_iface_clk", imem_p_clk.c, "kgsl-3d0.0"),
CLK_LOOKUP("iface_clk", mdp_p_clk.c, "mdp.0"),
CLK_LOOKUP("iface_clk", mdp_p_clk.c, "footswitch-8x60.4"),
- CLK_LOOKUP("iface_clk", smmu_p_clk.c, "msm_iommu.0"),
- CLK_LOOKUP("iface_clk", smmu_p_clk.c, "msm_iommu.1"),
- CLK_LOOKUP("iface_clk", smmu_p_clk.c, "msm_iommu.2"),
- CLK_LOOKUP("iface_clk", smmu_p_clk.c, "msm_iommu.3"),
- CLK_LOOKUP("iface_clk", smmu_p_clk.c, "msm_iommu.4"),
- CLK_LOOKUP("iface_clk", smmu_p_clk.c, "msm_iommu.5"),
- CLK_LOOKUP("iface_clk", smmu_p_clk.c, "msm_iommu.6"),
- CLK_LOOKUP("iface_clk", smmu_p_clk.c, "msm_iommu.7"),
- CLK_LOOKUP("iface_clk", smmu_p_clk.c, "msm_iommu.8"),
- CLK_LOOKUP("iface_clk", smmu_p_clk.c, "msm_iommu.9"),
+ CLK_LOOKUP("iface_clk", smmu_p_clk.c, "msm_iommu-v0.0"),
+ CLK_LOOKUP("iface_clk", smmu_p_clk.c, "msm_iommu-v0.1"),
+ CLK_LOOKUP("iface_clk", smmu_p_clk.c, "msm_iommu-v0.2"),
+ CLK_LOOKUP("iface_clk", smmu_p_clk.c, "msm_iommu-v0.3"),
+ CLK_LOOKUP("iface_clk", smmu_p_clk.c, "msm_iommu-v0.4"),
+ CLK_LOOKUP("iface_clk", smmu_p_clk.c, "msm_iommu-v0.5"),
+ CLK_LOOKUP("iface_clk", smmu_p_clk.c, "msm_iommu-v0.6"),
+ CLK_LOOKUP("iface_clk", smmu_p_clk.c, "msm_iommu-v0.7"),
+ CLK_LOOKUP("iface_clk", smmu_p_clk.c, "msm_iommu-v0.8"),
+ CLK_LOOKUP("iface_clk", smmu_p_clk.c, "msm_iommu-v0.9"),
CLK_LOOKUP("iface_clk", rot_p_clk.c, "msm_rotator.0"),
CLK_LOOKUP("iface_clk", rot_p_clk.c, "footswitch-8x60.6"),
CLK_LOOKUP("iface_clk", vcodec_p_clk.c, "msm_vidc.0"),
@@ -5911,16 +5911,16 @@
CLK_LOOKUP("pcm_clk", pcm_clk.c, "msm-dai-q6.3"),
CLK_LOOKUP("sps_slimbus_clk", sps_slimbus_clk.c, NULL),
CLK_LOOKUP("core_clk", audio_slimbus_clk.c, "msm_slim_ctrl.1"),
- CLK_LOOKUP("core_clk", jpegd_axi_clk.c, "msm_iommu.0"),
- CLK_LOOKUP("core_clk", vpe_axi_clk.c, "msm_iommu.1"),
- CLK_LOOKUP("core_clk", mdp_axi_clk.c, "msm_iommu.2"),
- CLK_LOOKUP("core_clk", mdp_axi_clk.c, "msm_iommu.3"),
- CLK_LOOKUP("core_clk", rot_axi_clk.c, "msm_iommu.4"),
- CLK_LOOKUP("core_clk", ijpeg_axi_clk.c, "msm_iommu.5"),
- CLK_LOOKUP("core_clk", vfe_axi_clk.c, "msm_iommu.6"),
- CLK_LOOKUP("core_clk", vcodec_axi_a_clk.c, "msm_iommu.7"),
- CLK_LOOKUP("core_clk", vcodec_axi_b_clk.c, "msm_iommu.8"),
- CLK_LOOKUP("core_clk", gfx3d_clk.c, "msm_iommu.9"),
+ CLK_LOOKUP("core_clk", jpegd_axi_clk.c, "msm_iommu-v0.0"),
+ CLK_LOOKUP("core_clk", vpe_axi_clk.c, "msm_iommu-v0.1"),
+ CLK_LOOKUP("core_clk", mdp_axi_clk.c, "msm_iommu-v0.2"),
+ CLK_LOOKUP("core_clk", mdp_axi_clk.c, "msm_iommu-v0.3"),
+ CLK_LOOKUP("core_clk", rot_axi_clk.c, "msm_iommu-v0.4"),
+ CLK_LOOKUP("core_clk", ijpeg_axi_clk.c, "msm_iommu-v0.5"),
+ CLK_LOOKUP("core_clk", vfe_axi_clk.c, "msm_iommu-v0.6"),
+ CLK_LOOKUP("core_clk", vcodec_axi_a_clk.c, "msm_iommu-v0.7"),
+ CLK_LOOKUP("core_clk", vcodec_axi_b_clk.c, "msm_iommu-v0.8"),
+ CLK_LOOKUP("core_clk", gfx3d_clk.c, "msm_iommu-v0.9"),
CLK_LOOKUP("mdp_iommu_clk", mdp_axi_clk.c, "msm_vidc.0"),
CLK_LOOKUP("rot_iommu_clk", rot_axi_clk.c, "msm_vidc.0"),
@@ -5969,16 +5969,16 @@
CLK_LOOKUP("iface_clk", gfx2d0_p_clk.c, "footswitch-8x60.0"),
CLK_LOOKUP("iface_clk", gfx2d1_p_clk.c, "kgsl-2d1.1"),
CLK_LOOKUP("iface_clk", gfx2d1_p_clk.c, "footswitch-8x60.1"),
- CLK_LOOKUP("iface_clk", smmu_p_clk.c, "msm_iommu.10"),
- CLK_LOOKUP("iface_clk", smmu_p_clk.c, "msm_iommu.11"),
- CLK_LOOKUP("core_clk", gfx2d0_clk.c, "msm_iommu.10"),
- CLK_LOOKUP("core_clk", gfx2d1_clk.c, "msm_iommu.11"),
+ CLK_LOOKUP("iface_clk", smmu_p_clk.c, "msm_iommu-v0.10"),
+ CLK_LOOKUP("iface_clk", smmu_p_clk.c, "msm_iommu-v0.11"),
+ CLK_LOOKUP("core_clk", gfx2d0_clk.c, "msm_iommu-v0.10"),
+ CLK_LOOKUP("core_clk", gfx2d1_clk.c, "msm_iommu-v0.11"),
};
static struct clk_lookup msm_clocks_8960ab_only[] __initdata = {
CLK_LOOKUP("bus_clk", gfx3d_axi_clk.c, "footswitch-8x60.2"),
- CLK_LOOKUP("iface_clk", smmu_p_clk.c, "msm_iommu.10"),
- CLK_LOOKUP("core_clk", gfx3d_axi_clk.c, "msm_iommu.10"),
+ CLK_LOOKUP("iface_clk", smmu_p_clk.c, "msm_iommu-v0.10"),
+ CLK_LOOKUP("core_clk", gfx3d_axi_clk.c, "msm_iommu-v0.10"),
CLK_LOOKUP("div_clk", tv_src_div_clk.c, ""),
};
@@ -6214,17 +6214,17 @@
CLK_LOOKUP("mem_iface_clk", imem_p_clk.c, "kgsl-3d0.0"),
CLK_LOOKUP("iface_clk", mdp_p_clk.c, "mdp.0"),
CLK_LOOKUP("iface_clk", mdp_p_clk.c, "footswitch-8x60.4"),
- CLK_LOOKUP("iface_clk", smmu_p_clk.c, "msm_iommu.0"),
- CLK_LOOKUP("iface_clk", smmu_p_clk.c, "msm_iommu.1"),
- CLK_LOOKUP("iface_clk", smmu_p_clk.c, "msm_iommu.2"),
- CLK_LOOKUP("iface_clk", smmu_p_clk.c, "msm_iommu.3"),
- CLK_LOOKUP("iface_clk", smmu_p_clk.c, "msm_iommu.4"),
- CLK_LOOKUP("iface_clk", smmu_p_clk.c, "msm_iommu.5"),
- CLK_LOOKUP("iface_clk", smmu_p_clk.c, "msm_iommu.6"),
- CLK_LOOKUP("iface_clk", smmu_p_clk.c, "msm_iommu.7"),
- CLK_LOOKUP("iface_clk", smmu_p_clk.c, "msm_iommu.8"),
- CLK_LOOKUP("iface_clk", smmu_p_clk.c, "msm_iommu.9"),
- CLK_LOOKUP("iface_clk", smmu_p_clk.c, "msm_iommu.10"),
+ CLK_LOOKUP("iface_clk", smmu_p_clk.c, "msm_iommu-v0.0"),
+ CLK_LOOKUP("iface_clk", smmu_p_clk.c, "msm_iommu-v0.1"),
+ CLK_LOOKUP("iface_clk", smmu_p_clk.c, "msm_iommu-v0.2"),
+ CLK_LOOKUP("iface_clk", smmu_p_clk.c, "msm_iommu-v0.3"),
+ CLK_LOOKUP("iface_clk", smmu_p_clk.c, "msm_iommu-v0.4"),
+ CLK_LOOKUP("iface_clk", smmu_p_clk.c, "msm_iommu-v0.5"),
+ CLK_LOOKUP("iface_clk", smmu_p_clk.c, "msm_iommu-v0.6"),
+ CLK_LOOKUP("iface_clk", smmu_p_clk.c, "msm_iommu-v0.7"),
+ CLK_LOOKUP("iface_clk", smmu_p_clk.c, "msm_iommu-v0.8"),
+ CLK_LOOKUP("iface_clk", smmu_p_clk.c, "msm_iommu-v0.9"),
+ CLK_LOOKUP("iface_clk", smmu_p_clk.c, "msm_iommu-v0.10"),
CLK_LOOKUP("iface_clk", rot_p_clk.c, "msm_rotator.0"),
CLK_LOOKUP("iface_clk", rot_p_clk.c, "footswitch-8x60.6"),
CLK_LOOKUP("iface_clk", vcodec_p_clk.c, "msm_vidc.0"),
@@ -6258,16 +6258,16 @@
CLK_LOOKUP("pcm_clk", pcm_clk.c, "msm-dai-q6.2"),
CLK_LOOKUP("sps_slimbus_clk", sps_slimbus_clk.c, NULL),
CLK_LOOKUP("core_clk", audio_slimbus_clk.c, "msm_slim_ctrl.1"),
- CLK_LOOKUP("core_clk", vpe_axi_clk.c, "msm_iommu.1"),
- CLK_LOOKUP("core_clk", mdp_axi_clk.c, "msm_iommu.2"),
- CLK_LOOKUP("core_clk", mdp_axi_clk.c, "msm_iommu.3"),
- CLK_LOOKUP("core_clk", rot_axi_clk.c, "msm_iommu.4"),
- CLK_LOOKUP("core_clk", ijpeg_axi_clk.c, "msm_iommu.5"),
- CLK_LOOKUP("core_clk", vfe_axi_clk.c, "msm_iommu.6"),
- CLK_LOOKUP("core_clk", vcodec_axi_a_clk.c, "msm_iommu.7"),
- CLK_LOOKUP("core_clk", vcodec_axi_b_clk.c, "msm_iommu.8"),
- CLK_LOOKUP("core_clk", gfx3d_axi_clk_8930.c, "msm_iommu.9"),
- CLK_LOOKUP("core_clk", gfx3d_axi_clk_8930.c, "msm_iommu.10"),
+ CLK_LOOKUP("core_clk", vpe_axi_clk.c, "msm_iommu-v0.1"),
+ CLK_LOOKUP("core_clk", mdp_axi_clk.c, "msm_iommu-v0.2"),
+ CLK_LOOKUP("core_clk", mdp_axi_clk.c, "msm_iommu-v0.3"),
+ CLK_LOOKUP("core_clk", rot_axi_clk.c, "msm_iommu-v0.4"),
+ CLK_LOOKUP("core_clk", ijpeg_axi_clk.c, "msm_iommu-v0.5"),
+ CLK_LOOKUP("core_clk", vfe_axi_clk.c, "msm_iommu-v0.6"),
+ CLK_LOOKUP("core_clk", vcodec_axi_a_clk.c, "msm_iommu-v0.7"),
+ CLK_LOOKUP("core_clk", vcodec_axi_b_clk.c, "msm_iommu-v0.8"),
+ CLK_LOOKUP("core_clk", gfx3d_axi_clk_8930.c, "msm_iommu-v0.9"),
+ CLK_LOOKUP("core_clk", gfx3d_axi_clk_8930.c, "msm_iommu-v0.10"),
CLK_LOOKUP("mdp_iommu_clk", mdp_axi_clk.c, "msm_vidc.0"),
CLK_LOOKUP("rot_iommu_clk", rot_axi_clk.c, "msm_vidc.0"),
diff --git a/arch/arm/mach-msm/clock-8x60.c b/arch/arm/mach-msm/clock-8x60.c
index 439b538..d0b4a32 100644
--- a/arch/arm/mach-msm/clock-8x60.c
+++ b/arch/arm/mach-msm/clock-8x60.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009-2012, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2009-2013, The Linux Foundation. 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
@@ -3689,18 +3689,18 @@
CLK_LOOKUP("mem_iface_clk", imem_p_clk.c, "kgsl-3d0.0"),
CLK_LOOKUP("iface_clk", mdp_p_clk.c, "mdp.0"),
CLK_LOOKUP("iface_clk", mdp_p_clk.c, "footswitch-8x60.4"),
- CLK_LOOKUP("iface_clk", smmu_p_clk.c, "msm_iommu.0"),
- CLK_LOOKUP("iface_clk", smmu_p_clk.c, "msm_iommu.1"),
- CLK_LOOKUP("iface_clk", smmu_p_clk.c, "msm_iommu.2"),
- CLK_LOOKUP("iface_clk", smmu_p_clk.c, "msm_iommu.3"),
- CLK_LOOKUP("iface_clk", smmu_p_clk.c, "msm_iommu.4"),
- CLK_LOOKUP("iface_clk", smmu_p_clk.c, "msm_iommu.5"),
- CLK_LOOKUP("iface_clk", smmu_p_clk.c, "msm_iommu.6"),
- CLK_LOOKUP("iface_clk", smmu_p_clk.c, "msm_iommu.7"),
- CLK_LOOKUP("iface_clk", smmu_p_clk.c, "msm_iommu.8"),
- CLK_LOOKUP("iface_clk", smmu_p_clk.c, "msm_iommu.9"),
- CLK_LOOKUP("iface_clk", smmu_p_clk.c, "msm_iommu.10"),
- CLK_LOOKUP("iface_clk", smmu_p_clk.c, "msm_iommu.11"),
+ CLK_LOOKUP("iface_clk", smmu_p_clk.c, "msm_iommu-v0.0"),
+ CLK_LOOKUP("iface_clk", smmu_p_clk.c, "msm_iommu-v0.1"),
+ CLK_LOOKUP("iface_clk", smmu_p_clk.c, "msm_iommu-v0.2"),
+ CLK_LOOKUP("iface_clk", smmu_p_clk.c, "msm_iommu-v0.3"),
+ CLK_LOOKUP("iface_clk", smmu_p_clk.c, "msm_iommu-v0.4"),
+ CLK_LOOKUP("iface_clk", smmu_p_clk.c, "msm_iommu-v0.5"),
+ CLK_LOOKUP("iface_clk", smmu_p_clk.c, "msm_iommu-v0.6"),
+ CLK_LOOKUP("iface_clk", smmu_p_clk.c, "msm_iommu-v0.7"),
+ CLK_LOOKUP("iface_clk", smmu_p_clk.c, "msm_iommu-v0.8"),
+ CLK_LOOKUP("iface_clk", smmu_p_clk.c, "msm_iommu-v0.9"),
+ CLK_LOOKUP("iface_clk", smmu_p_clk.c, "msm_iommu-v0.10"),
+ CLK_LOOKUP("iface_clk", smmu_p_clk.c, "msm_iommu-v0.11"),
CLK_LOOKUP("iface_clk", rot_p_clk.c, "msm_rotator.0"),
CLK_LOOKUP("iface_clk", rot_p_clk.c, "footswitch-8x60.6"),
CLK_LOOKUP("tv_enc_pclk", tv_enc_p_clk.c, NULL),
@@ -3721,18 +3721,18 @@
CLK_LOOKUP("i2s_spkr_osr_clk", spare_i2s_spkr_osr_clk.c, NULL),
CLK_LOOKUP("i2s_spkr_bit_clk", spare_i2s_spkr_bit_clk.c, NULL),
CLK_LOOKUP("pcm_clk", pcm_clk.c, NULL),
- CLK_LOOKUP("core_clk", jpegd_axi_clk.c, "msm_iommu.0"),
- CLK_LOOKUP("core_clk", vpe_axi_clk.c, "msm_iommu.1"),
- CLK_LOOKUP("core_clk", mdp_axi_clk.c, "msm_iommu.2"),
- CLK_LOOKUP("core_clk", mdp_axi_clk.c, "msm_iommu.3"),
- CLK_LOOKUP("core_clk", rot_axi_clk.c, "msm_iommu.4"),
- CLK_LOOKUP("core_clk", ijpeg_axi_clk.c, "msm_iommu.5"),
- CLK_LOOKUP("core_clk", vfe_axi_clk.c, "msm_iommu.6"),
- CLK_LOOKUP("core_clk", vcodec_axi_clk.c, "msm_iommu.7"),
- CLK_LOOKUP("core_clk", vcodec_axi_clk.c, "msm_iommu.8"),
- CLK_LOOKUP("core_clk", gfx3d_clk.c, "msm_iommu.9"),
- CLK_LOOKUP("core_clk", gfx2d0_clk.c, "msm_iommu.10"),
- CLK_LOOKUP("core_clk", gfx2d1_clk.c, "msm_iommu.11"),
+ CLK_LOOKUP("core_clk", jpegd_axi_clk.c, "msm_iommu-v0.0"),
+ CLK_LOOKUP("core_clk", vpe_axi_clk.c, "msm_iommu-v0.1"),
+ CLK_LOOKUP("core_clk", mdp_axi_clk.c, "msm_iommu-v0.2"),
+ CLK_LOOKUP("core_clk", mdp_axi_clk.c, "msm_iommu-v0.3"),
+ CLK_LOOKUP("core_clk", rot_axi_clk.c, "msm_iommu-v0.4"),
+ CLK_LOOKUP("core_clk", ijpeg_axi_clk.c, "msm_iommu-v0.5"),
+ CLK_LOOKUP("core_clk", vfe_axi_clk.c, "msm_iommu-v0.6"),
+ CLK_LOOKUP("core_clk", vcodec_axi_clk.c, "msm_iommu-v0.7"),
+ CLK_LOOKUP("core_clk", vcodec_axi_clk.c, "msm_iommu-v0.8"),
+ CLK_LOOKUP("core_clk", gfx3d_clk.c, "msm_iommu-v0.9"),
+ CLK_LOOKUP("core_clk", gfx2d0_clk.c, "msm_iommu-v0.10"),
+ CLK_LOOKUP("core_clk", gfx2d1_clk.c, "msm_iommu-v0.11"),
CLK_LOOKUP("mdp_iommu_clk", mdp_axi_clk.c, "msm_vidc.0"),
CLK_LOOKUP("rot_iommu_clk", rot_axi_clk.c, "msm_vidc.0"),
diff --git a/arch/arm/mach-msm/devices-iommu.c b/arch/arm/mach-msm/devices-iommu.c
index 983b13e..b91e7fe 100644
--- a/arch/arm/mach-msm/devices-iommu.c
+++ b/arch/arm/mach-msm/devices-iommu.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010-2012, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2010-2013, The Linux Foundation. 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
@@ -387,7 +387,7 @@
};
static struct platform_device msm_device_iommu_jpegd = {
- .name = "msm_iommu",
+ .name = "msm_iommu-v0",
.id = 0,
.dev = {
.platform_data = &jpegd_iommu,
@@ -397,7 +397,7 @@
};
static struct platform_device msm_device_iommu_vpe = {
- .name = "msm_iommu",
+ .name = "msm_iommu-v0",
.id = 1,
.dev = {
.platform_data = &vpe_iommu,
@@ -407,7 +407,7 @@
};
static struct platform_device msm_device_iommu_mdp0 = {
- .name = "msm_iommu",
+ .name = "msm_iommu-v0",
.id = 2,
.dev = {
.platform_data = &mdp0_iommu,
@@ -417,7 +417,7 @@
};
static struct platform_device msm_device_iommu_mdp1 = {
- .name = "msm_iommu",
+ .name = "msm_iommu-v0",
.id = 3,
.dev = {
.platform_data = &mdp1_iommu,
@@ -427,7 +427,7 @@
};
static struct platform_device msm_device_iommu_rot = {
- .name = "msm_iommu",
+ .name = "msm_iommu-v0",
.id = 4,
.dev = {
.platform_data = &rot_iommu,
@@ -437,7 +437,7 @@
};
static struct platform_device msm_device_iommu_ijpeg = {
- .name = "msm_iommu",
+ .name = "msm_iommu-v0",
.id = 5,
.dev = {
.platform_data = &ijpeg_iommu,
@@ -447,7 +447,7 @@
};
static struct platform_device msm_device_iommu_vfe = {
- .name = "msm_iommu",
+ .name = "msm_iommu-v0",
.id = 6,
.dev = {
.platform_data = &vfe_iommu,
@@ -457,7 +457,7 @@
};
static struct platform_device msm_device_iommu_vcodec_a = {
- .name = "msm_iommu",
+ .name = "msm_iommu-v0",
.id = 7,
.dev = {
.platform_data = &vcodec_a_iommu,
@@ -467,7 +467,7 @@
};
static struct platform_device msm_device_iommu_vcodec_b = {
- .name = "msm_iommu",
+ .name = "msm_iommu-v0",
.id = 8,
.dev = {
.platform_data = &vcodec_b_iommu,
@@ -477,7 +477,7 @@
};
static struct platform_device msm_device_iommu_gfx3d = {
- .name = "msm_iommu",
+ .name = "msm_iommu-v0",
.id = 9,
.dev = {
.platform_data = &gfx3d_iommu,
@@ -487,7 +487,7 @@
};
static struct platform_device msm_device_iommu_gfx3d1 = {
- .name = "msm_iommu",
+ .name = "msm_iommu-v0",
.id = 10,
.dev = {
.platform_data = &gfx3d1_iommu,
@@ -497,7 +497,7 @@
};
static struct platform_device msm_device_iommu_gfx2d0 = {
- .name = "msm_iommu",
+ .name = "msm_iommu-v0",
.id = 10,
.dev = {
.platform_data = &gfx2d0_iommu,
@@ -507,7 +507,7 @@
};
static struct platform_device msm_device_iommu_gfx2d1 = {
- .name = "msm_iommu",
+ .name = "msm_iommu-v0",
.id = 11,
.dev = {
.platform_data = &gfx2d1_iommu,
@@ -517,7 +517,7 @@
};
static struct platform_device msm_device_iommu_vcap = {
- .name = "msm_iommu",
+ .name = "msm_iommu-v0",
.id = 11,
.dev = {
.platform_data = &vcap_iommu,
@@ -975,8 +975,8 @@
static int __init iommu_init(void)
{
int ret;
- if (!msm_soc_version_supports_iommu_v1()) {
- pr_err("IOMMU v1 is not supported on this SoC version.\n");
+ if (!msm_soc_version_supports_iommu_v0()) {
+ pr_err("IOMMU v0 is not supported on this SoC version.\n");
return -ENODEV;
}
diff --git a/arch/arm/mach-msm/include/mach/iommu.h b/arch/arm/mach-msm/include/mach/iommu.h
index bbf3153..30e74f6 100644
--- a/arch/arm/mach-msm/include/mach/iommu.h
+++ b/arch/arm/mach-msm/include/mach/iommu.h
@@ -235,18 +235,18 @@
*/
int msm_iommu_sec_program_iommu(int sec_id);
-static inline int msm_soc_version_supports_iommu_v1(void)
+static inline int msm_soc_version_supports_iommu_v0(void)
{
#ifdef CONFIG_OF
struct device_node *node;
- node = of_find_compatible_node(NULL, NULL, "qcom,msm-smmu-v2");
+ node = of_find_compatible_node(NULL, NULL, "qcom,msm-smmu-v1");
if (node) {
of_node_put(node);
return 0;
}
- node = of_find_compatible_node(NULL, NULL, "qcom,msm-smmu-v1");
+ node = of_find_compatible_node(NULL, NULL, "qcom,msm-smmu-v0");
if (node) {
of_node_put(node);
return 1;