On Sun, 23 Feb 2020, Andreas Kemnade wrote: > This adds a subdevice for the ADC in the RC5T619 > > Signed-off-by: Andreas Kemnade <andreas@xxxxxxxxxxxx> > --- > depends on: > https://lore.kernel.org/lkml/20191220122416.31881-1-andreas@xxxxxxxxxxxx/ > > Changes in v3: > re-added it to the series because of > "Oh, it looks like there was a conflict. Could you collect any Acks > (including mine) rebase and resend please?" Looks like there is still a conflict. Sure, it's not a complicated fix, but that's beside the point. What tree is this set based on? > drivers/mfd/rn5t618.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/drivers/mfd/rn5t618.c b/drivers/mfd/rn5t618.c > index 073de8e0e78b..321836f78120 100644 > --- a/drivers/mfd/rn5t618.c > +++ b/drivers/mfd/rn5t618.c > @@ -24,6 +24,7 @@ static const struct mfd_cell rn5t618_cells[] = { > }; > > static const struct mfd_cell rc5t619_cells[] = { > + { .name = "rn5t618-adc" }, > { .name = "rn5t618-regulator" }, > { .name = "rc5t619-rtc" }, In what upstream tree is this line present? > { .name = "rn5t618-wdt" }, -- Lee Jones [李琼斯] Linaro Services Technical Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog
