drm/vc4: hdmi: Fix up CEC registers

[ Upstream commit 5a32bfd563e8b5766e57475c2c81c769e5a13f5d ]

The commit 311e305fdb4e ("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: 311e305fdb4e ("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 303085bc11bb7aebeeaaf09213f99fd7aa539a34)
Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/gpu/drm/vc4/vc4_hdmi_regs.h b/drivers/gpu/drm/vc4/vc4_hdmi_regs.h
index 7c6b4818f2455ed5e89aedab070eb141a2e005d4..6c0dfbbe1a7ef0687c9d25d95e949726a78db448 100644 (file)
--- a/drivers/gpu/drm/vc4/vc4_hdmi_regs.h
+++ b/drivers/gpu/drm/vc4/vc4_hdmi_regs.h
@@ -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),
 };