@@ -71,13 +71,11 @@ static const struct mfd_cell cgbc_devs[] = {
MFD_CELL_NAME("cgbc-hwmon"),
{
.name = "cgbc-i2c",
- .id = 1,
.platform_data = &cgbc_i2c_gp_pdata,
.pdata_size = sizeof(cgbc_i2c_gp_pdata),
},
{
.name = "cgbc-i2c",
- .id = 2,
.platform_data = &cgbc_i2c_pm_pdata,
.pdata_size = sizeof(cgbc_i2c_pm_pdata),
},
@@ -349,8 +347,8 @@ static int cgbc_init_device(struct cgbc_device_data *cgbc)
if (ret)
goto release_session;
- ret = mfd_add_devices(cgbc->dev, -1, cgbc_devs, ARRAY_SIZE(cgbc_devs),
- NULL, 0, NULL);
+ ret = mfd_add_devices(cgbc->dev, PLATFORM_DEVID_AUTO, cgbc_devs,
+ ARRAY_SIZE(cgbc_devs), NULL, 0, NULL);
if (ret)
goto release_session;
Since parameters are now passed to the i2c-cgbc driver via platform data, the I2C driver no longer depends on the platform device ID to probe the correct I2C buses. Drop the hardcoded cell ID in favor of PLATFORM_DEVID_AUTO. Signed-off-by: Thomas Richard (congatec GmbH) <thomas.richard@bootlin.com> --- drivers/mfd/cgbc-core.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)