@@ -1072,7 +1072,7 @@ static int adv7511_init_cec_regmap(struct adv7511 *adv)
int ret;
adv->i2c_cec = i2c_new_ancillary_device(adv->i2c_main, "cec",
- ADV7511_CEC_I2C_ADDR_DEFAULT);
+ ADV7511_CEC_I2C_ADDR_DEFAULT, NULL);
if (IS_ERR(adv->i2c_cec))
return PTR_ERR(adv->i2c_cec);
@@ -1261,7 +1261,7 @@ static int adv7511_probe(struct i2c_client *i2c)
adv7511_packet_disable(adv7511, 0xffff);
adv7511->i2c_edid = i2c_new_ancillary_device(i2c, "edid",
- ADV7511_EDID_I2C_ADDR_DEFAULT);
+ ADV7511_EDID_I2C_ADDR_DEFAULT, NULL);
if (IS_ERR(adv7511->i2c_edid)) {
ret = PTR_ERR(adv7511->i2c_edid);
goto uninit_regulators;
@@ -1271,7 +1271,7 @@ static int adv7511_probe(struct i2c_client *i2c)
adv7511->i2c_edid->addr << 1);
adv7511->i2c_packet = i2c_new_ancillary_device(i2c, "packet",
- ADV7511_PACKET_I2C_ADDR_DEFAULT);
+ ADV7511_PACKET_I2C_ADDR_DEFAULT, NULL);
if (IS_ERR(adv7511->i2c_packet)) {
ret = PTR_ERR(adv7511->i2c_packet);
goto err_i2c_unregister_edid;
@@ -1122,15 +1122,17 @@ EXPORT_SYMBOL_GPL(devm_i2c_new_dummy_device);
* @client: Handle to the primary client
* @name: Handle to specify which secondary address to get
* @default_addr: Used as a fallback if no secondary address was specified
+ * @aux_device_name: Ancillary device name
* Context: can sleep
*
* I2C clients can be composed of multiple I2C slaves bound together in a single
* component. The I2C client driver then binds to the master I2C slave and needs
- * to create I2C dummy clients to communicate with all the other slaves.
+ * to create I2C ancillary clients to communicate with all the other slaves.
*
- * This function creates and returns an I2C dummy client whose I2C address is
- * retrieved from the platform firmware based on the given slave name. If no
- * address is specified by the firmware default_addr is used.
+ * This function creates and returns an I2C ancillary client whose I2C address
+ * is retrieved from the platform firmware based on the given slave name. If no
+ * address is specified by the firmware default_addr is used. If no aux_device_
+ * name is specified by the firmware, it will create an I2C dummy client.
*
* On DT-based platforms the address is retrieved from the "reg" property entry
* cell whose "reg-names" value matches the slave name.
@@ -1139,10 +1141,12 @@ EXPORT_SYMBOL_GPL(devm_i2c_new_dummy_device);
* i2c_unregister_device(); or an ERR_PTR to describe the error.
*/
struct i2c_client *i2c_new_ancillary_device(struct i2c_client *client,
- const char *name,
- u16 default_addr)
+ const char *name,
+ u16 default_addr,
+ const char *aux_device_name)
{
struct device_node *np = client->dev.of_node;
+ struct i2c_client *i2c_aux_client;
u32 addr = default_addr;
int i;
@@ -1153,7 +1157,27 @@ struct i2c_client *i2c_new_ancillary_device(struct i2c_client *client,
}
dev_dbg(&client->adapter->dev, "Address for %s : 0x%x\n", name, addr);
- return i2c_new_dummy_device(client->adapter, addr);
+
+ if (aux_device_name) {
+ struct i2c_board_info info;
+ size_t aux_device_name_len = strlen(aux_device_name);
+
+ if (aux_device_name_len > I2C_NAME_SIZE - 1) {
+ dev_err(&client->adapter->dev, "Invalid device name\n");
+ return ERR_PTR(-EINVAL);
+ }
+
+ memset(&info, 0, sizeof(struct i2c_board_info));
+
+ memcpy(info.type, aux_device_name, aux_device_name_len);
+ info.addr = addr;
+
+ i2c_aux_client = i2c_new_client_device(client->adapter, &info);
+ } else {
+ i2c_aux_client = i2c_new_dummy_device(client->adapter, addr);
+ }
+
+ return i2c_aux_client;
}
EXPORT_SYMBOL_GPL(i2c_new_ancillary_device);
@@ -186,7 +186,7 @@ static int adv748x_initialise_clients(struct adv748x_state *state)
state->i2c_clients[i] = i2c_new_ancillary_device(
state->client,
adv748x_default_addresses[i].name,
- adv748x_default_addresses[i].default_addr);
+ adv748x_default_addresses[i].default_addr, NULL);
if (IS_ERR(state->i2c_clients[i])) {
adv_err(state, "failed to create i2c client %u\n", i);
@@ -2935,7 +2935,8 @@ static struct i2c_client *adv76xx_dummy_client(struct v4l2_subdev *sd,
else
new_client = i2c_new_ancillary_device(client,
adv76xx_default_addresses[page].name,
- adv76xx_default_addresses[page].default_addr);
+ adv76xx_default_addresses[page].default_addr,
+ NULL);
if (!IS_ERR(new_client))
io_write(sd, io_reg, new_client->addr << 1);
@@ -489,7 +489,8 @@ devm_i2c_new_dummy_device(struct device *dev, struct i2c_adapter *adap, u16 addr
struct i2c_client *
i2c_new_ancillary_device(struct i2c_client *client,
const char *name,
- u16 default_addr);
+ u16 default_addr,
+ const char *aux_device_name);
void i2c_unregister_device(struct i2c_client *client);
Renesas PMIC RAA215300 exposes two separate i2c devices, one for the main device and another for rtc device. Enhance i2c_new_ancillary_device() to instantiate a real device. (eg: Instantiate rtc device from PMIC driver) Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com> --- v3: * New patch Ref: https://patchwork.kernel.org/project/linux-renesas-soc/patch/20230505172530.357455-5-biju.das.jz@bp.renesas.com/ --- drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 6 ++-- drivers/i2c/i2c-core-base.c | 38 ++++++++++++++++---- drivers/media/i2c/adv748x/adv748x-core.c | 2 +- drivers/media/i2c/adv7604.c | 3 +- include/linux/i2c.h | 3 +- 5 files changed, 39 insertions(+), 13 deletions(-)