diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2019-02-13 20:31:47 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-02-13 20:31:47 +0100 |
| commit | e6b18f7fa973e22f4a7829412a9ac1aabb51b286 (patch) | |
| tree | 521d2da0cd5f0cd3025ff72afa5a1e7157fea011 /drivers/regulator/bcm2835.c | |
| parent | 13e7822149d6f7653dabba6b4e4a1f122d3dae6f (diff) | |
| parent | 527422a4ad764c46bc958f91603e6b5e9860d4ba (diff) | |
| download | barebox-e6b18f7fa973e22f4a7829412a9ac1aabb51b286.tar.gz barebox-e6b18f7fa973e22f4a7829412a9ac1aabb51b286.tar.xz | |
Merge branch 'for-next/imx'
Diffstat (limited to 'drivers/regulator/bcm2835.c')
| -rw-r--r-- | drivers/regulator/bcm2835.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/regulator/bcm2835.c b/drivers/regulator/bcm2835.c index 0ada05db16..ea7cf7fe1e 100644 --- a/drivers/regulator/bcm2835.c +++ b/drivers/regulator/bcm2835.c @@ -24,6 +24,7 @@ static struct regulator_bcm2835 { struct device_d *dev; struct regulator_dev rdev; + struct regulator_desc rdesc; } regs[] = { REG_DEV(BCM2835_MBOX_POWER_DEVID_SDHCI, "bcm2835_mci0"), REG_DEV(BCM2835_MBOX_POWER_DEVID_UART0, "uart0-pl0110"), @@ -108,7 +109,7 @@ static int regulator_bcm2835_is_enabled(struct regulator_dev *rdev) return msg_pwr->get_power_state.body.resp.state; } -static struct regulator_ops bcm2835_ops = { +const static struct regulator_ops bcm2835_ops = { .enable = regulator_bcm2835_enable, .disable = regulator_bcm2835_disable, .is_enabled = regulator_bcm2835_is_enabled, @@ -122,7 +123,8 @@ static int regulator_bcm2835_probe(struct device_d *dev) for (i = 0; i < ARRAY_SIZE(regs); i++) { rb = ®s[i]; - rb->rdev.ops = &bcm2835_ops; + rb->rdesc.ops = &bcm2835_ops; + rb->rdev.desc = &rb->rdesc; rb->dev = dev; ret = dev_regulator_register(&rb->rdev, rb->devname, NULL); |