From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 65041C2BBCF for ; Fri, 18 Dec 2020 11:22:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 33E6423A62 for ; Fri, 18 Dec 2020 11:22:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733222AbgLRLW1 (ORCPT ); Fri, 18 Dec 2020 06:22:27 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59410 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732738AbgLRLW0 (ORCPT ); Fri, 18 Dec 2020 06:22:26 -0500 Received: from mail-wr1-x42c.google.com (mail-wr1-x42c.google.com [IPv6:2a00:1450:4864:20::42c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 85E89C0617B0 for ; Fri, 18 Dec 2020 03:21:46 -0800 (PST) Received: by mail-wr1-x42c.google.com with SMTP id r7so1746153wrc.5 for ; Fri, 18 Dec 2020 03:21:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.com; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=0NUjTMUcVO0qCGXSkD6m+wQ/vz/jVZRScuhTw7dmgyQ=; b=WDbuL0avnM8ZM5Ifop4nzsFT0UVBrCayTg2OQ/wcpBNbBsg2t1J4wfT+Xt1526aGMd lgR/Y2+eHn7iv2bKf37gYC0pfYeJPdICkURqEx1GeTmhvwvzpw9NyB4oLYf+0yWp7vyt awyyW4QxHEW7Cj3xRoH6zNAR8yP0XvIYU0fkgiRPQiXr7mlPh5ka9AbBFqodzi4s6wac nKx6MJlFJqETKBgl4BjEfl/ms6kpyG6J7D+P6qTZrORgKL3Bz14Rf2HGSjX4jAMUO5/t XZ5OTEz5Os+3OKO8pV/btHE0n9NBwMYefYyi6yombnfCrRHH69odnu3DXFz+s/TyBMd5 OTPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=0NUjTMUcVO0qCGXSkD6m+wQ/vz/jVZRScuhTw7dmgyQ=; b=LRQtqcnQ3aBniEALk763gbjju0CxEkNEep5Fkc0tOwNuzmpHS19Pz84umF6pYMYHfN hwjKOxDT+GnY6ySa7dSczgWROIfinCi0F+tU2TC2YZ7BKUWOOejEPkeFG0tpm70oB7Jk Ao4sjYKxKyqp788VnQHXA8x5iVlrnxAzHmqG0gYUV7+z5IGbKDZsnGscvmBO3+myyPOG PS3PdOe2jw4KMX/YA6TPb2KstPrONQa1214a400iK5G8hPDbOnSCcwDpZBCdDyYc1y6B Yc9d1NFpsgRHqm+DA/pIqZm6JJMn9q678RPzih7j0UL6fQUud6q4l7VqNFt6KbOyeETl wjcg== X-Gm-Message-State: AOAM530ULF2qzbeEX2ICQfZV83IidLECgyz5iXWAb0ZofpMxSj3x1ImH 7Dl35HBcBV3NFV6j84oxlIXhw8wORHK+kJABeR87mw== X-Google-Smtp-Source: ABdhPJybkChIZsOPvxtUy5vzSoQk4jpCJqUZ7nImjtynHuGJ03k9ybgEfmROhIcueQfPsaFyVblhAdNV8cHWX2SdHy8= X-Received: by 2002:a5d:65ca:: with SMTP id e10mr3952897wrw.42.1608290505273; Fri, 18 Dec 2020 03:21:45 -0800 (PST) MIME-Version: 1.0 References: <20201210134648.272857-1-maxime@cerno.tech> <20201210134648.272857-5-maxime@cerno.tech> In-Reply-To: <20201210134648.272857-5-maxime@cerno.tech> From: Dave Stevenson Date: Fri, 18 Dec 2020 11:21:28 +0000 Message-ID: Subject: Re: [PATCH 04/15] drm/vc4: hdmi: Fix up CEC registers To: Maxime Ripard Cc: Eric Anholt , Maarten Lankhorst , Thomas Zimmermann , Daniel Vetter , David Airlie , Jason Cooper , bcm-kernel-feedback-list@broadcom.com, linux-arm-kernel@lists.infradead.org, Marc Zyngier , Linux Media Mailing List , Hans Verkuil , LKML , Mauro Carvalho Chehab , Thomas Gleixner , linux-rpi-kernel@lists.infradead.org, DRI Development , Dom Cobley Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Maxime & Dom On Thu, 10 Dec 2020 at 13:46, Maxime Ripard wrote: > > From: Dom Cobley > > 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") > Signed-off-by: Dom Cobley > Signed-off-by: Maxime Ripard Reviewed-by: Dave Stevenson > --- > 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 013fd57febd8..20a1438a72cb 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 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.28.0 >