Message ID | 1565235473-28461-3-git-send-email-rayagonda.kokatanur@broadcom.com |
---|---|
State | Accepted |
Headers | show |
Series | Remove smbus quick cmd and update adapter name | expand |
On 8/7/19 8:37 PM, Rayagonda Kokatanur wrote: > From: Lori Hikichi <lori.hikichi@broadcom.com> > > Add the full name of the devicetree node to the adapter name. > Without this change, all adapters have the same name making it difficult > to distinguish between multiple instances. > The most obvious way to see this is to use the utility i2c_detect. > e.g. "i2c-detect -l" > > Before > i2c-1 i2c Broadcom iProc I2C adapter I2C adapter > i2c-0 i2c Broadcom iProc I2C adapter I2C adapter > > After > i2c-1 i2c Broadcom iProc (i2c@e0000) I2C adapter > i2c-0 i2c Broadcom iProc (i2c@b0000) I2C adapter > > Now it is easy to figure out which adapter maps to a which DT node. > > Signed-off-by: Lori Hikichi <lori.hikichi@broadcom.com> > Signed-off-by: Rayagonda Kokatanur <rayagonda.kokatanur@broadcom.com> > --- > drivers/i2c/busses/i2c-bcm-iproc.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/i2c/busses/i2c-bcm-iproc.c b/drivers/i2c/busses/i2c-bcm-iproc.c > index 19ef2b0..183b220 100644 > --- a/drivers/i2c/busses/i2c-bcm-iproc.c > +++ b/drivers/i2c/busses/i2c-bcm-iproc.c > @@ -922,7 +922,9 @@ static int bcm_iproc_i2c_probe(struct platform_device *pdev) > > adap = &iproc_i2c->adapter; > i2c_set_adapdata(adap, iproc_i2c); > - strlcpy(adap->name, "Broadcom iProc I2C adapter", sizeof(adap->name)); > + snprintf(adap->name, sizeof(adap->name), > + "Broadcom iProc (%s)", > + of_node_full_name(iproc_i2c->device->of_node)); > adap->algo = &bcm_iproc_algo; > adap->quirks = &bcm_iproc_i2c_quirks; > adap->dev.parent = &pdev->dev; > Looks good, thanks! Reviewed-by: Ray Jui <ray.jui@broadcom.com>
On Thu, Aug 08, 2019 at 09:07:53AM +0530, Rayagonda Kokatanur wrote: > From: Lori Hikichi <lori.hikichi@broadcom.com> > > Add the full name of the devicetree node to the adapter name. > Without this change, all adapters have the same name making it difficult > to distinguish between multiple instances. > The most obvious way to see this is to use the utility i2c_detect. > e.g. "i2c-detect -l" > > Before > i2c-1 i2c Broadcom iProc I2C adapter I2C adapter > i2c-0 i2c Broadcom iProc I2C adapter I2C adapter > > After > i2c-1 i2c Broadcom iProc (i2c@e0000) I2C adapter > i2c-0 i2c Broadcom iProc (i2c@b0000) I2C adapter > > Now it is easy to figure out which adapter maps to a which DT node. > > Signed-off-by: Lori Hikichi <lori.hikichi@broadcom.com> > Signed-off-by: Rayagonda Kokatanur <rayagonda.kokatanur@broadcom.com> Applied to for-next, thanks!
diff --git a/drivers/i2c/busses/i2c-bcm-iproc.c b/drivers/i2c/busses/i2c-bcm-iproc.c index 19ef2b0..183b220 100644 --- a/drivers/i2c/busses/i2c-bcm-iproc.c +++ b/drivers/i2c/busses/i2c-bcm-iproc.c @@ -922,7 +922,9 @@ static int bcm_iproc_i2c_probe(struct platform_device *pdev) adap = &iproc_i2c->adapter; i2c_set_adapdata(adap, iproc_i2c); - strlcpy(adap->name, "Broadcom iProc I2C adapter", sizeof(adap->name)); + snprintf(adap->name, sizeof(adap->name), + "Broadcom iProc (%s)", + of_node_full_name(iproc_i2c->device->of_node)); adap->algo = &bcm_iproc_algo; adap->quirks = &bcm_iproc_i2c_quirks; adap->dev.parent = &pdev->dev;