Message ID | 1528976621-8397-2-git-send-email-narmstrong@baylibre.com |
---|---|
State | Accepted |
Commit | 0421c9809a6f41a3aebbf2185ffb0c297cf83e22 |
Delegated to: | Tom Rini |
Headers | show |
Series | Amlogic Meson GX Updates for v2018.07 | expand |
On Thu, Jun 14, 2018 at 01:43:37PM +0200, Neil Armstrong wrote: > The SARADC driver was merged after the following commit : > commit d35812368a59 ("regmap: change regmap_init_mem() to take ofnode instead udevice") > Thus breaking build, this patch fixes the regmap_init_mem accordingly. > > Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> Applied to u-boot/master, thanks!
diff --git a/drivers/adc/meson-saradc.c b/drivers/adc/meson-saradc.c index bcab76d..f7c919d 100644 --- a/drivers/adc/meson-saradc.c +++ b/drivers/adc/meson-saradc.c @@ -654,7 +654,7 @@ static int meson_saradc_probe(struct udevice *dev) struct meson_saradc_priv *priv = dev_get_priv(dev); int ret; - ret = regmap_init_mem(dev, &priv->regmap); + ret = regmap_init_mem(dev_ofnode(dev), &priv->regmap); if (ret) return ret;
The SARADC driver was merged after the following commit : commit d35812368a59 ("regmap: change regmap_init_mem() to take ofnode instead udevice") Thus breaking build, this patch fixes the regmap_init_mem accordingly. Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> --- drivers/adc/meson-saradc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)