lkml.org 
[lkml]   [2022]   [Apr]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.16 0568/1017] i2c: xiic: Make bus names unique
    Date
    From: Robert Hancock <robert.hancock@calian.com>

    [ Upstream commit 1d366c2f9df8279df2adbb60471f86fc40a1c39e ]

    This driver is for an FPGA logic core, so there can be arbitrarily many
    instances of the bus on a given system. Previously all of the I2C bus
    names were "xiic-i2c" which caused issues with lm_sensors when trying to
    map human-readable names to sensor inputs because it could not properly
    distinguish the busses, for example. Append the platform device name to
    the I2C bus name so it is unique between different instances.

    Fixes: e1d5b6598cdc ("i2c: Add support for Xilinx XPS IIC Bus Interface")
    Signed-off-by: Robert Hancock <robert.hancock@calian.com>
    Tested-by: Michal Simek <michal.simek@xilinx.com>
    Signed-off-by: Wolfram Sang <wsa@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/i2c/busses/i2c-xiic.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    diff --git a/drivers/i2c/busses/i2c-xiic.c b/drivers/i2c/busses/i2c-xiic.c
    index eb789cfb9973..ffefe3c482e9 100644
    --- a/drivers/i2c/busses/i2c-xiic.c
    +++ b/drivers/i2c/busses/i2c-xiic.c
    @@ -734,7 +734,6 @@ static const struct i2c_adapter_quirks xiic_quirks = {

    static const struct i2c_adapter xiic_adapter = {
    .owner = THIS_MODULE,
    - .name = DRIVER_NAME,
    .class = I2C_CLASS_DEPRECATED,
    .algo = &xiic_algorithm,
    .quirks = &xiic_quirks,
    @@ -771,6 +770,8 @@ static int xiic_i2c_probe(struct platform_device *pdev)
    i2c_set_adapdata(&i2c->adap, i2c);
    i2c->adap.dev.parent = &pdev->dev;
    i2c->adap.dev.of_node = pdev->dev.of_node;
    + snprintf(i2c->adap.name, sizeof(i2c->adap.name),
    + DRIVER_NAME " %s", pdev->name);

    mutex_init(&i2c->lock);

    --
    2.34.1


    \
     
     \ /
      Last update: 2022-04-05 15:37    [W:4.031 / U:0.572 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site