From patchwork Thu May 16 14:00:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dariusz Marcinkiewicz X-Patchwork-Id: 10946689 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 928E414DB for ; Thu, 16 May 2019 14:00:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8291728BFA for ; Thu, 16 May 2019 14:00:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 809FE28C0D; Thu, 16 May 2019 14:00:49 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, USER_IN_DEF_DKIM_WL autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F29BA28C00 for ; Thu, 16 May 2019 14:00:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727836AbfEPOAp (ORCPT ); Thu, 16 May 2019 10:00:45 -0400 Received: from mail-yw1-f73.google.com ([209.85.161.73]:51326 "EHLO mail-yw1-f73.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727811AbfEPOAp (ORCPT ); Thu, 16 May 2019 10:00:45 -0400 Received: by mail-yw1-f73.google.com with SMTP id k10so3162824ywb.18 for ; Thu, 16 May 2019 07:00:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=0W2BzNydBRd7QhaGcoJcvGTU7rmnrCYSV56xvl6bzSI=; b=Ze8Tkxqk0wx23S6A7duvigoJPnTj7PRU02KReczZHeQEeF4mhN+1JFLjXiyvLc2uOo K0L+nHK5dIoAKUezZbvHDmZnHd+p6BSfo3sxFUUDRPLhx7bGncD/pjOwb6QUbv3cOkrz 6XAnncWcjHlIqBY2nP9hXLzj6HRzvCXZ1rqLPMOOiILRHvPR31uRLrrzVKF1z2TIyd11 hZxLUK3tJaLFX5RY0W09ISXDy3pMLKE/YAfHuFt+uSHeEadW1GSRIWNTjmuAUFgtg1Cr XqKADFQcLIDucjHgE9sQapJlUwjh8H94yZ47pbLaCYqCr7ovB9TM7TxNCAKRcY46qx47 hBfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=0W2BzNydBRd7QhaGcoJcvGTU7rmnrCYSV56xvl6bzSI=; b=DBrUiZelYrB9uhs/uwLtD3sY9Y1pZcVHO7L+0+lanF1tFaho6P8zfyYXUN1ZCiFCf6 iSwwLYlXG3sfD7OGmp5OcSsKDP2JcknC/9L7U/qze6Q25jUpBaRxUeS41FriZodoyP6Q zKVSjWNo6VCHfDtu1NAO00roftonXSGTWGTHVEBwULo5wqFei6Xdj2GQXMwB3M0h18uy A8LbuIun6UKp4js4YSkv16sR2Vpe9s6k/CbQpJbwkar/0X9+u0yncmrzz2cMKffUBC9N cWZbkMaXq1ZOb/EhrKgjjQAMslm4c4oVl7DBEpDv6PtiZkum+32Yv+seXmTLPMIrKV/p im1g== X-Gm-Message-State: APjAAAW4pYmBrzZYtbE7JtN6YrLi7iF2PT259x76wijajX3Ka+/O/i81 lY4mS0csPns2wDfuF0A89rO+WsCkjcZ3FIcd09FAXKGWCf1fatmppHlqTSiBmj1mzJ7n4DuNVfx 1P9H0Ottd1rOkBKF88jvNUQEyq47IpLgS2t1qBc9ULbwzfN7FgjC4Iqg88Yl8gYFVQhEd X-Google-Smtp-Source: APXvYqylyCuEAoh/IO80hPvL85QhJypPrPpWyzFZNNCr4o4QOYuBtPRskXjvQaK6dQzj824TNXBcM630WdM= X-Received: by 2002:a81:2717:: with SMTP id n23mr25197449ywn.511.1558015244107; Thu, 16 May 2019 07:00:44 -0700 (PDT) Date: Thu, 16 May 2019 16:00:20 +0200 In-Reply-To: <20190516140020.200105-1-darekm@google.com> Message-Id: <20190516140020.200105-3-darekm@google.com> Mime-Version: 1.0 References: <20190516140020.200105-1-darekm@google.com> X-Mailer: git-send-email 2.21.0.1020.gf2820cf01a-goog Subject: [PATCH v5 3/3] drm/i2c: tda9950: pass HDMI connector info to CEC adapter From: Dariusz Marcinkiewicz To: linux-media@vger.kernel.org, hans.verkuil@cisco.com, hverkuil@xs4all.nl Cc: linux-kernel@vger.kernel.org, Dariusz Marcinkiewicz Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP With that change tda998x provides a connector info to the CEC adapter. In order to be able to that it delays creation of respective CEC device until the DRM connector is initialized. Requires testing. Signed-off-by: Dariusz Marcinkiewicz --- drivers/gpu/drm/i2c/tda9950.c | 7 ++++- drivers/gpu/drm/i2c/tda998x_drv.c | 41 +++++++++++++-------------- include/linux/platform_data/tda9950.h | 2 ++ 3 files changed, 28 insertions(+), 22 deletions(-) diff --git a/drivers/gpu/drm/i2c/tda9950.c b/drivers/gpu/drm/i2c/tda9950.c index b944dd9df85e1..2778a0015cc31 100644 --- a/drivers/gpu/drm/i2c/tda9950.c +++ b/drivers/gpu/drm/i2c/tda9950.c @@ -382,6 +382,7 @@ static int tda9950_probe(struct i2c_client *client, const struct i2c_device_id *id) { struct tda9950_glue *glue = client->dev.platform_data; + struct cec_connector_info conn_info; struct device *dev = &client->dev; struct tda9950_priv *priv; unsigned long irqflags; @@ -422,10 +423,14 @@ static int tda9950_probe(struct i2c_client *client, if (glue && glue->parent) priv->hdmi = glue->parent; + memset(&conn_info, 0, sizeof(conn_info)); + if (glue) + cec_fill_connector_info(&conn_info, glue->connector); + priv->adap = cec_allocate_adapter(&tda9950_cec_ops, priv, "tda9950", CEC_CAP_DEFAULTS, CEC_MAX_LOG_ADDRS, - NULL); + &conn_info); if (IS_ERR(priv->adap)) return PTR_ERR(priv->adap); diff --git a/drivers/gpu/drm/i2c/tda998x_drv.c b/drivers/gpu/drm/i2c/tda998x_drv.c index 7f34601bb5155..ef2aa3134b387 100644 --- a/drivers/gpu/drm/i2c/tda998x_drv.c +++ b/drivers/gpu/drm/i2c/tda998x_drv.c @@ -1253,6 +1253,7 @@ static int tda998x_connector_init(struct tda998x_priv *priv, struct drm_device *drm) { struct drm_connector *connector = &priv->connector; + struct i2c_board_info cec_info; int ret; connector->interlace_allowed = 1; @@ -1269,6 +1270,24 @@ static int tda998x_connector_init(struct tda998x_priv *priv, if (ret) return ret; + /* + * Some TDA998x are actually two I2C devices merged onto one piece + * of silicon: TDA9989 and TDA19989 combine the HDMI transmitter + * with a slightly modified TDA9950 CEC device. The CEC device + * is at the TDA9950 address, with the address pins strapped across + * to the TDA998x address pins. Hence, it always has the same + * offset. + */ + memset(&cec_info, 0, sizeof(cec_info)); + strlcpy(cec_info.type, "tda9950", sizeof(cec_info.type)); + cec_info.addr = priv->cec_addr; + cec_info.platform_data = &priv->cec_glue; + cec_info.irq = priv->hdmi->irq; + + priv->cec = i2c_new_device(priv->hdmi->adapter, &cec_info); + if (!priv->cec) + return -ENODEV; + drm_connector_attach_encoder(&priv->connector, priv->bridge.encoder); @@ -1658,7 +1677,6 @@ static int tda998x_create(struct device *dev) { struct i2c_client *client = to_i2c_client(dev); struct device_node *np = client->dev.of_node; - struct i2c_board_info cec_info; struct tda998x_priv *priv; u32 video; int rev_lo, rev_hi, ret; @@ -1783,32 +1801,13 @@ static int tda998x_create(struct device *dev) } priv->cec_glue.parent = dev; + priv->cec_glue.connector = &priv->connector; priv->cec_glue.data = priv; priv->cec_glue.init = tda998x_cec_hook_init; priv->cec_glue.exit = tda998x_cec_hook_exit; priv->cec_glue.open = tda998x_cec_hook_open; priv->cec_glue.release = tda998x_cec_hook_release; - /* - * Some TDA998x are actually two I2C devices merged onto one piece - * of silicon: TDA9989 and TDA19989 combine the HDMI transmitter - * with a slightly modified TDA9950 CEC device. The CEC device - * is at the TDA9950 address, with the address pins strapped across - * to the TDA998x address pins. Hence, it always has the same - * offset. - */ - memset(&cec_info, 0, sizeof(cec_info)); - strlcpy(cec_info.type, "tda9950", sizeof(cec_info.type)); - cec_info.addr = priv->cec_addr; - cec_info.platform_data = &priv->cec_glue; - cec_info.irq = client->irq; - - priv->cec = i2c_new_device(client->adapter, &cec_info); - if (!priv->cec) { - ret = -ENODEV; - goto fail; - } - /* enable EDID read irq: */ reg_set(priv, REG_INT_FLAGS_2, INT_FLAGS_2_EDID_BLK_RD); diff --git a/include/linux/platform_data/tda9950.h b/include/linux/platform_data/tda9950.h index c65efd461102e..7e6893bad03a2 100644 --- a/include/linux/platform_data/tda9950.h +++ b/include/linux/platform_data/tda9950.h @@ -2,10 +2,12 @@ #define LINUX_PLATFORM_DATA_TDA9950_H struct device; +struct drm_connector; struct tda9950_glue { struct device *parent; unsigned long irq_flags; + const struct drm_connector *connector; void *data; int (*init)(void *); void (*exit)(void *);