Re: [PATCH v3 5/5] drm: adv7511: Add support for i2c_new_secondary_device
Hi Laurent, Thanks for the review, On 13/02/18 12:23, Laurent Pinchart wrote: > Hi Kieran, > > Thank you for the patch. > > On Tuesday, 13 February 2018 00:07:53 EET Kieran Bingham wrote: >> From: Kieran Bingham >> >> The ADV7511 has four 256-byte maps that can be accessed via the main I²C >> ports. Each map has it own I²C address and acts as a standard slave >> device on the I²C bus. >> >> Allow a device tree node to override the default addresses so that >> address conflicts with other devices on the same bus may be resolved at >> the board description level. >> >> Signed-off-by: Kieran Bingham >> --- >> v2: >> - Update missing edid-i2c address setting >> - Split out DT bindings >> - Rename and move the I2C default addresses to their own section >> >> drivers/gpu/drm/bridge/adv7511/adv7511.h | 6 >> drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 42 >> 2 files changed, 33 insertions(+), 15 deletions(-) >> >> diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511.h >> b/drivers/gpu/drm/bridge/adv7511/adv7511.h index d034b2cb5eee..04e6759ee45b >> 100644 >> --- a/drivers/gpu/drm/bridge/adv7511/adv7511.h >> +++ b/drivers/gpu/drm/bridge/adv7511/adv7511.h >> @@ -93,6 +93,11 @@ >> #define ADV7511_REG_CHIP_ID_HIGH0xf5 >> #define ADV7511_REG_CHIP_ID_LOW 0xf6 >> >> +/* Hardware defined default addresses for i2c register maps */ > > s/i2c/I2C/ ? That's really because I had to find something :-) The I²C comes from JMH's original patch, but is much harder to grep for, so normalising to I2C throughout. > > Reviewed-by: Laurent Pinchart >> +#define ADV7511_CEC_I2C_ADDR_DEFAULT0x3c >> +#define ADV7511_EDID_I2C_ADDR_DEFAULT 0x3f >> +#define ADV7511_PACKET_I2C_ADDR_DEFAULT 0x38 >> + >> #define ADV7511_CSC_ENABLE BIT(7) >> #define ADV7511_CSC_UPDATE_MODE BIT(5) >> >> @@ -322,6 +327,7 @@ struct adv7511 { >> struct i2c_client *i2c_main; >> struct i2c_client *i2c_edid; >> struct i2c_client *i2c_cec; >> +struct i2c_client *i2c_packet; >> >> struct regmap *regmap; >> struct regmap *regmap_cec; >> diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c >> b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c index >> efa29db5fc2b..5e61b928c9c0 100644 >> --- a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c >> +++ b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c >> @@ -586,7 +586,7 @@ static int adv7511_get_modes(struct adv7511 *adv7511, >> /* Reading the EDID only works if the device is powered */ >> if (!adv7511->powered) { >> unsigned int edid_i2c_addr = >> -(adv7511->i2c_main->addr << 1) + 4; >> +(adv7511->i2c_edid->addr << 1); >> >> __adv7511_power_on(adv7511); >> >> @@ -969,10 +969,10 @@ static int adv7511_init_cec_regmap(struct adv7511 >> *adv) { >> int ret; >> >> -adv->i2c_cec = i2c_new_dummy(adv->i2c_main->adapter, >> - adv->i2c_main->addr - 1); >> +adv->i2c_cec = i2c_new_secondary_device(adv->i2c_main, "cec", >> +ADV7511_CEC_I2C_ADDR_DEFAULT); >> if (!adv->i2c_cec) >> -return -ENOMEM; >> +return -EINVAL; >> i2c_set_clientdata(adv->i2c_cec, adv); >> >> adv->regmap_cec = devm_regmap_init_i2c(adv->i2c_cec, >> @@ -1082,8 +1082,6 @@ static int adv7511_probe(struct i2c_client *i2c, const >> struct i2c_device_id *id) struct adv7511_link_config link_config; >> struct adv7511 *adv7511; >> struct device *dev = &i2c->dev; >> -unsigned int main_i2c_addr = i2c->addr << 1; >> -unsigned int edid_i2c_addr = main_i2c_addr + 4; >> unsigned int val; >> int ret; >> >> @@ -1153,24 +1151,35 @@ static int adv7511_probe(struct i2c_client *i2c, >> const struct i2c_device_id *id) if (ret) >> goto uninit_regulators; >> >> -regmap_write(adv7511->regmap, ADV7511_REG_EDID_I2C_ADDR, edid_i2c_addr); >> -regmap_write(adv7511->regmap, ADV7511_REG_PACKET_I2C_ADDR, >> - main_i2c_addr - 0xa); >> -regmap_write(adv7511->regmap, ADV7511_REG_CEC_I2C_ADDR, >> - main_i2c_addr - 2); >> - >> adv7511_packet_disable(adv7511, 0x); >> >> -adv7511->i2c_edid = i2c_new_dummy(i2c->adapter, edid_i2c_addr >> 1); >> +adv7511->i2c_edid = i2c_new_secondary_device(i2c, "edid", >> +ADV7511_EDID_I2C_ADDR_DEFAULT); >> if (!adv7511->i2c_edid) { >> -ret = -ENOMEM; >> +ret = -EINVAL; >> goto uninit_regulators; >> } >> >> +regmap_write(adv7511->regmap, ADV7511_REG_EDID_I2C_ADDR, >> + adv7511->i2c_edid->addr << 1); >> + >> ret = adv7511_init_cec_regmap(adv7511); >> if (ret) >> goto err_i2c_unregister_edid; >> >> +regmap_write(adv7511->regmap, ADV7511_REG_
Re: [PATCH v3 5/5] drm: adv7511: Add support for i2c_new_secondary_device
Hi Kieran, Thank you for the patch. On Tuesday, 13 February 2018 00:07:53 EET Kieran Bingham wrote: > From: Kieran Bingham > > The ADV7511 has four 256-byte maps that can be accessed via the main I²C > ports. Each map has it own I²C address and acts as a standard slave > device on the I²C bus. > > Allow a device tree node to override the default addresses so that > address conflicts with other devices on the same bus may be resolved at > the board description level. > > Signed-off-by: Kieran Bingham > --- > v2: > - Update missing edid-i2c address setting > - Split out DT bindings > - Rename and move the I2C default addresses to their own section > > drivers/gpu/drm/bridge/adv7511/adv7511.h | 6 > drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 42 > 2 files changed, 33 insertions(+), 15 deletions(-) > > diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511.h > b/drivers/gpu/drm/bridge/adv7511/adv7511.h index d034b2cb5eee..04e6759ee45b > 100644 > --- a/drivers/gpu/drm/bridge/adv7511/adv7511.h > +++ b/drivers/gpu/drm/bridge/adv7511/adv7511.h > @@ -93,6 +93,11 @@ > #define ADV7511_REG_CHIP_ID_HIGH 0xf5 > #define ADV7511_REG_CHIP_ID_LOW 0xf6 > > +/* Hardware defined default addresses for i2c register maps */ s/i2c/I2C/ ? That's really because I had to find something :-) Reviewed-by: Laurent Pinchart > +#define ADV7511_CEC_I2C_ADDR_DEFAULT 0x3c > +#define ADV7511_EDID_I2C_ADDR_DEFAULT0x3f > +#define ADV7511_PACKET_I2C_ADDR_DEFAULT 0x38 > + > #define ADV7511_CSC_ENABLE BIT(7) > #define ADV7511_CSC_UPDATE_MODE BIT(5) > > @@ -322,6 +327,7 @@ struct adv7511 { > struct i2c_client *i2c_main; > struct i2c_client *i2c_edid; > struct i2c_client *i2c_cec; > + struct i2c_client *i2c_packet; > > struct regmap *regmap; > struct regmap *regmap_cec; > diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c > b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c index > efa29db5fc2b..5e61b928c9c0 100644 > --- a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c > +++ b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c > @@ -586,7 +586,7 @@ static int adv7511_get_modes(struct adv7511 *adv7511, > /* Reading the EDID only works if the device is powered */ > if (!adv7511->powered) { > unsigned int edid_i2c_addr = > - (adv7511->i2c_main->addr << 1) + 4; > + (adv7511->i2c_edid->addr << 1); > > __adv7511_power_on(adv7511); > > @@ -969,10 +969,10 @@ static int adv7511_init_cec_regmap(struct adv7511 > *adv) { > int ret; > > - adv->i2c_cec = i2c_new_dummy(adv->i2c_main->adapter, > - adv->i2c_main->addr - 1); > + adv->i2c_cec = i2c_new_secondary_device(adv->i2c_main, "cec", > + ADV7511_CEC_I2C_ADDR_DEFAULT); > if (!adv->i2c_cec) > - return -ENOMEM; > + return -EINVAL; > i2c_set_clientdata(adv->i2c_cec, adv); > > adv->regmap_cec = devm_regmap_init_i2c(adv->i2c_cec, > @@ -1082,8 +1082,6 @@ static int adv7511_probe(struct i2c_client *i2c, const > struct i2c_device_id *id) struct adv7511_link_config link_config; > struct adv7511 *adv7511; > struct device *dev = &i2c->dev; > - unsigned int main_i2c_addr = i2c->addr << 1; > - unsigned int edid_i2c_addr = main_i2c_addr + 4; > unsigned int val; > int ret; > > @@ -1153,24 +1151,35 @@ static int adv7511_probe(struct i2c_client *i2c, > const struct i2c_device_id *id) if (ret) > goto uninit_regulators; > > - regmap_write(adv7511->regmap, ADV7511_REG_EDID_I2C_ADDR, edid_i2c_addr); > - regmap_write(adv7511->regmap, ADV7511_REG_PACKET_I2C_ADDR, > - main_i2c_addr - 0xa); > - regmap_write(adv7511->regmap, ADV7511_REG_CEC_I2C_ADDR, > - main_i2c_addr - 2); > - > adv7511_packet_disable(adv7511, 0x); > > - adv7511->i2c_edid = i2c_new_dummy(i2c->adapter, edid_i2c_addr >> 1); > + adv7511->i2c_edid = i2c_new_secondary_device(i2c, "edid", > + ADV7511_EDID_I2C_ADDR_DEFAULT); > if (!adv7511->i2c_edid) { > - ret = -ENOMEM; > + ret = -EINVAL; > goto uninit_regulators; > } > > + regmap_write(adv7511->regmap, ADV7511_REG_EDID_I2C_ADDR, > + adv7511->i2c_edid->addr << 1); > + > ret = adv7511_init_cec_regmap(adv7511); > if (ret) > goto err_i2c_unregister_edid; > > + regmap_write(adv7511->regmap, ADV7511_REG_CEC_I2C_ADDR, > + adv7511->i2c_cec->addr << 1); > + > + adv7511->i2c_packet = i2c_new_secondary_device(i2c, "packet", > + ADV7511_PACKET_I2C_ADDR_DEFAULT); > + if (!adv7511->i2c_packet) { > +