Unverified Commit 303085bc authored by Dom Cobley's avatar Dom Cobley Committed by Maxime Ripard
Browse files

drm/vc4: hdmi: Fix up CEC registers 



The commit 311e305f ("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: 311e305f ("drm/vc4: hdmi: Implement a register layout abstraction")
Reviewed-by: default avatarDave Stevenson <dave.stevenson@raspberrypi.com>
Signed-off-by: default avatarDom Cobley <popcornmix@gmail.com>
Signed-off-by: default avatarMaxime Ripard <maxime@cerno.tech>
Acked-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Tested-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Link: https://patchwork.freedesktop.org/patch/msgid/20210111142309.193441-5-maxime@cerno.tech
parent e9c9481f

drivers/gpu/drm/vc4/vc4_hdmi_regs.h

+3 −1
Original line number Diff line number Diff line
@@ -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.
@@ -199,9 +200,10 @@ static const struct vc4_hdmi_register __maybe_unused 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),

};