2022-03-21 14:04:51

by Alvin Šipraga

Subject: [PATCH 0/2] drm: bridge: adv7511: two fixes for CEC

From: Alvin Šipraga <[email protected]>

The patches are sent against drm-misc-next. Thanks!

Alvin Šipraga (2):
drm: bridge: adv7511: fix CEC power down control register offset
drm: bridge: adv7511: unregister cec i2c device after cec adapter

drivers/gpu/drm/bridge/adv7511/adv7511.h | 5 +----
drivers/gpu/drm/bridge/adv7511/adv7511_cec.c | 4 ++--
drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 5 ++---
3 files changed, 5 insertions(+), 9 deletions(-)

--
2.35.1

2022-03-21 14:06:10

by Alvin Šipraga

Subject: [PATCH 1/2] drm: bridge: adv7511: fix CEC power down control register offset

From: Alvin Šipraga <[email protected]>

The ADV7511_REG_CEC_CTRL = 0xE2 register is part of the main register
map - not the CEC register map. As such, we shouldn't apply an offset to
the register address. Doing so will cause us to address a bogus register
for chips with a CEC register map offset (e.g. ADV7533).

Fixes: 3b1b975003e4 ("drm: adv7511/33: add HDMI CEC support")
Signed-off-by: Alvin Šipraga <[email protected]>
---
drivers/gpu/drm/bridge/adv7511/adv7511.h | 5 +----
drivers/gpu/drm/bridge/adv7511/adv7511_cec.c | 4 ++--
2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511.h b/drivers/gpu/drm/bridge/adv7511/adv7511.h
index 592ecfcf00ca..4e7cbaa9204f 100644
--- a/drivers/gpu/drm/bridge/adv7511/adv7511.h
+++ b/drivers/gpu/drm/bridge/adv7511/adv7511.h
@@ -386,10 +386,7 @@ void adv7511_cec_irq_process(struct adv7511 *adv7511, unsigned int irq1);
#else
static inline int adv7511_cec_init(struct device *dev, struct adv7511 *adv7511)
{
- unsigned int offset = adv7511->type == ADV7533 ?
- ADV7533_REG_CEC_OFFSET : 0;
-
- regmap_write(adv7511->regmap, ADV7511_REG_CEC_CTRL + offset,
+ regmap_write(adv7511->regmap, ADV7511_REG_CEC_CTRL,
ADV7511_CEC_CTRL_POWER_DOWN);
return 0;
}
diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511_cec.c b/drivers/gpu/drm/bridge/adv7511/adv7511_cec.c
index 28d9becc939c..4ee7f2e911e3 100644
--- a/drivers/gpu/drm/bridge/adv7511/adv7511_cec.c
+++ b/drivers/gpu/drm/bridge/adv7511/adv7511_cec.c
@@ -303,7 +303,7 @@ int adv7511_cec_init(struct device *dev, struct adv7511 *adv7511)
goto err_cec_alloc;
}

- regmap_write(adv7511->regmap, ADV7511_REG_CEC_CTRL + offset, 0);
+ regmap_write(adv7511->regmap, ADV7511_REG_CEC_CTRL, 0);
/* cec soft reset */
regmap_write(adv7511->regmap_cec,
ADV7511_REG_CEC_SOFT_RESET + offset, 0x01);
@@ -330,7 +330,7 @@ int adv7511_cec_init(struct device *dev, struct adv7511 *adv7511)
dev_info(dev, "Initializing CEC failed with error %d, disabling CEC\n",
ret);
err_cec_parse_dt:
- regmap_write(adv7511->regmap, ADV7511_REG_CEC_CTRL + offset,
+ regmap_write(adv7511->regmap, ADV7511_REG_CEC_CTRL,
ADV7511_CEC_CTRL_POWER_DOWN);
return ret == -EPROBE_DEFER ? ret : 0;
}
--
2.35.1

2022-03-21 14:39:12

by Alvin Šipraga

Subject: Re: [PATCH 0/2] drm: bridge: adv7511: two fixes for CEC

Alvin Šipraga <[email protected]> writes:

> From: Alvin Šipraga <[email protected]>
>
> The patches are sent against drm-misc-next. Thanks!

Whoops, I meant drm-misc-fixes, since these are fixes. :-)

Separate patches aimed at drm-misc-next incoming.

>
> Alvin Šipraga (2):
> drm: bridge: adv7511: fix CEC power down control register offset
> drm: bridge: adv7511: unregister cec i2c device after cec adapter
>
> drivers/gpu/drm/bridge/adv7511/adv7511.h | 5 +----
> drivers/gpu/drm/bridge/adv7511/adv7511_cec.c | 4 ++--
> drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 5 ++---
> 3 files changed, 5 insertions(+), 9 deletions(-)