Merge remote-tracking branch 'regmap/topic/drivers' into regmap-next

Resolved simple add/add conflicts:
	drivers/base/regmap/internal.h
	drivers/base/regmap/regmap.c

1 files changed, 4 insertions, 2 deletions

diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c
index d3ffc18774a..8c49fef1ce7 100644
--- a/drivers/gpu/drm/radeon/radeon_display.c
+++ b/drivers/gpu/drm/radeon/radeon_display.c
@@ -1305,9 +1305,11 @@ int radeon_modeset_init(struct radeon_device *rdev)
                 return ret;
         }
 
-        /* init dig PHYs */
-        if (rdev->is_atom_bios)
+        /* init dig PHYs, disp eng pll */
+        if (rdev->is_atom_bios) {
                 radeon_atom_encoder_init(rdev);
+                radeon_atom_dcpll_init(rdev);
+        }
 
         /* initialize hpd */
         radeon_hpd_init(rdev);