Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4d4a58c9 authored by Alvin Šipraga's avatar Alvin Šipraga Committed by Greg Kroah-Hartman
Browse files

drm: bridge: adv7511: fix CEC power down control register offset 



[ Upstream commit 1d22b6033ea113a4c3850dfa2c0770885c81aec8 ]

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: 3b1b9750 ("drm: adv7511/33: add HDMI CEC support")
Signed-off-by: default avatarAlvin Šipraga <alsi@bang-olufsen.dk>
Reviewed-by: default avatarRobert Foss <robert.foss@linaro.org>
Signed-off-by: default avatarRobert Foss <robert.foss@linaro.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20220612144854.2223873-2-alvin@pqrs.dk


Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 72c0d361

drivers/gpu/drm/bridge/adv7511/adv7511.h

+1 −4
Original line number Diff line number Diff line
@@ -384,10 +384,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;

}

drivers/gpu/drm/bridge/adv7511/adv7511_cec.c

+2 −2
Original line number Diff line number Diff line
@@ -316,7 +316,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);
@@ -343,7 +343,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;

}