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/drivers/gpu/msm/adreno.c b/drivers/gpu/msm/adreno.c
index 7c152721..9479302 100644
--- a/drivers/gpu/msm/adreno.c
+++ b/drivers/gpu/msm/adreno.c
@@ -90,7 +90,6 @@
.config = ADRENO_MMU_CONFIG,
},
.pwrctrl = {
- .regulator_name = "fs_gfx3d",
.irq_name = KGSL_3D0_IRQ,
},
.mutex = __MUTEX_INITIALIZER(device_3d0.dev.mutex),
diff --git a/drivers/gpu/msm/kgsl_pwrctrl.c b/drivers/gpu/msm/kgsl_pwrctrl.c
index 6fa7da2..15a0252 100644
--- a/drivers/gpu/msm/kgsl_pwrctrl.c
+++ b/drivers/gpu/msm/kgsl_pwrctrl.c
@@ -522,7 +522,7 @@
clk_set_rate(pwr->grp_clks[0], pwr->
pwrlevels[pwr->num_pwrlevels - 1].gpu_freq);
- pwr->gpu_reg = regulator_get(NULL, pwr->regulator_name);
+ pwr->gpu_reg = regulator_get(&pdev->dev, "vdd");
if (IS_ERR(pwr->gpu_reg))
pwr->gpu_reg = NULL;
diff --git a/drivers/gpu/msm/kgsl_pwrctrl.h b/drivers/gpu/msm/kgsl_pwrctrl.h
index a677fec..6325b66 100644
--- a/drivers/gpu/msm/kgsl_pwrctrl.h
+++ b/drivers/gpu/msm/kgsl_pwrctrl.h
@@ -54,7 +54,6 @@
uint32_t pcl;
unsigned int nap_allowed;
unsigned int idle_needed;
- const char *regulator_name;
const char *irq_name;
s64 time;
struct kgsl_busy busy;
diff --git a/drivers/gpu/msm/z180.c b/drivers/gpu/msm/z180.c
index df2ca78..240de9a 100644
--- a/drivers/gpu/msm/z180.c
+++ b/drivers/gpu/msm/z180.c
@@ -150,7 +150,6 @@
.config = Z180_MMU_CONFIG,
},
.pwrctrl = {
- .regulator_name = "fs_gfx2d0",
.irq_name = KGSL_2D0_IRQ,
},
.mutex = __MUTEX_INITIALIZER(device_2d0.dev.mutex),
@@ -181,7 +180,6 @@
.config = Z180_MMU_CONFIG,
},
.pwrctrl = {
- .regulator_name = "fs_gfx2d1",
.irq_name = KGSL_2D1_IRQ,
},
.mutex = __MUTEX_INITIALIZER(device_2d1.dev.mutex),