From: Maxime Ripard <maxime@cerno.tech>
To: Eric Anholt <eric@anholt.net>,
Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
Thomas Zimmermann <tzimmermann@suse.de>,
Maxime Ripard <maxime@cerno.tech>,
Daniel Vetter <daniel.vetter@intel.com>,
David Airlie <airlied@linux.ie>
Cc: Dave Stevenson <dave.stevenson@raspberrypi.com>,
linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org,
Dom Cobley <popcornmix@gmail.com>,
bcm-kernel-feedback-list@broadcom.com,
linux-rpi-kernel@lists.infradead.org,
Hans Verkuil <hverkuil-cisco@xs4all.nl>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
linux-arm-kernel@lists.infradead.org,
linux-media@vger.kernel.org
Subject: [PATCH v2 04/15] drm/vc4: hdmi: Fix up CEC registers
Date: Mon, 11 Jan 2021 15:22:58 +0100 [thread overview]
Message-ID: <20210111142309.193441-5-maxime@cerno.tech> (raw)
In-Reply-To: <20210111142309.193441-1-maxime@cerno.tech>
From: Dom Cobley <popcornmix@gmail.com>
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>
---
drivers/gpu/drm/vc4/vc4_hdmi_regs.h | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/vc4/vc4_hdmi_regs.h b/drivers/gpu/drm/vc4/vc4_hdmi_regs.h
index 401863cb8c98..e1b58eac766f 100644
--- 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.
@@ -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),
};
--
2.29.2
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2021-01-11 14:25 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-11 14:22 [PATCH v2 00/15] drm/vc4: hdmi: Add CEC support for the BCM2711 Maxime Ripard
2021-01-11 14:22 ` [PATCH v2 01/15] ARM: bcm: Select BRCMSTB_L2_IRQ for bcm2835 Maxime Ripard
2021-01-11 16:54 ` Florian Fainelli
2021-01-11 17:12 ` Nicolas Saenz Julienne
2021-01-11 14:22 ` [PATCH v2 02/15] drm/vc4: hdmi: Move hdmi reset to bind Maxime Ripard
2021-01-11 14:22 ` [PATCH v2 03/15] drm/vc4: hdmi: Fix register offset with longer CEC messages Maxime Ripard
2021-01-11 14:22 ` Maxime Ripard [this message]
2021-01-11 14:22 ` [PATCH v2 05/15] drm/vc4: hdmi: Restore cec physical address on reconnect Maxime Ripard
2021-01-22 10:31 ` Dave Stevenson
2021-01-11 14:23 ` [PATCH v2 06/15] drm/vc4: hdmi: Compute the CEC clock divider from the clock rate Maxime Ripard
2021-01-11 14:23 ` [PATCH v2 07/15] drm/vc4: hdmi: Update the CEC clock divider on HSM rate change Maxime Ripard
2021-01-11 14:23 ` [PATCH v2 08/15] drm/vc4: hdmi: Introduce a CEC clock Maxime Ripard
2021-01-11 14:23 ` [PATCH v2 09/15] drm/vc4: hdmi: Split the interrupt handlers Maxime Ripard
2021-01-22 13:01 ` Dave Stevenson
2021-01-11 14:23 ` [PATCH v2 10/15] drm/vc4: hdmi: Support BCM2711 CEC interrupt setup Maxime Ripard
2021-01-22 13:10 ` Dave Stevenson
2021-01-11 14:23 ` [PATCH v2 11/15] drm/vc4: hdmi: Remove cec_available flag Maxime Ripard
2021-01-11 14:23 ` [PATCH v2 12/15] drm/vc4: hdmi: Don't register the CEC adapter if there's no interrupts Maxime Ripard
2021-01-11 14:23 ` [PATCH v2 13/15] dt-binding: display: bcm2711-hdmi: Add CEC and hotplug interrupts Maxime Ripard
2021-01-22 13:28 ` Dave Stevenson
2021-02-01 18:56 ` Rob Herring
2021-02-18 14:54 ` Rob Herring
2021-01-11 14:23 ` [PATCH v2 14/15] ARM: dts: bcm2711: Add the BSC interrupt controller Maxime Ripard
2021-02-09 9:49 ` Dave Stevenson
2021-02-10 14:40 ` Maxime Ripard
2021-02-10 15:30 ` Marc Zyngier
2021-02-10 15:49 ` Dave Stevenson
2021-02-10 18:49 ` Florian Fainelli
2021-02-12 11:20 ` Nicolas Saenz Julienne
2021-02-12 11:34 ` Maxime Ripard
2021-01-11 14:23 ` [PATCH v2 15/15] ARM: dts: bcm2711: Add the CEC " Maxime Ripard
2021-01-28 14:51 ` Nicolas Saenz Julienne
2021-01-12 15:24 ` [PATCH v2 00/15] drm/vc4: hdmi: Add CEC support for the BCM2711 Hans Verkuil
2021-01-18 13:55 ` Hans Verkuil
2021-01-27 15:28 ` Hans Verkuil
2021-01-25 21:03 ` Nicolas Saenz Julienne
2021-01-28 9:48 ` Maxime Ripard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210111142309.193441-5-maxime@cerno.tech \
--to=maxime@cerno.tech \
--cc=airlied@linux.ie \
--cc=bcm-kernel-feedback-list@broadcom.com \
--cc=daniel.vetter@intel.com \
--cc=dave.stevenson@raspberrypi.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=eric@anholt.net \
--cc=hverkuil-cisco@xs4all.nl \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-rpi-kernel@lists.infradead.org \
--cc=maarten.lankhorst@linux.intel.com \
--cc=mchehab@kernel.org \
--cc=popcornmix@gmail.com \
--cc=tzimmermann@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).