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/Documentation/devicetree/bindings/iommu/msm_iommu_v0.txt b/Documentation/devicetree/bindings/iommu/msm_iommu_v0.txt
index d8e7791..ea2d43a 100644
--- a/Documentation/devicetree/bindings/iommu/msm_iommu_v0.txt
+++ b/Documentation/devicetree/bindings/iommu/msm_iommu_v0.txt
@@ -1,8 +1,8 @@
-* Qualcomm MSM IOMMU v1
+* Qualcomm MSM IOMMU v0
Required properties:
- compatible : one of:
- - "qcom,msm-smmu-v1"
+ - "qcom,msm-smmu-v0"
- reg : offset and length of the register set for the device.
- qcom,glb-offset : Offset for the global register base.
@@ -22,7 +22,7 @@
Example:
qcom,iommu@fd000000 {
- compatible = "qcom,msm-smmu-v1";
+ compatible = "qcom,msm-smmu-v0";
#address-cells = <1>;
#size-cells = <1>;
ranges;
diff --git a/Documentation/devicetree/bindings/iommu/msm_iommu_v1.txt b/Documentation/devicetree/bindings/iommu/msm_iommu_v1.txt
index 2a631ed..7ad5b4b 100644
--- a/Documentation/devicetree/bindings/iommu/msm_iommu_v1.txt
+++ b/Documentation/devicetree/bindings/iommu/msm_iommu_v1.txt
@@ -1,8 +1,8 @@
-* Qualcomm MSM IOMMU
+* Qualcomm MSM IOMMU v1
Required properties:
- compatible : one of:
- - "qcom,msm-smmu-v2"
+ - "qcom,msm-smmu-v1"
- reg : offset and length of the register set for the device. Optional
offset and length for clock register for additional clock that
needs to be turned on for access to this IOMMU.
@@ -47,7 +47,7 @@
Example:
qcom,iommu@fda64000 {
- compatible = "qcom,msm-smmu-v2";
+ compatible = "qcom,msm-smmu-v1";
reg = <0xfda64000 0x10000>;
reg-names = "iommu_base";
vdd-supply = <&gdsc_iommu>;
diff --git a/arch/arm/boot/dts/msm-iommu-v0.dtsi b/arch/arm/boot/dts/msm-iommu-v0.dtsi
index fbc1940..c6eb1b9 100644
--- a/arch/arm/boot/dts/msm-iommu-v0.dtsi
+++ b/arch/arm/boot/dts/msm-iommu-v0.dtsi
@@ -12,7 +12,7 @@
/ {
lpass_iommu: qcom,iommu@fd000000 {
- compatible = "qcom,msm-smmu-v1";
+ compatible = "qcom,msm-smmu-v0";
#address-cells = <1>;
#size-cells = <1>;
ranges;
@@ -51,7 +51,7 @@
};
copss_iommu: qcom,iommu@fd010000 {
- compatible = "qcom,msm-smmu-v1";
+ compatible = "qcom,msm-smmu-v0";
#address-cells = <1>;
#size-cells = <1>;
ranges;
@@ -118,7 +118,7 @@
};
mdpe_iommu: qcom,iommu@fd860000 {
- compatible = "qcom,msm-smmu-v1";
+ compatible = "qcom,msm-smmu-v0";
#address-cells = <1>;
#size-cells = <1>;
ranges;
@@ -143,7 +143,7 @@
};
mdps_iommu: qcom,iommu@fd870000 {
- compatible = "qcom,msm-smmu-v1";
+ compatible = "qcom,msm-smmu-v0";
#address-cells = <1>;
#size-cells = <1>;
ranges;
@@ -168,7 +168,7 @@
};
gfx_iommu: qcom,iommu@fd880000 {
- compatible = "qcom,msm-smmu-v1";
+ compatible = "qcom,msm-smmu-v0";
#address-cells = <1>;
#size-cells = <1>;
ranges;
@@ -202,7 +202,7 @@
};
vfe_iommu: qcom,iommu@fd890000 {
- compatible = "qcom,msm-smmu-v1";
+ compatible = "qcom,msm-smmu-v0";
#address-cells = <1>;
#size-cells = <1>;
ranges;
diff --git a/arch/arm/boot/dts/msm-iommu-v1.dtsi b/arch/arm/boot/dts/msm-iommu-v1.dtsi
index 8d1224b..71dcc6a 100644
--- a/arch/arm/boot/dts/msm-iommu-v1.dtsi
+++ b/arch/arm/boot/dts/msm-iommu-v1.dtsi
@@ -12,7 +12,7 @@
/ {
jpeg_iommu: qcom,iommu@fda64000 {
- compatible = "qcom,msm-smmu-v2";
+ compatible = "qcom,msm-smmu-v1";
#address-cells = <1>;
#size-cells = <1>;
ranges;
@@ -99,7 +99,7 @@
};
mdp_iommu: qcom,iommu@fd928000 {
- compatible = "qcom,msm-smmu-v2";
+ compatible = "qcom,msm-smmu-v1";
#address-cells = <1>;
#size-cells = <1>;
ranges;
@@ -194,7 +194,7 @@
};
venus_iommu: qcom,iommu@fdc84000 {
- compatible = "qcom,msm-smmu-v2";
+ compatible = "qcom,msm-smmu-v1";
#address-cells = <1>;
#size-cells = <1>;
ranges;
@@ -303,7 +303,7 @@
};
kgsl_iommu: qcom,iommu@fdb10000 {
- compatible = "qcom,msm-smmu-v2";
+ compatible = "qcom,msm-smmu-v1";
#address-cells = <1>;
#size-cells = <1>;
ranges;
@@ -378,7 +378,7 @@
};
vfe_iommu: qcom,iommu@fda44000 {
- compatible = "qcom,msm-smmu-v2";
+ compatible = "qcom,msm-smmu-v1";
#address-cells = <1>;
#size-cells = <1>;
ranges;
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;
diff --git a/drivers/gpu/msm/adreno.c b/drivers/gpu/msm/adreno.c
index ca46585..407bbb3 100644
--- a/drivers/gpu/msm/adreno.c
+++ b/drivers/gpu/msm/adreno.c
@@ -986,7 +986,7 @@
KGSL_CORE_ERR("Unable to read KGSL IOMMU 'reg'\n");
goto err;
}
- if (msm_soc_version_supports_iommu_v1())
+ if (msm_soc_version_supports_iommu_v0())
ctxs[ctx_index].ctx_id = (reg_val[0] -
data->physstart) >> KGSL_IOMMU_CTX_SHIFT;
else
diff --git a/drivers/gpu/msm/kgsl_iommu.c b/drivers/gpu/msm/kgsl_iommu.c
index abf125f..df190ff 100644
--- a/drivers/gpu/msm/kgsl_iommu.c
+++ b/drivers/gpu/msm/kgsl_iommu.c
@@ -565,8 +565,8 @@
sizeof(struct kgsl_iommu_pt));
return NULL;
}
- /* L2 redirect is not stable on IOMMU v2 */
- if (msm_soc_version_supports_iommu_v1())
+ /* L2 redirect is not stable on IOMMU v1 */
+ if (msm_soc_version_supports_iommu_v0())
iommu_pt->domain = iommu_domain_alloc(&platform_bus_type,
MSM_IOMMU_DOMAIN_PT_CACHEABLE);
else
@@ -749,7 +749,7 @@
uint32_t lock_gpu_addr = 0;
if (KGSL_DEVICE_3D0 != mmu->device->id ||
- !msm_soc_version_supports_iommu_v1() ||
+ !msm_soc_version_supports_iommu_v0() ||
!kgsl_mmu_is_perprocess() ||
iommu->sync_lock_vars)
return 0;
@@ -790,7 +790,7 @@
uint32_t lock_phy_addr = 0;
uint32_t page_offset = 0;
- if (!msm_soc_version_supports_iommu_v1() ||
+ if (!msm_soc_version_supports_iommu_v0() ||
!kgsl_mmu_is_perprocess())
return status;
@@ -1113,7 +1113,7 @@
int i = 0;
struct kgsl_iommu *iommu = mmu->priv;
- if (!msm_soc_version_supports_iommu_v1())
+ if (!msm_soc_version_supports_iommu_v0())
return 0;
for (i = 0; i < iommu->unit_count; i++) {
@@ -1194,7 +1194,7 @@
iommu->iommu_reg_list = kgsl_iommuv1_reg;
iommu->ctx_offset = KGSL_IOMMU_CTX_OFFSET_V1;
- if (msm_soc_version_supports_iommu_v1()) {
+ if (msm_soc_version_supports_iommu_v0()) {
iommu->iommu_reg_list = kgsl_iommuv1_reg;
iommu->ctx_offset = KGSL_IOMMU_CTX_OFFSET_V1;
} else {
@@ -1242,7 +1242,7 @@
/* If chip is not 8960 then we use the 2nd context bank for pagetable
* switching on the 3D side for which a separate table is allocated */
- if (!cpu_is_msm8960() && msm_soc_version_supports_iommu_v1()) {
+ if (!cpu_is_msm8960() && msm_soc_version_supports_iommu_v0()) {
mmu->priv_bank_table =
kgsl_mmu_getpagetable(KGSL_MMU_PRIV_BANK_TABLE_NAME);
if (mmu->priv_bank_table == NULL) {
@@ -1644,15 +1644,15 @@
pt_base &= (iommu->iommu_reg_list[KGSL_IOMMU_CTX_TTBR0].reg_mask <<
iommu->iommu_reg_list[KGSL_IOMMU_CTX_TTBR0].reg_shift);
- /* For v1 SMMU GPU needs to be idle for tlb invalidate as well */
- if (msm_soc_version_supports_iommu_v1())
+ /* For v0 SMMU GPU needs to be idle for tlb invalidate as well */
+ if (msm_soc_version_supports_iommu_v0())
kgsl_idle(mmu->device);
/* Acquire GPU-CPU sync Lock here */
msm_iommu_lock();
if (flags & KGSL_MMUFLAGS_PTUPDATE) {
- if (!msm_soc_version_supports_iommu_v1())
+ if (!msm_soc_version_supports_iommu_v0())
kgsl_idle(mmu->device);
for (i = 0; i < iommu->unit_count; i++) {
/* get the lsb value which should not change when
diff --git a/drivers/gpu/msm/kgsl_mmu.h b/drivers/gpu/msm/kgsl_mmu.h
index 9141af4..2b33baf 100644
--- a/drivers/gpu/msm/kgsl_mmu.h
+++ b/drivers/gpu/msm/kgsl_mmu.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002,2007-2012, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2002,2007-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
@@ -341,9 +341,9 @@
static inline int kgsl_mmu_is_perprocess(void)
{
- /* We presently do not support per-process for IOMMU-v2 */
+ /* We presently do not support per-process for IOMMU-v1 */
return (kgsl_mmu_get_mmutype() != KGSL_MMU_TYPE_IOMMU)
- || msm_soc_version_supports_iommu_v1();
+ || msm_soc_version_supports_iommu_v0();
}
#else
static inline int kgsl_mmu_is_perprocess(void)
diff --git a/drivers/iommu/msm_iommu-v0.c b/drivers/iommu/msm_iommu-v0.c
index 9ce19a3..28f1516 100644
--- a/drivers/iommu/msm_iommu-v0.c
+++ b/drivers/iommu/msm_iommu-v0.c
@@ -1355,7 +1355,7 @@
static int __init msm_iommu_init(void)
{
- if (!msm_soc_version_supports_iommu_v1())
+ if (!msm_soc_version_supports_iommu_v0())
return -ENODEV;
msm_iommu_lock_initialize();
diff --git a/drivers/iommu/msm_iommu_dev-v0.c b/drivers/iommu/msm_iommu_dev-v0.c
index 7d55e1e..3a9cc23 100644
--- a/drivers/iommu/msm_iommu_dev-v0.c
+++ b/drivers/iommu/msm_iommu_dev-v0.c
@@ -549,13 +549,13 @@
static struct of_device_id msm_iommu_match_table[] = {
- { .compatible = "qcom,msm-smmu-v1", },
+ { .compatible = "qcom,msm-smmu-v0", },
{}
};
static struct platform_driver msm_iommu_driver = {
.driver = {
- .name = "msm_iommu",
+ .name = "msm_iommu-v0",
.of_match_table = msm_iommu_match_table,
},
.probe = msm_iommu_probe,
diff --git a/drivers/iommu/msm_iommu_dev-v1.c b/drivers/iommu/msm_iommu_dev-v1.c
index e29e9b4..9291e30 100644
--- a/drivers/iommu/msm_iommu_dev-v1.c
+++ b/drivers/iommu/msm_iommu_dev-v1.c
@@ -349,13 +349,13 @@
}
static struct of_device_id msm_iommu_match_table[] = {
- { .compatible = "qcom,msm-smmu-v2", },
+ { .compatible = "qcom,msm-smmu-v1", },
{}
};
static struct platform_driver msm_iommu_driver = {
.driver = {
- .name = "msm_iommu_v2",
+ .name = "msm_iommu_v1",
.of_match_table = msm_iommu_match_table,
},
.probe = msm_iommu_probe,
@@ -369,7 +369,7 @@
static struct platform_driver msm_iommu_ctx_driver = {
.driver = {
- .name = "msm_iommu_ctx_v2",
+ .name = "msm_iommu_ctx_v1",
.of_match_table = msm_iommu_ctx_match_table,
},
.probe = msm_iommu_ctx_probe,
diff --git a/drivers/iommu/msm_iommu_sec.c b/drivers/iommu/msm_iommu_sec.c
index afbba91..3b411a6 100644
--- a/drivers/iommu/msm_iommu_sec.c
+++ b/drivers/iommu/msm_iommu_sec.c
@@ -79,7 +79,7 @@
unsigned int spare;
int ret, ptbl_ret = 0;
- for_each_compatible_node(np, NULL, "qcom,msm-smmu-v2")
+ for_each_compatible_node(np, NULL, "qcom,msm-smmu-v1")
if (of_find_property(np, "qcom,iommu-secure-id", NULL))
break;