Skip to content

Commit 5ef6d3b

Browse files
popcornmixgregkh
authored andcommitted
drm/vc4: hdmi: Fix up CEC registers
[ Upstream commit 5a32bfd ] The commit 311e305 ("drm/vc4: hdmi: Implement a register layout abstraction") forgot one CEC register, and made a copy and paste mistake for another one. Fix those mistakes. Fixes: 311e305 ("drm/vc4: hdmi: Implement a register layout abstraction") Reviewed-by: Dave Stevenson <dave.stevenson@raspberrypi.com> Signed-off-by: Dom Cobley <popcornmix@gmail.com> Signed-off-by: Maxime Ripard <maxime@cerno.tech> Acked-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Tested-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Link: https://patchwork.freedesktop.org/patch/msgid/20210111142309.193441-5-maxime@cerno.tech (cherry picked from commit 303085b) Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 22a555e commit 5ef6d3b

1 file changed

Lines changed: 3 additions & 1 deletion

File tree

drivers/gpu/drm/vc4/vc4_hdmi_regs.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ enum vc4_hdmi_field {
2929
HDMI_CEC_CPU_MASK_SET,
3030
HDMI_CEC_CPU_MASK_STATUS,
3131
HDMI_CEC_CPU_STATUS,
32+
HDMI_CEC_CPU_SET,
3233

3334
/*
3435
* Transmit data, first byte is low byte of the 32-bit reg.
@@ -196,9 +197,10 @@ static const struct vc4_hdmi_register vc4_hdmi_fields[] = {
196197
VC4_HDMI_REG(HDMI_TX_PHY_RESET_CTL, 0x02c0),
197198
VC4_HDMI_REG(HDMI_TX_PHY_CTL_0, 0x02c4),
198199
VC4_HDMI_REG(HDMI_CEC_CPU_STATUS, 0x0340),
200+
VC4_HDMI_REG(HDMI_CEC_CPU_SET, 0x0344),
199201
VC4_HDMI_REG(HDMI_CEC_CPU_CLEAR, 0x0348),
200202
VC4_HDMI_REG(HDMI_CEC_CPU_MASK_STATUS, 0x034c),
201-
VC4_HDMI_REG(HDMI_CEC_CPU_MASK_SET, 0x034c),
203+
VC4_HDMI_REG(HDMI_CEC_CPU_MASK_SET, 0x0350),
202204
VC4_HDMI_REG(HDMI_CEC_CPU_MASK_CLEAR, 0x0354),
203205
VC4_HDMI_REG(HDMI_RAM_PACKET_START, 0x0400),
204206
};

0 commit comments

Comments
 (0)