mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-20 17:41:09 +00:00
drm/vc4: hdmi: Fix up CEC registers
[ Upstream commit5a32bfd563
] The commit311e305fdb
("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:311e305fdb
("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 commit303085bc11
) Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
22a555e031
commit
5ef6d3b78a
1 changed files with 3 additions and 1 deletions
|
@ -29,6 +29,7 @@ enum vc4_hdmi_field {
|
|||
HDMI_CEC_CPU_MASK_SET,
|
||||
HDMI_CEC_CPU_MASK_STATUS,
|
||||
HDMI_CEC_CPU_STATUS,
|
||||
HDMI_CEC_CPU_SET,
|
||||
|
||||
/*
|
||||
* 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[] = {
|
|||
VC4_HDMI_REG(HDMI_TX_PHY_RESET_CTL, 0x02c0),
|
||||
VC4_HDMI_REG(HDMI_TX_PHY_CTL_0, 0x02c4),
|
||||
VC4_HDMI_REG(HDMI_CEC_CPU_STATUS, 0x0340),
|
||||
VC4_HDMI_REG(HDMI_CEC_CPU_SET, 0x0344),
|
||||
VC4_HDMI_REG(HDMI_CEC_CPU_CLEAR, 0x0348),
|
||||
VC4_HDMI_REG(HDMI_CEC_CPU_MASK_STATUS, 0x034c),
|
||||
VC4_HDMI_REG(HDMI_CEC_CPU_MASK_SET, 0x034c),
|
||||
VC4_HDMI_REG(HDMI_CEC_CPU_MASK_SET, 0x0350),
|
||||
VC4_HDMI_REG(HDMI_CEC_CPU_MASK_CLEAR, 0x0354),
|
||||
VC4_HDMI_REG(HDMI_RAM_PACKET_START, 0x0400),
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue