Merge tag 'drivers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / arch / arm / mach-exynos / mach-universal_c210.c

diff --git a/arch/arm/mach-exynos/mach-universal_c210.c b/arch/arm/mach-exynos/mach-universal_c210.c
index 72f08fd7cfa94f657b020c246036eaa6b4b722d5..327d50d4681d7e97dc7efa720ce39bccc11ead7d 100644 (file)
--- a/arch/arm/mach-exynos/mach-universal_c210.c
+++ b/arch/arm/mach-exynos/mach-universal_c210.c
@@ -97,6 +97,19 @@ static struct s3c2410_uartcfg universal_uartcfgs[] __initdata = {
 static struct regulator_consumer_supply max8952_consumer =
        REGULATOR_SUPPLY("vdd_arm", NULL);
 
+static struct regulator_init_data universal_max8952_reg_data = {
+       .constraints    = {
+               .name           = "VARM_1.2V",
+               .min_uV         = 770000,
+               .max_uV         = 1400000,
+               .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE,
+               .always_on      = 1,
+               .boot_on        = 1,
+       },
+       .num_consumer_supplies  = 1,
+       .consumer_supplies      = &max8952_consumer,
+};
+
 static struct max8952_platform_data universal_max8952_pdata __initdata = {
        .gpio_vid0      = EXYNOS4_GPX0(3),
        .gpio_vid1      = EXYNOS4_GPX0(4),
@@ -105,19 +118,7 @@ static struct max8952_platform_data universal_max8952_pdata __initdata = {
        .dvs_mode       = { 48, 32, 28, 18 }, /* 1.25, 1.20, 1.05, 0.95V */
        .sync_freq      = 0, /* default: fastest */
        .ramp_speed     = 0, /* default: fastest */
-
-       .reg_data       = {
-               .constraints    = {
-                       .name           = "VARM_1.2V",
-                       .min_uV         = 770000,
-                       .max_uV         = 1400000,
-                       .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE,
-                       .always_on      = 1,
-                       .boot_on        = 1,
-               },
-               .num_consumer_supplies  = 1,
-               .consumer_supplies      = &max8952_consumer,
-       },
+       .reg_data       = &universal_max8952_reg_data,
 };
 
 static struct regulator_consumer_supply lp3974_buck1_consumer =