lkml.org 
[lkml]   [2020]   [Aug]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [PATCH 00/44] SPMI patches needed by Hikey 970
    Em Wed, 12 Aug 2020 10:13:51 -0700
    Joe Perches <joe@perches.com> escreveu:

    > Perhaps these trivial bits on top:

    Sounds fine for me. Feel free to send it with your SOB, adding my reviewed by:

    Reviewed-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

    > ---
    > drivers/staging/hikey9xx/hi6421-spmi-pmic.c | 5 +++--
    > drivers/staging/hikey9xx/hi6421v600-regulator.c | 6 +++---
    > drivers/staging/hikey9xx/hisi-spmi-controller.c | 21 +++++++++++++--------
    > 3 files changed, 19 insertions(+), 13 deletions(-)
    >
    > diff --git a/drivers/staging/hikey9xx/hi6421-spmi-pmic.c b/drivers/staging/hikey9xx/hi6421-spmi-pmic.c
    > index 76766e7b8bf9..9d73458ca65a 100644
    > --- a/drivers/staging/hikey9xx/hi6421-spmi-pmic.c
    > +++ b/drivers/staging/hikey9xx/hi6421-spmi-pmic.c
    > @@ -99,7 +99,7 @@ int hi6421_spmi_pmic_write(struct hi6421_spmi_pmic *pmic, int reg, u32 val)
    > EXPORT_SYMBOL(hi6421_spmi_pmic_write);
    >
    > int hi6421_spmi_pmic_rmw(struct hi6421_spmi_pmic *pmic, int reg,
    > - u32 mask, u32 bits)
    > + u32 mask, u32 bits)
    > {
    > unsigned long flags;
    > u32 data;
    > @@ -130,7 +130,8 @@ static irqreturn_t hi6421_spmi_irq_handler(int irq, void *data)
    > hi6421_spmi_pmic_write(pmic, (i + pmic->irq_addr), pending);
    >
    > /* solve powerkey order */
    > - if ((i == HISI_IRQ_KEY_NUM) && ((pending & HISI_IRQ_KEY_VALUE) == HISI_IRQ_KEY_VALUE)) {
    > + if ((i == HISI_IRQ_KEY_NUM) &&
    > + ((pending & HISI_IRQ_KEY_VALUE) == HISI_IRQ_KEY_VALUE)) {
    > generic_handle_irq(pmic->irqs[HISI_IRQ_KEY_DOWN]);
    > generic_handle_irq(pmic->irqs[HISI_IRQ_KEY_UP]);
    > pending &= (~HISI_IRQ_KEY_VALUE);
    > diff --git a/drivers/staging/hikey9xx/hi6421v600-regulator.c b/drivers/staging/hikey9xx/hi6421v600-regulator.c
    > index 29ef6bcadd84..82635ff54a74 100644
    > --- a/drivers/staging/hikey9xx/hi6421v600-regulator.c
    > +++ b/drivers/staging/hikey9xx/hi6421v600-regulator.c
    > @@ -227,7 +227,7 @@ static int hi6421_spmi_dt_parse(struct platform_device *pdev,
    >
    > ret = of_property_read_u32(np, "reg", &rdesc->enable_reg);
    > if (ret) {
    > - dev_err(dev, "missing reg property\nn");
    > + dev_err(dev, "missing reg property\n");
    > return ret;
    > }
    >
    > @@ -303,13 +303,13 @@ static int hi6421_spmi_dt_parse(struct platform_device *pdev,
    > */
    > rdesc->vsel_mask = (1 << (fls(rdesc->n_voltages) - 1)) - 1;
    >
    > - dev_dbg(dev, "voltage selector settings: reg: 0x%x, mask: 0x%x",
    > + dev_dbg(dev, "voltage selector settings: reg: 0x%x, mask: 0x%x\n",
    > rdesc->vsel_reg, rdesc->vsel_mask);
    >
    > return 0;
    > }
    >
    > -static struct regulator_ops hi6421_spmi_ldo_rops = {
    > +static const struct regulator_ops hi6421_spmi_ldo_rops = {
    > .is_enabled = hi6421_spmi_regulator_is_enabled,
    > .enable = hi6421_spmi_regulator_enable,
    > .disable = hi6421_spmi_regulator_disable,
    > diff --git a/drivers/staging/hikey9xx/hisi-spmi-controller.c b/drivers/staging/hikey9xx/hisi-spmi-controller.c
    > index 583df10cbf1a..513d962b8bce 100644
    > --- a/drivers/staging/hikey9xx/hisi-spmi-controller.c
    > +++ b/drivers/staging/hikey9xx/hisi-spmi-controller.c
    > @@ -102,7 +102,7 @@ static int spmi_controller_wait_for_done(struct device *dev,
    > return 0;
    > }
    > udelay(1);
    > - } while(timeout--);
    > + } while (timeout--);
    >
    > dev_err(dev, "%s: timeout, status 0x%x\n", __func__, status);
    > return -ETIMEDOUT;
    > @@ -121,7 +121,7 @@ static int spmi_read_cmd(struct spmi_controller *ctrl,
    >
    > if (bc > SPMI_CONTROLLER_MAX_TRANS_BYTES) {
    > dev_err(&ctrl->dev,
    > - "spmi_controller supports 1..%d bytes per trans, but:%ld requested",
    > + "spmi_controller supports 1..%d bytes per trans, but:%ld requested\n",
    > SPMI_CONTROLLER_MAX_TRANS_BYTES, bc);
    > return -EINVAL;
    > }
    > @@ -137,7 +137,7 @@ static int spmi_read_cmd(struct spmi_controller *ctrl,
    > op_code = SPMI_CMD_EXT_REG_READ_L;
    > break;
    > default:
    > - dev_err(&ctrl->dev, "invalid read cmd 0x%x", opc);
    > + dev_err(&ctrl->dev, "invalid read cmd 0x%x\n", opc);
    > return -EINVAL;
    > }
    >
    > @@ -157,7 +157,10 @@ static int spmi_read_cmd(struct spmi_controller *ctrl,
    > goto done;
    >
    > for (i = 0; bc > i * SPMI_PER_DATAREG_BYTE; i++) {
    > - data = readl(spmi_controller->base + chnl_ofst + SPMI_SLAVE_OFFSET * slave_id + SPMI_APB_SPMI_RDATA0_BASE_ADDR + i * SPMI_PER_DATAREG_BYTE);
    > + data = readl(spmi_controller->base + chnl_ofst +
    > + SPMI_SLAVE_OFFSET * slave_id +
    > + SPMI_APB_SPMI_RDATA0_BASE_ADDR +
    > + i * SPMI_PER_DATAREG_BYTE);
    > data = be32_to_cpu((__be32)data);
    > if ((bc - i * SPMI_PER_DATAREG_BYTE) >> 2) {
    > memcpy(buf, &data, sizeof(data));
    > @@ -194,7 +197,7 @@ static int spmi_write_cmd(struct spmi_controller *ctrl,
    >
    > if (bc > SPMI_CONTROLLER_MAX_TRANS_BYTES) {
    > dev_err(&ctrl->dev,
    > - "spmi_controller supports 1..%d bytes per trans, but:%ld requested",
    > + "spmi_controller supports 1..%d bytes per trans, but:%ld requested\n",
    > SPMI_CONTROLLER_MAX_TRANS_BYTES, bc);
    > return -EINVAL;
    > }
    > @@ -210,7 +213,7 @@ static int spmi_write_cmd(struct spmi_controller *ctrl,
    > op_code = SPMI_CMD_EXT_REG_WRITE_L;
    > break;
    > default:
    > - dev_err(&ctrl->dev, "invalid write cmd 0x%x", opc);
    > + dev_err(&ctrl->dev, "invalid write cmd 0x%x\n", opc);
    > return -EINVAL;
    > }
    >
    > @@ -234,8 +237,10 @@ static int spmi_write_cmd(struct spmi_controller *ctrl,
    > }
    >
    > writel((u32)cpu_to_be32(data),
    > - spmi_controller->base + chnl_ofst + SPMI_APB_SPMI_WDATA0_BASE_ADDR + SPMI_PER_DATAREG_BYTE * i);
    > - };
    > + spmi_controller->base + chnl_ofst +
    > + SPMI_APB_SPMI_WDATA0_BASE_ADDR +
    > + SPMI_PER_DATAREG_BYTE * i);
    > + }
    >
    > /* Start the transaction */
    > writel(cmd, spmi_controller->base + chnl_ofst + SPMI_APB_SPMI_CMD_BASE_ADDR);
    >
    >

    \
     
     \ /
      Last update: 2020-08-12 20:49    [W:4.063 / U:0.272 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site