diff options
author | Sylwester Nawrocki <s.nawrocki@samsung.com> | 2012-09-17 05:04:12 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-10-05 21:29:28 -0400 |
commit | c421a1e418b191c8fb632dc5261b61acec6541ca (patch) | |
tree | e3ee5b3485a4fae1e516cd4aa5b1cc6bc0990e22 /arch/arm | |
parent | 29de2337f9816865c8ac1894fdb16aacefe6c9ed (diff) |
[media] ARM: EXYNOS: Change MIPI-CSIS device regulator supply names
Rename MIPI-CSIS regulator supply names to match definitions in
the driver after commit "s5p-csis: Change regulator supply names".
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Acked-by: Kukjin Kim <kgene.kim@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-exynos/mach-nuri.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-exynos/mach-origen.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-exynos/mach-universal_c210.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/mach-exynos/mach-nuri.c b/arch/arm/mach-exynos/mach-nuri.c index 12ff01d8bd46..16109b5220dd 100644 --- a/arch/arm/mach-exynos/mach-nuri.c +++ b/arch/arm/mach-exynos/mach-nuri.c | |||
@@ -378,10 +378,10 @@ static struct regulator_consumer_supply __initdata max8997_ldo1_[] = { | |||
378 | }; | 378 | }; |
379 | static struct regulator_consumer_supply __initdata max8997_ldo3_[] = { | 379 | static struct regulator_consumer_supply __initdata max8997_ldo3_[] = { |
380 | REGULATOR_SUPPLY("vusb_d", "s3c-hsotg"), /* USB */ | 380 | REGULATOR_SUPPLY("vusb_d", "s3c-hsotg"), /* USB */ |
381 | REGULATOR_SUPPLY("vdd11", "s5p-mipi-csis.0"), /* MIPI */ | 381 | REGULATOR_SUPPLY("vddcore", "s5p-mipi-csis.0"), /* MIPI */ |
382 | }; | 382 | }; |
383 | static struct regulator_consumer_supply __initdata max8997_ldo4_[] = { | 383 | static struct regulator_consumer_supply __initdata max8997_ldo4_[] = { |
384 | REGULATOR_SUPPLY("vdd18", "s5p-mipi-csis.0"), /* MIPI */ | 384 | REGULATOR_SUPPLY("vddio", "s5p-mipi-csis.0"), /* MIPI */ |
385 | }; | 385 | }; |
386 | static struct regulator_consumer_supply __initdata max8997_ldo5_[] = { | 386 | static struct regulator_consumer_supply __initdata max8997_ldo5_[] = { |
387 | REGULATOR_SUPPLY("vhsic", "modemctl"), /* MODEM */ | 387 | REGULATOR_SUPPLY("vhsic", "modemctl"), /* MODEM */ |
diff --git a/arch/arm/mach-exynos/mach-origen.c b/arch/arm/mach-exynos/mach-origen.c index 4e574c24581c..a54ce4ef7057 100644 --- a/arch/arm/mach-exynos/mach-origen.c +++ b/arch/arm/mach-exynos/mach-origen.c | |||
@@ -96,12 +96,12 @@ static struct s3c2410_uartcfg origen_uartcfgs[] __initdata = { | |||
96 | }; | 96 | }; |
97 | 97 | ||
98 | static struct regulator_consumer_supply __initdata ldo3_consumer[] = { | 98 | static struct regulator_consumer_supply __initdata ldo3_consumer[] = { |
99 | REGULATOR_SUPPLY("vdd11", "s5p-mipi-csis.0"), /* MIPI */ | 99 | REGULATOR_SUPPLY("vddcore", "s5p-mipi-csis.0"), /* MIPI */ |
100 | REGULATOR_SUPPLY("vdd", "exynos4-hdmi"), /* HDMI */ | 100 | REGULATOR_SUPPLY("vdd", "exynos4-hdmi"), /* HDMI */ |
101 | REGULATOR_SUPPLY("vdd_pll", "exynos4-hdmi"), /* HDMI */ | 101 | REGULATOR_SUPPLY("vdd_pll", "exynos4-hdmi"), /* HDMI */ |
102 | }; | 102 | }; |
103 | static struct regulator_consumer_supply __initdata ldo6_consumer[] = { | 103 | static struct regulator_consumer_supply __initdata ldo6_consumer[] = { |
104 | REGULATOR_SUPPLY("vdd18", "s5p-mipi-csis.0"), /* MIPI */ | 104 | REGULATOR_SUPPLY("vddio", "s5p-mipi-csis.0"), /* MIPI */ |
105 | }; | 105 | }; |
106 | static struct regulator_consumer_supply __initdata ldo7_consumer[] = { | 106 | static struct regulator_consumer_supply __initdata ldo7_consumer[] = { |
107 | REGULATOR_SUPPLY("avdd", "alc5625"), /* Realtek ALC5625 */ | 107 | REGULATOR_SUPPLY("avdd", "alc5625"), /* Realtek ALC5625 */ |
diff --git a/arch/arm/mach-exynos/mach-universal_c210.c b/arch/arm/mach-exynos/mach-universal_c210.c index acd2e9db329f..1cb7c11d680a 100644 --- a/arch/arm/mach-exynos/mach-universal_c210.c +++ b/arch/arm/mach-exynos/mach-universal_c210.c | |||
@@ -209,7 +209,7 @@ static struct regulator_consumer_supply lp3974_ldo3_consumer[] = { | |||
209 | REGULATOR_SUPPLY("vusb_a", "s3c-hsotg"), | 209 | REGULATOR_SUPPLY("vusb_a", "s3c-hsotg"), |
210 | REGULATOR_SUPPLY("vdd", "exynos4-hdmi"), | 210 | REGULATOR_SUPPLY("vdd", "exynos4-hdmi"), |
211 | REGULATOR_SUPPLY("vdd_pll", "exynos4-hdmi"), | 211 | REGULATOR_SUPPLY("vdd_pll", "exynos4-hdmi"), |
212 | REGULATOR_SUPPLY("vdd11", "s5p-mipi-csis.0"), | 212 | REGULATOR_SUPPLY("vddcore", "s5p-mipi-csis.0"), |
213 | }; | 213 | }; |
214 | 214 | ||
215 | static struct regulator_init_data lp3974_ldo3_data = { | 215 | static struct regulator_init_data lp3974_ldo3_data = { |
@@ -273,7 +273,7 @@ static struct regulator_init_data lp3974_ldo6_data = { | |||
273 | }; | 273 | }; |
274 | 274 | ||
275 | static struct regulator_consumer_supply lp3974_ldo7_consumer[] = { | 275 | static struct regulator_consumer_supply lp3974_ldo7_consumer[] = { |
276 | REGULATOR_SUPPLY("vdd18", "s5p-mipi-csis.0"), | 276 | REGULATOR_SUPPLY("vddio", "s5p-mipi-csis.0"), |
277 | }; | 277 | }; |
278 | 278 | ||
279 | static struct regulator_init_data lp3974_ldo7_data = { | 279 | static struct regulator_init_data lp3974_ldo7_data = { |