diff options
author | Rob Clark <robdclark@gmail.com> | 2014-10-31 12:19:40 -0400 |
---|---|---|
committer | Rob Clark <robdclark@gmail.com> | 2014-11-16 14:22:42 -0500 |
commit | b7bbd6406ae82f4faa8a5e571866e44f4c49255d (patch) | |
tree | 843bbd719a6368149db3c8d7147df7ce24baa9f6 | |
parent | ca5a71de4852e3eeba53a326ddf260b7b2e117b1 (diff) |
drm/msm: select REGULATOR
Fixes a potential error, spotted by Felipe with randconfig:
-----
drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c: In function ‘mdp4_kms_init’:
drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c:384:2: error: implicit declaration \
of function ‘devm_regulator_get_exclusive’ [-Werror=implicit-function-declaration]
mdp4_kms->vdd = devm_regulator_get_exclusive(&pdev->dev, "vdd");
^
drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c:384:16: error: assignment makes \
pointer from integer without a cast [-Werror]
mdp4_kms->vdd = devm_regulator_get_exclusive(&pdev->dev, "vdd");
^
-----
Also add a brief comment explaining the use of _get_exclusive()
Reported-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Rob Clark <robdclark@gmail.com>
-rw-r--r-- | drivers/gpu/drm/msm/Kconfig | 1 | ||||
-rw-r--r-- | drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/drivers/gpu/drm/msm/Kconfig b/drivers/gpu/drm/msm/Kconfig index 9d907c526c94..5b2a1ff95d3d 100644 --- a/drivers/gpu/drm/msm/Kconfig +++ b/drivers/gpu/drm/msm/Kconfig | |||
@@ -3,6 +3,7 @@ config DRM_MSM | |||
3 | tristate "MSM DRM" | 3 | tristate "MSM DRM" |
4 | depends on DRM | 4 | depends on DRM |
5 | depends on ARCH_QCOM || (ARM && COMPILE_TEST) | 5 | depends on ARCH_QCOM || (ARM && COMPILE_TEST) |
6 | select REGULATOR | ||
6 | select DRM_KMS_HELPER | 7 | select DRM_KMS_HELPER |
7 | select DRM_PANEL | 8 | select DRM_PANEL |
8 | select SHMEM | 9 | select SHMEM |
diff --git a/drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c b/drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c index 79d804e61cc4..ac204720429e 100644 --- a/drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c +++ b/drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c | |||
@@ -381,6 +381,10 @@ struct msm_kms *mdp4_kms_init(struct drm_device *dev) | |||
381 | if (IS_ERR(mdp4_kms->dsi_pll_vddio)) | 381 | if (IS_ERR(mdp4_kms->dsi_pll_vddio)) |
382 | mdp4_kms->dsi_pll_vddio = NULL; | 382 | mdp4_kms->dsi_pll_vddio = NULL; |
383 | 383 | ||
384 | /* NOTE: driver for this regulator still missing upstream.. use | ||
385 | * _get_exclusive() and ignore the error if it does not exist | ||
386 | * (and hope that the bootloader left it on for us) | ||
387 | */ | ||
384 | mdp4_kms->vdd = devm_regulator_get_exclusive(&pdev->dev, "vdd"); | 388 | mdp4_kms->vdd = devm_regulator_get_exclusive(&pdev->dev, "vdd"); |
385 | if (IS_ERR(mdp4_kms->vdd)) | 389 | if (IS_ERR(mdp4_kms->vdd)) |
386 | mdp4_kms->vdd = NULL; | 390 | mdp4_kms->vdd = NULL; |