| Message ID | af33f66a602462f14431e99433324b8523f74f78.1552879519.git.baolin.wang@linaro.org |
|---|---|
| State | Accepted |
| Commit | 1d71670e5e09680202c975c2332bcd2b64e8091f |
| Headers | show |
| Series | [RESEND] mfd: sc27xx: Use SoC compatible string for PMIC devices | expand |
On Mon, 18 Mar 2019, Baolin Wang wrote: > We should use SoC compatible string in stead of wildcard string for > PMIC child devices. > > Signed-off-by: Baolin Wang <baolin.wang@linaro.org> > --- > Hi Lee, > > Could you merge this patch into v5.1-rc if no objection from you? > Since our DTS patches had been merged into v5.1, our PMIC can not > work without this patch. Thanks. Oh dear, what a pickle. Really you should have pushed these change though one tree, in either a single patch or at the very least a single patch-set. I will see what I can do, so that this doesn't break for an entire kernel version (but I make no promises). > --- > drivers/mfd/sprd-sc27xx-spi.c | 42 ++++++++++++++++++++--------------------- > 1 file changed, 21 insertions(+), 21 deletions(-) > > diff --git a/drivers/mfd/sprd-sc27xx-spi.c b/drivers/mfd/sprd-sc27xx-spi.c > index 69df277..43ac716 100644 > --- a/drivers/mfd/sprd-sc27xx-spi.c > +++ b/drivers/mfd/sprd-sc27xx-spi.c > @@ -53,67 +53,67 @@ struct sprd_pmic_data { > static const struct mfd_cell sprd_pmic_devs[] = { > { > .name = "sc27xx-wdt", > - .of_compatible = "sprd,sc27xx-wdt", > + .of_compatible = "sprd,sc2731-wdt", > }, { > .name = "sc27xx-rtc", > - .of_compatible = "sprd,sc27xx-rtc", > + .of_compatible = "sprd,sc2731-rtc", > }, { > .name = "sc27xx-charger", > - .of_compatible = "sprd,sc27xx-charger", > + .of_compatible = "sprd,sc2731-charger", > }, { > .name = "sc27xx-chg-timer", > - .of_compatible = "sprd,sc27xx-chg-timer", > + .of_compatible = "sprd,sc2731-chg-timer", > }, { > .name = "sc27xx-fast-chg", > - .of_compatible = "sprd,sc27xx-fast-chg", > + .of_compatible = "sprd,sc2731-fast-chg", > }, { > .name = "sc27xx-chg-wdt", > - .of_compatible = "sprd,sc27xx-chg-wdt", > + .of_compatible = "sprd,sc2731-chg-wdt", > }, { > .name = "sc27xx-typec", > - .of_compatible = "sprd,sc27xx-typec", > + .of_compatible = "sprd,sc2731-typec", > }, { > .name = "sc27xx-flash", > - .of_compatible = "sprd,sc27xx-flash", > + .of_compatible = "sprd,sc2731-flash", > }, { > .name = "sc27xx-eic", > - .of_compatible = "sprd,sc27xx-eic", > + .of_compatible = "sprd,sc2731-eic", > }, { > .name = "sc27xx-efuse", > - .of_compatible = "sprd,sc27xx-efuse", > + .of_compatible = "sprd,sc2731-efuse", > }, { > .name = "sc27xx-thermal", > - .of_compatible = "sprd,sc27xx-thermal", > + .of_compatible = "sprd,sc2731-thermal", > }, { > .name = "sc27xx-adc", > - .of_compatible = "sprd,sc27xx-adc", > + .of_compatible = "sprd,sc2731-adc", > }, { > .name = "sc27xx-audio-codec", > - .of_compatible = "sprd,sc27xx-audio-codec", > + .of_compatible = "sprd,sc2731-audio-codec", > }, { > .name = "sc27xx-regulator", > - .of_compatible = "sprd,sc27xx-regulator", > + .of_compatible = "sprd,sc2731-regulator", > }, { > .name = "sc27xx-vibrator", > - .of_compatible = "sprd,sc27xx-vibrator", > + .of_compatible = "sprd,sc2731-vibrator", > }, { > .name = "sc27xx-keypad-led", > - .of_compatible = "sprd,sc27xx-keypad-led", > + .of_compatible = "sprd,sc2731-keypad-led", > }, { > .name = "sc27xx-bltc", > - .of_compatible = "sprd,sc27xx-bltc", > + .of_compatible = "sprd,sc2731-bltc", > }, { > .name = "sc27xx-fgu", > - .of_compatible = "sprd,sc27xx-fgu", > + .of_compatible = "sprd,sc2731-fgu", > }, { > .name = "sc27xx-7sreset", > - .of_compatible = "sprd,sc27xx-7sreset", > + .of_compatible = "sprd,sc2731-7sreset", > }, { > .name = "sc27xx-poweroff", > - .of_compatible = "sprd,sc27xx-poweroff", > + .of_compatible = "sprd,sc2731-poweroff", > }, { > .name = "sc27xx-syscon", > - .of_compatible = "sprd,sc27xx-syscon", > + .of_compatible = "sprd,sc2731-syscon", > }, > }; > -- Lee Jones [李琼斯] Linaro Services Technical Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog
On Tue, 2 Apr 2019 at 12:58, Lee Jones <lee.jones@linaro.org> wrote: > > On Mon, 18 Mar 2019, Baolin Wang wrote: > > > We should use SoC compatible string in stead of wildcard string for > > PMIC child devices. > > > > Signed-off-by: Baolin Wang <baolin.wang@linaro.org> > > --- > > Hi Lee, > > > > Could you merge this patch into v5.1-rc if no objection from you? > > Since our DTS patches had been merged into v5.1, our PMIC can not > > work without this patch. Thanks. > > Oh dear, what a pickle. Really you should have pushed these change > though one tree, in either a single patch or at the very least a > single patch-set. I will see what I can do, so that this doesn't > break for an entire kernel version (but I make no promises). Sorry for troubles. Thanks. -- Baolin Wang Best Regards
diff --git a/drivers/mfd/sprd-sc27xx-spi.c b/drivers/mfd/sprd-sc27xx-spi.c index 69df277..43ac716 100644 --- a/drivers/mfd/sprd-sc27xx-spi.c +++ b/drivers/mfd/sprd-sc27xx-spi.c @@ -53,67 +53,67 @@ struct sprd_pmic_data { static const struct mfd_cell sprd_pmic_devs[] = { { .name = "sc27xx-wdt", - .of_compatible = "sprd,sc27xx-wdt", + .of_compatible = "sprd,sc2731-wdt", }, { .name = "sc27xx-rtc", - .of_compatible = "sprd,sc27xx-rtc", + .of_compatible = "sprd,sc2731-rtc", }, { .name = "sc27xx-charger", - .of_compatible = "sprd,sc27xx-charger", + .of_compatible = "sprd,sc2731-charger", }, { .name = "sc27xx-chg-timer", - .of_compatible = "sprd,sc27xx-chg-timer", + .of_compatible = "sprd,sc2731-chg-timer", }, { .name = "sc27xx-fast-chg", - .of_compatible = "sprd,sc27xx-fast-chg", + .of_compatible = "sprd,sc2731-fast-chg", }, { .name = "sc27xx-chg-wdt", - .of_compatible = "sprd,sc27xx-chg-wdt", + .of_compatible = "sprd,sc2731-chg-wdt", }, { .name = "sc27xx-typec", - .of_compatible = "sprd,sc27xx-typec", + .of_compatible = "sprd,sc2731-typec", }, { .name = "sc27xx-flash", - .of_compatible = "sprd,sc27xx-flash", + .of_compatible = "sprd,sc2731-flash", }, { .name = "sc27xx-eic", - .of_compatible = "sprd,sc27xx-eic", + .of_compatible = "sprd,sc2731-eic", }, { .name = "sc27xx-efuse", - .of_compatible = "sprd,sc27xx-efuse", + .of_compatible = "sprd,sc2731-efuse", }, { .name = "sc27xx-thermal", - .of_compatible = "sprd,sc27xx-thermal", + .of_compatible = "sprd,sc2731-thermal", }, { .name = "sc27xx-adc", - .of_compatible = "sprd,sc27xx-adc", + .of_compatible = "sprd,sc2731-adc", }, { .name = "sc27xx-audio-codec", - .of_compatible = "sprd,sc27xx-audio-codec", + .of_compatible = "sprd,sc2731-audio-codec", }, { .name = "sc27xx-regulator", - .of_compatible = "sprd,sc27xx-regulator", + .of_compatible = "sprd,sc2731-regulator", }, { .name = "sc27xx-vibrator", - .of_compatible = "sprd,sc27xx-vibrator", + .of_compatible = "sprd,sc2731-vibrator", }, { .name = "sc27xx-keypad-led", - .of_compatible = "sprd,sc27xx-keypad-led", + .of_compatible = "sprd,sc2731-keypad-led", }, { .name = "sc27xx-bltc", - .of_compatible = "sprd,sc27xx-bltc", + .of_compatible = "sprd,sc2731-bltc", }, { .name = "sc27xx-fgu", - .of_compatible = "sprd,sc27xx-fgu", + .of_compatible = "sprd,sc2731-fgu", }, { .name = "sc27xx-7sreset", - .of_compatible = "sprd,sc27xx-7sreset", + .of_compatible = "sprd,sc2731-7sreset", }, { .name = "sc27xx-poweroff", - .of_compatible = "sprd,sc27xx-poweroff", + .of_compatible = "sprd,sc2731-poweroff", }, { .name = "sc27xx-syscon", - .of_compatible = "sprd,sc27xx-syscon", + .of_compatible = "sprd,sc2731-syscon", }, };
We should use SoC compatible string in stead of wildcard string for PMIC child devices. Signed-off-by: Baolin Wang <baolin.wang@linaro.org> --- Hi Lee, Could you merge this patch into v5.1-rc if no objection from you? Since our DTS patches had been merged into v5.1, our PMIC can not work without this patch. Thanks. --- drivers/mfd/sprd-sc27xx-spi.c | 42 ++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) -- 1.7.9.5