From: Markuss Broks Date: Sat, 23 Apr 2022 08:53:14 +0000 (+0300) Subject: extcon: sm5502: Clarify SM5703's i2c device ID X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=5faf7cbaff459f885f09eed1e685a3cf9a19c78e;p=linux.git extcon: sm5502: Clarify SM5703's i2c device ID While SM5502 and SM5504 are purely micro USB switching circuits, SM5703 is a multi-function device which has multiple modules in it. Change the i2c_device_id of it to avoid conflict with MFD driver. Signed-off-by: Markuss Broks Signed-off-by: Chanwoo Choi --- diff --git a/drivers/extcon/extcon-sm5502.c b/drivers/extcon/extcon-sm5502.c index 17a40c3782ee0..f706f52882571 100644 --- a/drivers/extcon/extcon-sm5502.c +++ b/drivers/extcon/extcon-sm5502.c @@ -831,7 +831,7 @@ static SIMPLE_DEV_PM_OPS(sm5502_muic_pm_ops, static const struct i2c_device_id sm5502_i2c_id[] = { { "sm5502", (kernel_ulong_t)&sm5502_data }, { "sm5504", (kernel_ulong_t)&sm5504_data }, - { "sm5703", (kernel_ulong_t)&sm5502_data }, + { "sm5703-muic", (kernel_ulong_t)&sm5502_data }, { } }; MODULE_DEVICE_TABLE(i2c, sm5502_i2c_id);