| Message ID | 1403120530-27395-1-git-send-email-graham.williams@linaro.org |
|---|---|
| State | Accepted |
| Commit | 636f4a31e3bb5ff8907d02a8862ee02f8a068084 |
| Headers | show |
On Wed, Jun 18, 2014 at 12:42:10PM -0700, Graham Williams wrote: > The vbus regulator was not getting its name set. This results > in the sysfs entry being empty. The lack of a bcm590xx_regs[] > table entry also upsets Coverity runs. Add the table entry > so the name gets set properly. > > Signed-off-by: Graham Williams <graham.williams@linaro.org> > --- > drivers/regulator/bcm590xx-regulator.c | 5 +++++ > 1 file changed, 5 insertions(+) > > diff --git a/drivers/regulator/bcm590xx-regulator.c b/drivers/regulator/bcm590xx-regulator.c > index 57544e2..58ece59 100644 > --- a/drivers/regulator/bcm590xx-regulator.c > +++ b/drivers/regulator/bcm590xx-regulator.c > @@ -119,6 +119,10 @@ static const unsigned int ldo_c_table[] = { > 2900000, 3000000, 3300000, > }; > > +static const unsigned int ldo_vbus[] = { > + 5000000, > +}; > + > /* DCDC group CSR: supported voltages in microvolts */ > static const struct regulator_linear_range dcdc_csr_ranges[] = { > REGULATOR_LINEAR_RANGE(860000, 2, 50, 10000), > @@ -192,6 +196,7 @@ static struct bcm590xx_info bcm590xx_regs[] = { > BCM590XX_REG_TABLE(gpldo4, ldo_a_table), > BCM590XX_REG_TABLE(gpldo5, ldo_a_table), > BCM590XX_REG_TABLE(gpldo6, ldo_a_table), > + BCM590XX_REG_TABLE(vbus, ldo_vbus), > }; Also fixes the functional problem for me on the Capri board, thanks. Coverity should also be much happier now. Acked-by: Matt Porter <mporter@linaro.org> Mark: can you pick this up for 3.16 fixes? -Matt -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
On Wed, Jun 18, 2014 at 12:42:10PM -0700, Graham Williams wrote: > The vbus regulator was not getting its name set. This results > in the sysfs entry being empty. The lack of a bcm590xx_regs[] > table entry also upsets Coverity runs. Add the table entry > so the name gets set properly. Applied, thanks.
diff --git a/drivers/regulator/bcm590xx-regulator.c b/drivers/regulator/bcm590xx-regulator.c index 57544e2..58ece59 100644 --- a/drivers/regulator/bcm590xx-regulator.c +++ b/drivers/regulator/bcm590xx-regulator.c @@ -119,6 +119,10 @@ static const unsigned int ldo_c_table[] = { 2900000, 3000000, 3300000, }; +static const unsigned int ldo_vbus[] = { + 5000000, +}; + /* DCDC group CSR: supported voltages in microvolts */ static const struct regulator_linear_range dcdc_csr_ranges[] = { REGULATOR_LINEAR_RANGE(860000, 2, 50, 10000), @@ -192,6 +196,7 @@ static struct bcm590xx_info bcm590xx_regs[] = { BCM590XX_REG_TABLE(gpldo4, ldo_a_table), BCM590XX_REG_TABLE(gpldo5, ldo_a_table), BCM590XX_REG_TABLE(gpldo6, ldo_a_table), + BCM590XX_REG_TABLE(vbus, ldo_vbus), }; struct bcm590xx_reg {
The vbus regulator was not getting its name set. This results in the sysfs entry being empty. The lack of a bcm590xx_regs[] table entry also upsets Coverity runs. Add the table entry so the name gets set properly. Signed-off-by: Graham Williams <graham.williams@linaro.org> --- drivers/regulator/bcm590xx-regulator.c | 5 +++++ 1 file changed, 5 insertions(+)