Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c421a1e4 authored by Sylwester Nawrocki's avatar Sylwester Nawrocki Committed by Mauro Carvalho Chehab
Browse files

[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: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
Acked-by: default avatarKukjin Kim <kgene.kim@samsung.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 29de2337

arch/arm/mach-exynos/mach-nuri.c

+2 −2
Original line number Diff line number Diff line
@@ -378,10 +378,10 @@ static struct regulator_consumer_supply __initdata max8997_ldo1_[] = { 
};

static struct regulator_consumer_supply __initdata max8997_ldo3_[] = {

	REGULATOR_SUPPLY("vusb_d", "s3c-hsotg"), /* USB */

	REGULATOR_SUPPLY("vdd11", "s5p-mipi-csis.0"), /* MIPI */

	REGULATOR_SUPPLY("vddcore", "s5p-mipi-csis.0"), /* MIPI */

};

static struct regulator_consumer_supply __initdata max8997_ldo4_[] = {

	REGULATOR_SUPPLY("vdd18", "s5p-mipi-csis.0"), /* MIPI */

	REGULATOR_SUPPLY("vddio", "s5p-mipi-csis.0"), /* MIPI */

};

static struct regulator_consumer_supply __initdata max8997_ldo5_[] = {

	REGULATOR_SUPPLY("vhsic", "modemctl"), /* MODEM */

arch/arm/mach-exynos/mach-origen.c

+2 −2
Original line number Diff line number Diff line
@@ -96,12 +96,12 @@ static struct s3c2410_uartcfg origen_uartcfgs[] __initdata = { 
};



static struct regulator_consumer_supply __initdata ldo3_consumer[] = {

	REGULATOR_SUPPLY("vdd11", "s5p-mipi-csis.0"), /* MIPI */

	REGULATOR_SUPPLY("vddcore", "s5p-mipi-csis.0"), /* MIPI */

	REGULATOR_SUPPLY("vdd", "exynos4-hdmi"), /* HDMI */

	REGULATOR_SUPPLY("vdd_pll", "exynos4-hdmi"), /* HDMI */

};

static struct regulator_consumer_supply __initdata ldo6_consumer[] = {

	REGULATOR_SUPPLY("vdd18", "s5p-mipi-csis.0"), /* MIPI */

	REGULATOR_SUPPLY("vddio", "s5p-mipi-csis.0"), /* MIPI */

};

static struct regulator_consumer_supply __initdata ldo7_consumer[] = {

	REGULATOR_SUPPLY("avdd", "alc5625"), /* Realtek ALC5625 */

arch/arm/mach-exynos/mach-universal_c210.c

+2 −2
Original line number Diff line number Diff line
@@ -209,7 +209,7 @@ static struct regulator_consumer_supply lp3974_ldo3_consumer[] = { 
	REGULATOR_SUPPLY("vusb_a", "s3c-hsotg"),

	REGULATOR_SUPPLY("vdd", "exynos4-hdmi"),

	REGULATOR_SUPPLY("vdd_pll", "exynos4-hdmi"),

	REGULATOR_SUPPLY("vdd11", "s5p-mipi-csis.0"),

	REGULATOR_SUPPLY("vddcore", "s5p-mipi-csis.0"),

};



static struct regulator_init_data lp3974_ldo3_data = {
@@ -273,7 +273,7 @@ static struct regulator_init_data lp3974_ldo6_data = { 
};



static struct regulator_consumer_supply lp3974_ldo7_consumer[] = {

	REGULATOR_SUPPLY("vdd18", "s5p-mipi-csis.0"),

	REGULATOR_SUPPLY("vddio", "s5p-mipi-csis.0"),

};



static struct regulator_init_data lp3974_ldo7_data = {