msm: iommu: Cleanup clocks to match new naming convention
Change-Id: Id859d3dabe2f9851473210fe03e8642b55629fa8
Signed-off-by: Matt Wagantall <mattw@codeaurora.org>
diff --git a/arch/arm/mach-msm/clock-8x60.c b/arch/arm/mach-msm/clock-8x60.c
index 1273198..343cb88 100644
--- a/arch/arm/mach-msm/clock-8x60.c
+++ b/arch/arm/mach-msm/clock-8x60.c
@@ -3666,8 +3666,6 @@
CLK_LOOKUP("csi_vfe_clk", csi1_vfe_clk.c, "msm_camera_ov9726.0"),
CLK_LOOKUP("vfe_clk", vfe_clk.c, NULL),
CLK_LOOKUP("core_clk", vfe_clk.c, "footswitch-8x60.8"),
- CLK_LOOKUP("smmu_jpegd_clk", jpegd_axi_clk.c, NULL),
- CLK_LOOKUP("smmu_vfe_clk", vfe_axi_clk.c, NULL),
CLK_LOOKUP("bus_clk", vfe_axi_clk.c, "footswitch-8x60.8"),
CLK_LOOKUP("bus_clk", ijpeg_axi_clk.c, "footswitch-8x60.3"),
CLK_LOOKUP("mem_clk", imem_axi_clk.c, "kgsl-3d0.0"),
@@ -3695,7 +3693,7 @@
CLK_LOOKUP("mem_iface_clk", imem_p_clk.c, "kgsl-3d0.0"),
CLK_LOOKUP("mdp_pclk", mdp_p_clk.c, NULL),
CLK_LOOKUP("iface_clk", mdp_p_clk.c, "footswitch-8x60.4"),
- CLK_LOOKUP("smmu_pclk", smmu_p_clk.c, NULL),
+ CLK_LOOKUP("iface_clk", smmu_p_clk.c, "msm_iommu"),
CLK_LOOKUP("rotator_pclk", rot_p_clk.c, NULL),
CLK_LOOKUP("iface_clk", rot_p_clk.c, "footswitch-8x60.6"),
CLK_LOOKUP("tv_enc_pclk", tv_enc_p_clk.c, NULL),
@@ -3716,16 +3714,16 @@
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("iommu_clk", jpegd_axi_clk.c, "msm_iommu.0"),
- CLK_LOOKUP("iommu_clk", mdp_axi_clk.c, "msm_iommu.2"),
- CLK_LOOKUP("iommu_clk", mdp_axi_clk.c, "msm_iommu.3"),
- CLK_LOOKUP("iommu_clk", ijpeg_axi_clk.c, "msm_iommu.5"),
- CLK_LOOKUP("iommu_clk", vfe_axi_clk.c, "msm_iommu.6"),
- CLK_LOOKUP("iommu_clk", vcodec_axi_clk.c, "msm_iommu.7"),
- CLK_LOOKUP("iommu_clk", vcodec_axi_clk.c, "msm_iommu.8"),
- CLK_LOOKUP("iommu_clk", gfx3d_clk.c, "msm_iommu.9"),
- CLK_LOOKUP("iommu_clk", gfx2d0_clk.c, "msm_iommu.10"),
- CLK_LOOKUP("iommu_clk", gfx2d1_clk.c, "msm_iommu.11"),
+ CLK_LOOKUP("core_clk", jpegd_axi_clk.c, "msm_iommu.0"),
+ 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", 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("dfab_dsps_clk", dfab_dsps_clk.c, NULL),
CLK_LOOKUP("dfab_usb_hs_clk", dfab_usb_hs_clk.c, NULL),