Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

regulator: wm8994: Use GPIO parsed from DT when registering regulators

Ensure the regulators are registered with a GPIO parsed from the device
tree when available.

Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

authored by

Sylwester Nawrocki and committed by
Mark Brown
3ea93896 e3d27775

+3 -1
+3 -1
drivers/regulator/wm8994-regulator.c
··· 149 149 config.init_data = &ldo->init_data; 150 150 if (pdata) 151 151 config.ena_gpio = pdata->ldo[id].enable; 152 + else if (wm8994->dev->of_node) 153 + config.ena_gpio = wm8994->pdata.ldo[id].enable; 152 154 153 155 /* Use default constraints if none set up */ 154 - if (!pdata || !pdata->ldo[id].init_data) { 156 + if (!pdata || !pdata->ldo[id].init_data || wm8994->dev->of_node) { 155 157 dev_dbg(wm8994->dev, "Using default init data, supply %s %s\n", 156 158 ldo->supply.dev_name, ldo->supply.supply); 157 159