msm: kgsl: Pass device pointers to regulator_get()
Passing a device pointer instead of NULL as the first argument
to regulator_get() allows the device to be taken into account
when finding a matching regulator. This removes the need to
specify a unique regulator_name in struct kgsl_pwrctrl.
Change-Id: I6f6c299d5ad39b8b5b24a465ecabab484ea6d18e
Signed-off-by: Matt Wagantall <mattw@codeaurora.org>
diff --git a/arch/arm/mach-msm/devices-8064.c b/arch/arm/mach-msm/devices-8064.c
index de7e87b..f5ff636 100644
--- a/arch/arm/mach-msm/devices-8064.c
+++ b/arch/arm/mach-msm/devices-8064.c
@@ -1625,7 +1625,7 @@
FS_8X60(FS_IJPEG, "fs_ijpeg", NULL, &ijpeg_fs_data),
FS_8X60(FS_VFE, "fs_vfe", NULL, &vfe_fs_data),
FS_8X60(FS_VPE, "fs_vpe", NULL, &vpe_fs_data),
- FS_8X60(FS_GFX3D, "fs_gfx3d", NULL, &gfx3d_fs_data),
+ FS_8X60(FS_GFX3D, "vdd", "kgsl-3d0.0", &gfx3d_fs_data),
FS_8X60(FS_VED, "fs_ved", NULL, &ved_fs_data),
FS_8X60(FS_VCAP, "fs_vcap", NULL, &vcap_fs_data),
};
diff --git a/arch/arm/mach-msm/devices-8930.c b/arch/arm/mach-msm/devices-8930.c
index c6814f8..1e3406e 100644
--- a/arch/arm/mach-msm/devices-8930.c
+++ b/arch/arm/mach-msm/devices-8930.c
@@ -435,7 +435,7 @@
FS_8X60(FS_IJPEG, "fs_ijpeg", NULL, &ijpeg_fs_data),
FS_8X60(FS_VFE, "fs_vfe", NULL, &vfe_fs_data),
FS_8X60(FS_VPE, "fs_vpe", NULL, &vpe_fs_data),
- FS_8X60(FS_GFX3D, "fs_gfx3d", NULL, &gfx3d_fs_data),
+ FS_8X60(FS_GFX3D, "vdd", "kgsl-3d0.0", &gfx3d_fs_data),
FS_8X60(FS_VED, "fs_ved", NULL, &ved_fs_data),
};
unsigned msm8930_num_footswitch __initdata = ARRAY_SIZE(msm8930_footswitch);
diff --git a/arch/arm/mach-msm/devices-8960.c b/arch/arm/mach-msm/devices-8960.c
index 56f8338..6f1fe37 100644
--- a/arch/arm/mach-msm/devices-8960.c
+++ b/arch/arm/mach-msm/devices-8960.c
@@ -2076,9 +2076,9 @@
FS_8X60(FS_IJPEG, "fs_ijpeg", NULL, &ijpeg_fs_data),
FS_8X60(FS_VFE, "fs_vfe", NULL, &vfe_fs_data),
FS_8X60(FS_VPE, "fs_vpe", NULL, &vpe_fs_data),
- FS_8X60(FS_GFX3D, "fs_gfx3d", NULL, &gfx3d_fs_data),
- FS_8X60(FS_GFX2D0, "fs_gfx2d0", NULL, &gfx2d0_fs_data),
- FS_8X60(FS_GFX2D1, "fs_gfx2d1", NULL, &gfx2d1_fs_data),
+ FS_8X60(FS_GFX3D, "vdd", "kgsl-3d0.0", &gfx3d_fs_data),
+ FS_8X60(FS_GFX2D0, "vdd", "kgsl-2d0.0", &gfx2d0_fs_data),
+ FS_8X60(FS_GFX2D1, "vdd", "kgsl-2d1.1", &gfx2d1_fs_data),
FS_8X60(FS_VED, "fs_ved", NULL, &ved_fs_data),
};
unsigned msm8960_num_footswitch __initdata = ARRAY_SIZE(msm8960_footswitch);
diff --git a/arch/arm/mach-msm/devices-msm7x27.c b/arch/arm/mach-msm/devices-msm7x27.c
index 6938b6e..2382510 100644
--- a/arch/arm/mach-msm/devices-msm7x27.c
+++ b/arch/arm/mach-msm/devices-msm7x27.c
@@ -870,7 +870,7 @@
};
struct platform_device *msm_footswitch_devices[] = {
- FS_PCOM(FS_GFX3D, "fs_gfx3d", NULL),
+ FS_PCOM(FS_GFX3D, "vdd", "kgsl-3d0.0"),
};
unsigned msm_num_footswitch_devices = ARRAY_SIZE(msm_footswitch_devices);
diff --git a/arch/arm/mach-msm/devices-msm7x27a.c b/arch/arm/mach-msm/devices-msm7x27a.c
index 4607b0a..b606c6c 100644
--- a/arch/arm/mach-msm/devices-msm7x27a.c
+++ b/arch/arm/mach-msm/devices-msm7x27a.c
@@ -929,7 +929,7 @@
};
struct platform_device *msm_footswitch_devices[] = {
- FS_PCOM(FS_GFX3D, "fs_gfx3d", NULL),
+ FS_PCOM(FS_GFX3D, "vdd", "kgsl-3d0.0"),
};
unsigned msm_num_footswitch_devices = ARRAY_SIZE(msm_footswitch_devices);
diff --git a/arch/arm/mach-msm/devices-msm7x30.c b/arch/arm/mach-msm/devices-msm7x30.c
index 261bbba..7999ab8 100644
--- a/arch/arm/mach-msm/devices-msm7x30.c
+++ b/arch/arm/mach-msm/devices-msm7x30.c
@@ -1345,8 +1345,8 @@
};
struct platform_device *msm_footswitch_devices[] = {
- FS_PCOM(FS_GFX2D0, "fs_gfx2d0", NULL),
- FS_PCOM(FS_GFX3D, "fs_gfx3d", NULL),
+ FS_PCOM(FS_GFX2D0, "vdd", "kgsl-2d0.0"),
+ FS_PCOM(FS_GFX3D, "vdd", "kgsl-3d0.0"),
FS_PCOM(FS_MDP, "fs_mdp", NULL),
FS_PCOM(FS_MFC, "fs_mfc", NULL),
FS_PCOM(FS_ROT, "fs_rot", NULL),
diff --git a/arch/arm/mach-msm/devices-msm8x60.c b/arch/arm/mach-msm/devices-msm8x60.c
index 8193e40..16ee017 100644
--- a/arch/arm/mach-msm/devices-msm8x60.c
+++ b/arch/arm/mach-msm/devices-msm8x60.c
@@ -2663,9 +2663,9 @@
FS_8X60(FS_VED, "fs_ved", NULL, &ved_fs_data),
FS_8X60(FS_VFE, "fs_vfe", NULL, &vfe_fs_data),
FS_8X60(FS_VPE, "fs_vpe", NULL, &vpe_fs_data),
- FS_8X60(FS_GFX3D, "fs_gfx3d", NULL, &gfx3d_fs_data),
- FS_8X60(FS_GFX2D0, "fs_gfx2d0", NULL, &gfx2d0_fs_data),
- FS_8X60(FS_GFX2D1, "fs_gfx2d1", NULL, &gfx2d1_fs_data),
+ FS_8X60(FS_GFX3D, "vdd", "kgsl-3d0.0", &gfx3d_fs_data),
+ FS_8X60(FS_GFX2D0, "vdd", "kgsl-2d0.0", &gfx2d0_fs_data),
+ FS_8X60(FS_GFX2D1, "vdd", "kgsl-2d1.1", &gfx2d1_fs_data),
};
unsigned msm8660_num_footswitch __initdata = ARRAY_SIZE(msm8660_footswitch);