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

Commit a102962f authored by Mark Brown's avatar Mark Brown Committed by Linus Walleij
Browse files

ARM: ux300: Fix unimplementable regulation constraints 



It doesn't make sense to grant permission to change the status of a
regulator that is also set as always on and similarly it doesn't make
sense to allow a driver to change the voltage of a regulator which can
only be set to a single voltage.

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent e816b57a

arch/arm/mach-u300/i2c.c

+1 −8
Original line number Original line Diff line number Diff line
@@ -146,9 +146,6 @@ static struct ab3100_platform_data ab3100_plf_data = { 
				.min_uV = 1800000,

				.min_uV = 1800000,

				.max_uV = 1800000,

				.max_uV = 1800000,

				.valid_modes_mask = REGULATOR_MODE_NORMAL,

				.valid_modes_mask = REGULATOR_MODE_NORMAL,

				.valid_ops_mask =

				REGULATOR_CHANGE_VOLTAGE |

				REGULATOR_CHANGE_STATUS,

				.always_on = 1,

				.always_on = 1,

				.boot_on = 1,

				.boot_on = 1,

			},

			},
@@ -160,9 +157,6 @@ static struct ab3100_platform_data ab3100_plf_data = { 
				.min_uV = 2500000,

				.min_uV = 2500000,

				.max_uV = 2500000,

				.max_uV = 2500000,

				.valid_modes_mask = REGULATOR_MODE_NORMAL,

				.valid_modes_mask = REGULATOR_MODE_NORMAL,

				.valid_ops_mask =

				REGULATOR_CHANGE_VOLTAGE |

				REGULATOR_CHANGE_STATUS,

				.always_on = 1,

				.always_on = 1,

				.boot_on = 1,

				.boot_on = 1,

			},

			},
@@ -230,8 +224,7 @@ static struct ab3100_platform_data ab3100_plf_data = { 
				.max_uV = 1800000,

				.max_uV = 1800000,

				.valid_modes_mask = REGULATOR_MODE_NORMAL,

				.valid_modes_mask = REGULATOR_MODE_NORMAL,

				.valid_ops_mask =

				.valid_ops_mask =

				REGULATOR_CHANGE_VOLTAGE |

				REGULATOR_CHANGE_VOLTAGE,

				REGULATOR_CHANGE_STATUS,

				.always_on = 1,

				.always_on = 1,

				.boot_on = 1,

				.boot_on = 1,

			},

			},