From patchwork Mon Jan 9 08:40:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pin-yen Lin X-Patchwork-Id: 40707 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp2043018wrt; Mon, 9 Jan 2023 00:44:21 -0800 (PST) X-Google-Smtp-Source: AMrXdXvXEjg4i2byEflbtp2OABDqzxf2ERkuaZgBU9G3l9TCVLeNwMJ/kqES6ah4dP5+11fILtZe X-Received: by 2002:aa7:cd49:0:b0:497:d8ea:d79c with SMTP id v9-20020aa7cd49000000b00497d8ead79cmr7621215edw.27.1673253861677; Mon, 09 Jan 2023 00:44:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673253861; cv=none; d=google.com; s=arc-20160816; b=bZw2P1Ltk6UepJxmwkLaeL2kuUF84i/+OCf0N1O8REEM5rH07yAmsXw3Jh8bu8mq31 lr4QROG7pYkpIUYuXHn2fxxvPOICGnnamxFUyayVvxMsbFbZnNOEkoBl7iwyNQQ3AfaA nPM6h1HDwDKNaCbHL/pHZNLHHv7lUyCEJbiPPSwW4UlXJLwVLA43dVIaODEhOWIriDfH eHqO3uuIk7YFA7YC4sGlWNrymzOLk0atP4vXcuCObblLR2sGQe+MSesxNnbf9pnIfwKO FTGSf2r25MkQ9QIw+eWtcR+ncw+qYF7Vk7L+Q0w2OCc1afmeaYOTDLXl2kbFNaGsOpAy 08pQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=cbxRbyImpevpLcgNpmQRY5xjXofgzVP7nhTUY2hiItA=; b=HUWQmRjKuvLxHHmxqgS81UHVvNzWCOIgQ6pLnJ2OVWMDp1TQ6Xzw2COe79Begp2qpS oc9Ys+o2JOvGmBxCLlMxhvMhCdGa+HCx7dgwZUs6LXiohmi/QUSqOkVVPVQo2OR1GfkT zizJEsjfEAO0GJMjbJpn18KHnjDMGEhs1fuBn+9PWHtV3eQYM+7OG4O/IGjc4iFOqX9b WZuB6JvA339WNG54lHzwjhCuGzD+HT68QRm2AQitdJNnMQ/9h9e4v/CWlEjO5nd7Ef4A IyoMsHXkV01wWNoQ2oiUrIsgmSHj0pkmE/jvHmOp8nHzGeMjbZF+2ftv65E8yoyKdrdp 2K/Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=JTe1mK8G; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id z16-20020a056402275000b00483b197bbe2si11453470edd.122.2023.01.09.00.43.56; Mon, 09 Jan 2023 00:44:21 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=JTe1mK8G; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236787AbjAIImP (ORCPT + 99 others); Mon, 9 Jan 2023 03:42:15 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50600 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236756AbjAIIlT (ORCPT ); Mon, 9 Jan 2023 03:41:19 -0500 Received: from mail-pl1-x62c.google.com (mail-pl1-x62c.google.com [IPv6:2607:f8b0:4864:20::62c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7A65C13F79 for ; Mon, 9 Jan 2023 00:41:16 -0800 (PST) Received: by mail-pl1-x62c.google.com with SMTP id d15so8754377pls.6 for ; Mon, 09 Jan 2023 00:41:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=cbxRbyImpevpLcgNpmQRY5xjXofgzVP7nhTUY2hiItA=; b=JTe1mK8GkkIlmmdn3zdW5Zhz8+tYp6rDTDe7qfwfWgAIPBtzdSsCHsOV1Nbm+8zBsw 8tI5IoTY+/uiECZQbLoMs4vXnTjvxlQQYuVpVavOAPFMv0OzkqlaOjQjOw4sIM5XuGIu Cz+yvra84/M3rWGvLOTPgVyRjkiQE6K+4GO8M= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=cbxRbyImpevpLcgNpmQRY5xjXofgzVP7nhTUY2hiItA=; b=DU2/s4MTCKNYNs2gp6WFB+6pRJVZ9p5NNpcycFAOYFBidbhjXVxtXpGq4Z2qLAyqV/ 4C2OJ61G4VxuMHP8m1VqJrWXySec46CzoyuL1pLBQC8OcfWcGZKyDs3qrxye65c0EyIp zc4KJNGqqTafpPI5FHC47bgKVMAoGon6igioX1tKP7L1lmupAbNKUDexW0q29fXDsQEr gqLq1GqMGUbajF86RJN+P3w2v8/MjQS55KrIAwzTDrc/H9tZPECgame2owgygM6z6IlG TZkg1OP26u1aYpKNAOOzs95HLXDyn9L52cz4gvt4mH+odb3W/lxj0hR0pQkUy3x/52w+ cH8A== X-Gm-Message-State: AFqh2kqonYMOauaM7TFR2vBOy22Cr3coC9mE2O0GqfZhq/2sfaFub+Pd CkZGPJVu/dOJ3SnMJ15eWH2kAA== X-Received: by 2002:a17:902:7c07:b0:193:bec:2122 with SMTP id x7-20020a1709027c0700b001930bec2122mr10562144pll.32.1673253676037; Mon, 09 Jan 2023 00:41:16 -0800 (PST) Received: from treapking.tpe.corp.google.com ([2401:fa00:1:10:801:a736:715:9a15]) by smtp.gmail.com with ESMTPSA id c14-20020a170902d48e00b00186acb14c4asm5568119plg.67.2023.01.09.00.41.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Jan 2023 00:41:15 -0800 (PST) From: Pin-yen Lin To: Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , David Airlie , Daniel Vetter , Rob Herring , Krzysztof Kozlowski , Andy Shevchenko , Daniel Scally , Heikki Krogerus , Sakari Ailus , Greg Kroah-Hartman , "Rafael J . Wysocki" , Prashant Malani , Benson Leung , Guenter Roeck Cc: Hsin-Yi Wang , Pin-yen Lin , dri-devel@lists.freedesktop.org, Marek Vasut , Stephen Boyd , AngeloGioacchino Del Regno , Xin Ji , linux-acpi@vger.kernel.org, devicetree@vger.kernel.org, chrome-platform@lists.linux.dev, Thomas Zimmermann , Allen Chen , Javier Martinez Canillas , Lyude Paul , =?utf-8?q?N=C3=ADcolas_F_=2E_R_=2E_A_=2E_Prado?= , linux-kernel@vger.kernel.org Subject: [PATCH v9 1/9] device property: Add remote endpoint to devcon matcher Date: Mon, 9 Jan 2023 16:40:53 +0800 Message-Id: <20230109084101.265664-2-treapking@chromium.org> X-Mailer: git-send-email 2.39.0.314.g84b9a713c41-goog In-Reply-To: <20230109084101.265664-1-treapking@chromium.org> References: <20230109084101.265664-1-treapking@chromium.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1754533841236994605?= X-GMAIL-MSGID: =?utf-8?q?1754533841236994605?= From: Prashant Malani When searching the device graph for device matches, check the remote-endpoint itself for a match. Some drivers register devices for individual endpoints. This allows the matcher code to evaluate those for a match too, instead of only looking at the remote parent devices. This is required when a device supports two mode switches in its endpoints, so we can't simply register the mode switch with the parent node. Signed-off-by: Prashant Malani Signed-off-by: Pin-yen Lin Reviewed-by: Chen-Yu Tsai Tested-by: Chen-Yu Tsai --- (no changes since v6) Changes in v6: - New in v6 drivers/base/property.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/drivers/base/property.c b/drivers/base/property.c index 2a5a37fcd998..48877af4e444 100644 --- a/drivers/base/property.c +++ b/drivers/base/property.c @@ -1223,6 +1223,21 @@ static unsigned int fwnode_graph_devcon_matches(struct fwnode_handle *fwnode, break; } + /* + * Some drivers may register devices for endpoints. Check + * the remote-endpoints for matches in addition to the remote + * port parent. + */ + node = fwnode_graph_get_remote_endpoint(ep); + if (fwnode_device_is_available(node)) { + ret = match(node, con_id, data); + if (ret) { + if (matches) + matches[count] = ret; + count++; + } + } + node = fwnode_graph_get_remote_port_parent(ep); if (!fwnode_device_is_available(node)) { fwnode_handle_put(node); From patchwork Mon Jan 9 08:40:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pin-yen Lin X-Patchwork-Id: 40703 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp2042696wrt; Mon, 9 Jan 2023 00:43:09 -0800 (PST) X-Google-Smtp-Source: AMrXdXt2pp66B0+6pHTc5G+MAdVFgzNz4Q/y1tGZFIDa1RugXjIqSVIKJlxQRHymLSn9MkSi1ua3 X-Received: by 2002:a17:906:36c5:b0:829:594c:8ec8 with SMTP id b5-20020a17090636c500b00829594c8ec8mr50154602ejc.29.1673253789798; Mon, 09 Jan 2023 00:43:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673253789; cv=none; d=google.com; s=arc-20160816; b=yOLIdykiD4O0t29rhusNMOLDhezrTZ8bVwPnMnZmSoCVdV88WfBGwAOiZ720hRIqNO d1MCmORhoSuT150o2gU6khEsZxIqJeVzU96c9b9SbOjo4rzX8iJSvJ244afblkfJCWCA WDuRTKlWJb/5EPtckgLI+I0idF+4vEY3MJmCLXTgBEooq8UZVig7+FvJULdKnrkSN26e TR0cy+k38+v48Jnz/J87pQ3rBWlD8Z6KOyDtJPMVaWsY2t44pV3uG/p1y5KZaoPPnh8g S2cXxoOM1YVCbDhur59iSSxVxp4/NAmfqJWG2lnpe63XGk97OoWSNeWJ/nO1caEJkjbO 0kxA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=nT9gdnbLGuBpWnVg5M2Oo4GmVRIc3FKsY2Rh+Wszh3E=; b=vL24Lnf1E3JRj0MhOLXhk7l73dDwRaeIYKq0+QQu0iYRKLqZigYqN4kIZY7Q9ULe5h YHo7EaAiVhv4NvtciRijA6UZYucmuZmtju2hVACCipXbY1Zc5wRnbuHZrV9IQdAOnjyC d0nBWoDjPSQcNxmy15ZCR9fivvXpyljbn5btnlEp+JFAH9kHGsmXcbRQq4A3KpNFy1h0 9pPd4HNt7/Z87P0CSLRMrBYqFPePvCa8Ye/fPLAISuEi/hHutQY+rmBfh1raXP3Rkg0R p5AyVV2U+MhbZEDKE6tVnAYJCY51q0iNs/gHSGqfXfGOZYzYSrrBoCiC0pF7yNhYq29A 4dAw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=jfnx8H2a; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id va28-20020a17090711dc00b007addbdb9fbbsi6509223ejb.558.2023.01.09.00.42.47; Mon, 09 Jan 2023 00:43:09 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=jfnx8H2a; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236723AbjAIImJ (ORCPT + 99 others); Mon, 9 Jan 2023 03:42:09 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50422 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236769AbjAIIlX (ORCPT ); Mon, 9 Jan 2023 03:41:23 -0500 Received: from mail-pj1-x1035.google.com (mail-pj1-x1035.google.com [IPv6:2607:f8b0:4864:20::1035]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 41EE4E038 for ; Mon, 9 Jan 2023 00:41:22 -0800 (PST) Received: by mail-pj1-x1035.google.com with SMTP id bj3so4807944pjb.0 for ; Mon, 09 Jan 2023 00:41:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=nT9gdnbLGuBpWnVg5M2Oo4GmVRIc3FKsY2Rh+Wszh3E=; b=jfnx8H2ayZ5mO308ZdpUhVJ+B89s7VdqO305IUVxBNCGj3p+83RjoM4kBlJA4lOH1h SIfG/GdKoex8f1/sGihST+zMmkIfKiaYU1MMKj+Ga+YxUbR4CZiBIxQpL6j+SOv3WxEY a0wGAzC/7Xhv73l4kEse/49QZ5DteeDPxerPo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=nT9gdnbLGuBpWnVg5M2Oo4GmVRIc3FKsY2Rh+Wszh3E=; b=DaYJksJoUM7j62rZY9+4emM4A3V+V3xWR6QFJkIrXWvjKsBrUXpwWKl0SxGRYBDXUs oRAsAIiPRgeDKrqn2wqEE1wdeMpKhfZzR1Rj8Au6qT+KPGY2TQ5Eo6UuIsh/khtRS7Nn wbUP2lyhdy1noyf5OPSuAVE6YcPGuR9BMPwVEzixm7fsvxm9BMtHXrWBghMBeT0cLP/q FYbWasaknOwNO3s2aNR5Sq0zAbVJnUIcTj1ew8bnjRvIgJLAzUxJ2ebHtbyFozgizZM9 l+EzB/uOoU/SGk42KI8t6OAvliVIfYhydOIB/NsQdVVj/Hf1f/pmMtWjw05iKkpb7+um sibg== X-Gm-Message-State: AFqh2kpdWVzM7d+85nQOE8qgVobCUgv9Dteb/uKZ3KkJfy5wp9egxJ+I vk1ZIKaMH4Nd3SlpKfoaoao4Dg== X-Received: by 2002:a17:903:2c2:b0:189:c8d9:ed30 with SMTP id s2-20020a17090302c200b00189c8d9ed30mr60564520plk.24.1673253681743; Mon, 09 Jan 2023 00:41:21 -0800 (PST) Received: from treapking.tpe.corp.google.com ([2401:fa00:1:10:801:a736:715:9a15]) by smtp.gmail.com with ESMTPSA id c14-20020a170902d48e00b00186acb14c4asm5568119plg.67.2023.01.09.00.41.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Jan 2023 00:41:21 -0800 (PST) From: Pin-yen Lin To: Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , David Airlie , Daniel Vetter , Rob Herring , Krzysztof Kozlowski , Andy Shevchenko , Daniel Scally , Heikki Krogerus , Sakari Ailus , Greg Kroah-Hartman , "Rafael J . Wysocki" , Prashant Malani , Benson Leung , Guenter Roeck Cc: Hsin-Yi Wang , Pin-yen Lin , dri-devel@lists.freedesktop.org, Marek Vasut , Stephen Boyd , AngeloGioacchino Del Regno , Xin Ji , linux-acpi@vger.kernel.org, devicetree@vger.kernel.org, chrome-platform@lists.linux.dev, Thomas Zimmermann , Allen Chen , Javier Martinez Canillas , Lyude Paul , =?utf-8?q?N=C3=ADcolas_F_=2E_R_=2E_A_=2E_Prado?= , linux-kernel@vger.kernel.org Subject: [PATCH v9 2/9] platform/chrome: cros_ec_typec: Purge blocking switch devlinks Date: Mon, 9 Jan 2023 16:40:54 +0800 Message-Id: <20230109084101.265664-3-treapking@chromium.org> X-Mailer: git-send-email 2.39.0.314.g84b9a713c41-goog In-Reply-To: <20230109084101.265664-1-treapking@chromium.org> References: <20230109084101.265664-1-treapking@chromium.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1754533766247309230?= X-GMAIL-MSGID: =?utf-8?q?1754533766247309230?= From: Prashant Malani When using OF graph, the fw_devlink code will create links between the individual port driver (cros-ec-typec here) and the parent device for a Type-C switch (like mode-switch). Since the mode-switch will in turn have the usb-c-connector (i.e the child of the port driver) as a supplier, fw_devlink will not be able to resolve the cyclic dependency correctly. As a result, the mode-switch driver probe() never runs, so mode-switches are never registered. Because of that, the port driver probe constantly fails with -EPROBE_DEFER, because the Type-C connector class requires all switch devices to be registered prior to port registration. To break this deadlock and allow the mode-switch registration to occur, purge all the usb-c-connector nodes' absent suppliers. This eliminates the connector as a supplier for a switch and allows it to be probed. Signed-off-by: Prashant Malani Signed-off-by: Pin-yen Lin Reviewed-by: Chen-Yu Tsai Tested-by: Chen-Yu Tsai --- (no changes since v7) Changes in v7: - Fix the long comment lines Changes in v6: - New in v6 drivers/platform/chrome/cros_ec_typec.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/platform/chrome/cros_ec_typec.c b/drivers/platform/chrome/cros_ec_typec.c index 2a7ff14dc37e..302474a647cc 100644 --- a/drivers/platform/chrome/cros_ec_typec.c +++ b/drivers/platform/chrome/cros_ec_typec.c @@ -382,6 +382,16 @@ static int cros_typec_init_ports(struct cros_typec_data *typec) return -EINVAL; } + /* + * OF graph may have set up some device links with switches, + * since connectors have their own compatible. Purge these + * to avoid a deadlock in switch probe (the switch mistakenly + * assumes the connector is a supplier). + */ + if (dev_of_node(dev)) + device_for_each_child_node(dev, fwnode) + fw_devlink_purge_absent_suppliers(fwnode); + /* DT uses "reg" to specify port number. */ port_prop = dev->of_node ? "reg" : "port-number"; device_for_each_child_node(dev, fwnode) { From patchwork Mon Jan 9 08:40:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pin-yen Lin X-Patchwork-Id: 40704 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp2042723wrt; Mon, 9 Jan 2023 00:43:15 -0800 (PST) X-Google-Smtp-Source: AMrXdXtkS4cRT8+vhSG6wj2M6DfFh1or7iBWQsg9ytqSCMS27aujL28Anblttu6DwZnD2L0eBdwO X-Received: by 2002:a17:907:6d12:b0:7c1:79f5:9545 with SMTP id sa18-20020a1709076d1200b007c179f59545mr77724421ejc.42.1673253794871; Mon, 09 Jan 2023 00:43:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673253794; cv=none; d=google.com; s=arc-20160816; b=Ys17ujODqQNeGwlZHgbQjLS7EeJPAF1puAukoNAqwT9jT5Z/qnVFZ2NNYpSjeKYM4y Voxzn1j2kJEvqQCLySKUlnpxyX6I53DRhkrmxLoG1V/Y8lM/Y8l3saxVlyPdRuvtt8QC nOkpwgB455lsgS4clTxvvWE41RwMtFbndm0I3MLs7DFJRLbfs7sxwQ6EQApjL4xlYHXH DZwFOiUDinIWmW0W3iUy9dXOaJCpRsXCFbny0zhiK8vcUNpuy9d0ohLqwSpaP9tBgrfd jxBzq0+GdWQYC95Db9Q9CJH4WPieZ8jp8ujQt7kbJT62+i6IKfhrsAd4j5fRlBSiwDD5 kFLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=7MXOYfmNfd9KcAxT0zPGzT8IazJsHl6r6/YGz1PqL0o=; b=V/EEA/zIWg7OzzTxA/l/84u/I+jqJgx9WG3b0ImLXHy2cPUUtv85fs3XSJCtvTLjFH vA6mJd494zdegAnjFBSFIx33OpIpU9Fm7QWCZxq0ERzr/QLhZkvYXBN2taDZ12h9EQZX XSPP9Gicxmopvqs7OZXV6zZhC7fNjaqFrXnIcrn1IBR+6bfIqmkrV1ehabDr8aWQo4sM OkPlHoGeOlcsvIvr/fYBrhdtjbz1WUUA42TgDi+GLUWoPMhbbevUYtHnrOh4FUvqJ53f c55Fxn7wHTOx5/xCAq0c6umW+CTYz1Qe4RenA5PPIHRT9kFhgQdlbm+Oaa9AHLNz42x2 XlIQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b="ha/L8kak"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id gt20-20020a1709072d9400b0078d4c9d77adsi10160434ejc.94.2023.01.09.00.42.51; Mon, 09 Jan 2023 00:43:14 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b="ha/L8kak"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236800AbjAIImS (ORCPT + 99 others); Mon, 9 Jan 2023 03:42:18 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50114 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233844AbjAIIl3 (ORCPT ); Mon, 9 Jan 2023 03:41:29 -0500 Received: from mail-pj1-x102f.google.com (mail-pj1-x102f.google.com [IPv6:2607:f8b0:4864:20::102f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 906981274E for ; Mon, 9 Jan 2023 00:41:28 -0800 (PST) Received: by mail-pj1-x102f.google.com with SMTP id l1-20020a17090a384100b00226f05b9595so6637994pjf.0 for ; Mon, 09 Jan 2023 00:41:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=7MXOYfmNfd9KcAxT0zPGzT8IazJsHl6r6/YGz1PqL0o=; b=ha/L8kak1f9aKvzSGEswK90wmUBWDjlLO+9uca9p8po9lfL+ceRpgn+JdV8CHaynXZ yD4qxhJMMjRew7wlYlDJCMyuKfwOCDGk0JL3OFCXf+fK+FyW5qO7ILcrb05U4mrtvSkH lIeaAmTL+QvB1ZTF8eJzJueDm9+BQmY2stXU4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7MXOYfmNfd9KcAxT0zPGzT8IazJsHl6r6/YGz1PqL0o=; b=tp1ggrQSp/mZG++eQDQDleuxdRm9dG2s0/MwpmF9TAFzJnXMMfqUxmd8htseewp2N6 VHqBuhiOpLUQaDicJf730dRKTQMR0cgdNQKZ3WIiuncxPhUxW4AbY82+ID4RlK7Irbss qfCUV44K1fmSe8KH6yQDkzx6TRqNJduoTS2/6MjjQY1qhIVYSKUYT4X1Q+vJsBWmB+ei TCaFuIJHBpSPygcpYBzsea+jjj/AfeSloOpJAaifTT8V+8vz4KfSduT7K6dFNg0FpYiF 8vG+cwUusf9iTJRiR6a53bwwVmIoeKWxSjHHnMVbz84hz056SZAOgjutpWUUogG/h7ZH 5HgQ== X-Gm-Message-State: AFqh2ko6aFEyFg1k5NbDRf5fpQxWdhN6qCk4Zz0qfPaQjYoaLQJD5qos bCt/vZorpir2iMO+hN/xGQp1uQ== X-Received: by 2002:a17:902:d346:b0:192:9160:6cd with SMTP id l6-20020a170902d34600b00192916006cdmr45511750plk.13.1673253688284; Mon, 09 Jan 2023 00:41:28 -0800 (PST) Received: from treapking.tpe.corp.google.com ([2401:fa00:1:10:801:a736:715:9a15]) by smtp.gmail.com with ESMTPSA id c14-20020a170902d48e00b00186acb14c4asm5568119plg.67.2023.01.09.00.41.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Jan 2023 00:41:28 -0800 (PST) From: Pin-yen Lin To: Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , David Airlie , Daniel Vetter , Rob Herring , Krzysztof Kozlowski , Andy Shevchenko , Daniel Scally , Heikki Krogerus , Sakari Ailus , Greg Kroah-Hartman , "Rafael J . Wysocki" , Prashant Malani , Benson Leung , Guenter Roeck Cc: Hsin-Yi Wang , Pin-yen Lin , dri-devel@lists.freedesktop.org, Marek Vasut , Stephen Boyd , AngeloGioacchino Del Regno , Xin Ji , linux-acpi@vger.kernel.org, devicetree@vger.kernel.org, chrome-platform@lists.linux.dev, Thomas Zimmermann , Allen Chen , Javier Martinez Canillas , Lyude Paul , =?utf-8?q?N=C3=ADcolas_F_=2E_R_=2E_A_=2E_Prado?= , linux-kernel@vger.kernel.org, Douglas Anderson , Imre Deak , Jani Nikula , Jim Cromie , Kees Cook , =?utf-8?b?VmlsbGUgU3lyasOkbMOk?= Subject: [PATCH v9 3/9] drm/display: Add Type-C switch helpers Date: Mon, 9 Jan 2023 16:40:55 +0800 Message-Id: <20230109084101.265664-4-treapking@chromium.org> X-Mailer: git-send-email 2.39.0.314.g84b9a713c41-goog In-Reply-To: <20230109084101.265664-1-treapking@chromium.org> References: <20230109084101.265664-1-treapking@chromium.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1754533771178726026?= X-GMAIL-MSGID: =?utf-8?q?1754533771178726026?= Add helpers to register and unregister Type-C "switches" for bridges capable of switching their output between two downstream devices. The helper registers USB Type-C mode switches when the "mode-switch" and the "data-lanes" properties are available in Device Tree. Signed-off-by: Pin-yen Lin Tested-by: Chen-Yu Tsai Reviewed-by: Chen-Yu Tsai Reviewed-by: AngeloGioacchino Del Regno --- (no changes since v8) Changes in v8: - Fixed the build issue when CONFIG_TYPEC=m - Fixed some style issues Changes in v7: - Extracted the common codes to a helper function - New in v7 drivers/gpu/drm/display/drm_dp_helper.c | 132 ++++++++++++++++++++++++ include/drm/display/drm_dp_helper.h | 16 +++ 2 files changed, 148 insertions(+) diff --git a/drivers/gpu/drm/display/drm_dp_helper.c b/drivers/gpu/drm/display/drm_dp_helper.c index 16565a0a5da6..fb9e23744c08 100644 --- a/drivers/gpu/drm/display/drm_dp_helper.c +++ b/drivers/gpu/drm/display/drm_dp_helper.c @@ -30,11 +30,13 @@ #include #include #include +#include #include #include #include #include +#include #include #include #include @@ -3891,3 +3893,133 @@ int drm_panel_dp_aux_backlight(struct drm_panel *panel, struct drm_dp_aux *aux) EXPORT_SYMBOL(drm_panel_dp_aux_backlight); #endif + +#if IS_REACHABLE(CONFIG_TYPEC) +static int drm_dp_register_mode_switch(struct device *dev, struct device_node *node, + struct drm_dp_typec_switch_desc *switch_desc, + void *data, void *mux_set) +{ + struct drm_dp_typec_port_data *port_data; + struct typec_mux_desc mux_desc = {}; + char name[32]; + u32 dp_lanes[2]; + int ret, num_lanes, port_num = -1; + + num_lanes = drm_of_get_data_lanes_count(node, 0, 2); + if (num_lanes <= 0) { + dev_err(dev, "Error on getting data lanes count: %d\n", + num_lanes); + return num_lanes; + } + + ret = of_property_read_u32_array(node, "data-lanes", dp_lanes, num_lanes); + if (ret) { + dev_err(dev, "Failed to read the data-lanes variable: %d\n", + ret); + return ret; + } + + port_num = dp_lanes[0] / 2; + + port_data = &switch_desc->typec_ports[port_num]; + port_data->data = data; + mux_desc.fwnode = &node->fwnode; + mux_desc.drvdata = port_data; + snprintf(name, sizeof(name), "%s-%u", node->name, port_num); + mux_desc.name = name; + mux_desc.set = mux_set; + + port_data->typec_mux = typec_mux_register(dev, &mux_desc); + if (IS_ERR(port_data->typec_mux)) { + ret = PTR_ERR(port_data->typec_mux); + dev_err(dev, "Mode switch register for port %d failed: %d\n", + port_num, ret); + } + + return ret; +} + +/** + * drm_dp_register_typec_switches() - register Type-C switches + * @dev: Device that registers Type-C switches + * @port: Device node for the switch + * @switch_desc: A Type-C switch descriptor + * @data: Private data for the switches + * @mux_set: Callback function for typec_mux_set + * + * This function registers USB Type-C switches for DP bridges that can switch + * the output signal between their output pins. + * + * Currently only mode switches are implemented, and the function assumes the + * given @port device node has endpoints with "mode-switch" property. + * Register the endpoint as port 0 if the "data-lanes" property falls in 0/1, + * and register it as port 1 if "data-lanes" falls in 2/3. + */ +int drm_dp_register_typec_switches(struct device *dev, struct device_node *port, + struct drm_dp_typec_switch_desc *switch_desc, + void *data, void *mux_set) +{ + struct device_node *sw; + int ret; + + for_each_child_of_node(port, sw) { + if (of_property_read_bool(sw, "mode-switch")) + switch_desc->num_typec_switches++; + } + + if (!switch_desc->num_typec_switches) { + dev_warn(dev, "No Type-C switches node found\n"); + return 0; + } + + switch_desc->typec_ports = devm_kcalloc( + dev, switch_desc->num_typec_switches, + sizeof(struct drm_dp_typec_port_data), GFP_KERNEL); + + if (!switch_desc->typec_ports) + return -ENOMEM; + + /* Register switches for each connector. */ + for_each_child_of_node(port, sw) { + if (!of_property_read_bool(sw, "mode-switch")) + continue; + ret = drm_dp_register_mode_switch(dev, sw, switch_desc, data, mux_set); + if (ret) + goto err_unregister_typec_switches; + } + + return 0; + +err_unregister_typec_switches: + of_node_put(sw); + drm_dp_unregister_typec_switches(switch_desc); + dev_err(dev, "Failed to register mode switch: %d\n", ret); + return ret; +} +EXPORT_SYMBOL(drm_dp_register_typec_switches); + +/** + * drm_dp_unregister_typec_switches() - unregister Type-C switches + * @switch_desc: A Type-C switch descriptor + */ +void drm_dp_unregister_typec_switches(struct drm_dp_typec_switch_desc *switch_desc) +{ + int i; + + for (i = 0; i < switch_desc->num_typec_switches; i++) + typec_mux_unregister(switch_desc->typec_ports[i].typec_mux); +} +EXPORT_SYMBOL(drm_dp_unregister_typec_switches); +#else +void drm_dp_unregister_typec_switches(struct drm_dp_typec_switch_desc *switch_desc) +{ +} +EXPORT_SYMBOL(drm_dp_register_typec_switches); +int drm_dp_register_typec_switches(struct device *dev, struct device_node *port, + struct drm_dp_typec_switch_desc *switch_desc, + void *data, void *mux_set) +{ + return 0; +} +EXPORT_SYMBOL(drm_dp_unregister_typec_switches); +#endif diff --git a/include/drm/display/drm_dp_helper.h b/include/drm/display/drm_dp_helper.h index ab55453f2d2c..fef0a9a0d8ea 100644 --- a/include/drm/display/drm_dp_helper.h +++ b/include/drm/display/drm_dp_helper.h @@ -763,4 +763,20 @@ bool drm_dp_downstream_rgb_to_ycbcr_conversion(const u8 dpcd[DP_RECEIVER_CAP_SIZ const u8 port_cap[4], u8 color_spc); int drm_dp_pcon_convert_rgb_to_ycbcr(struct drm_dp_aux *aux, u8 color_spc); +struct drm_dp_typec_port_data { + struct typec_mux_dev *typec_mux; + void *data; + bool dp_connected; +}; + +struct drm_dp_typec_switch_desc { + int num_typec_switches; + struct drm_dp_typec_port_data *typec_ports; +}; + +void drm_dp_unregister_typec_switches(struct drm_dp_typec_switch_desc *switch_desc); +int drm_dp_register_typec_switches(struct device *dev, struct device_node *port, + struct drm_dp_typec_switch_desc *switch_desc, + void *data, void *mux_set); + #endif /* _DRM_DP_HELPER_H_ */ From patchwork Mon Jan 9 08:40:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pin-yen Lin X-Patchwork-Id: 40708 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp2043019wrt; Mon, 9 Jan 2023 00:44:22 -0800 (PST) X-Google-Smtp-Source: AMrXdXu4IQsi5j4BjrQ2NjAqxYEvaYoYNR3lb7bc+u6PgTyYYF2wFqYHaNDg00tRCSUdIfaG4gGt X-Received: by 2002:a05:6402:321a:b0:48e:a96c:fd6c with SMTP id g26-20020a056402321a00b0048ea96cfd6cmr19330959eda.30.1673253861854; Mon, 09 Jan 2023 00:44:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673253861; cv=none; d=google.com; s=arc-20160816; b=fJCrrTy6TUdBidD2PAfqRhIwtvRlHIx3q2i/UCmbEL3YUykyNIxf2LXnJSVnIQANke puFpRTkjyBeFsgCL4k3xutpE1JbTMY0v1P1ApaqiTWpLhdfAhYb6iylAv9W0Y0PCNv5p pkO1rvvz/XBHlRCIeUJRbvXRrOT2N0GOiKn8d3n5vyRi39RqzuhSZib021r9TQbGNmSR eWJ8WEPkf0e30lhHV+z5eJzI1kYz2U7YD2/Bro5Muo8AY9QdKTJ8VY7btRHgAoWqmGS2 sIEU2lMJPEZovngUKyNdeGLYiSuid6PxfX5DdS5qsDteBSG2wGYZFwPpWOPC9hXcD1Az 8eXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=uFna20PE/rUI5Sa235iAp8jicT42E0rT4PHfQbUtaJI=; b=fLQ4x7GxxSfidw88WGByrrLoGjd4lO8FWQkBCZvfEZIij0QSBD/6Sxi+h4uD0w2mrW NjnYqhuqC0LO5yFMAcFqr4nyEeIA3c/0P1hEHtYLnWe2sZRFxhkDOWcHAQfcxjo4Az17 SDBU4um+leOcmBJhFksxOCOdnIgFgDq/U1m7L0LR3jE2R++UqIlRCZd1c3vny/G1h3b1 HLdswYm3BeBZWSiyFsK1U4j7e4cFBne9ZTZNTGc/MNdHzYBSU5pg5QhpSleHA8SI7S0O 896tY9HiK4vGJ0P6Es2QaVmDNrG020Q1UeDkiKTtOalXo2Lb7DQlkZRTGc9L21II4jfN OYUA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=cm6y7q7u; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id g14-20020a056402090e00b00468eee7250csi9921142edz.510.2023.01.09.00.43.56; Mon, 09 Jan 2023 00:44:21 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=cm6y7q7u; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236747AbjAIImh (ORCPT + 99 others); Mon, 9 Jan 2023 03:42:37 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50348 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236561AbjAIIlf (ORCPT ); Mon, 9 Jan 2023 03:41:35 -0500 Received: from mail-pj1-x1035.google.com (mail-pj1-x1035.google.com [IPv6:2607:f8b0:4864:20::1035]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 78E2E12D0C for ; Mon, 9 Jan 2023 00:41:34 -0800 (PST) Received: by mail-pj1-x1035.google.com with SMTP id bj3so4808331pjb.0 for ; Mon, 09 Jan 2023 00:41:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=uFna20PE/rUI5Sa235iAp8jicT42E0rT4PHfQbUtaJI=; b=cm6y7q7u9np/MZYXb2MEmb48faYX6GC0kteLBUccy2PRS8Jqm3/tVO8lZ3eR8WubYU iV+LNINQIp8PmR01ivK1RMX5M556u9QT1QKXTk8alQa6fRbBqIsv4B1wxvzDoRIAoxrS bPJ6xSlK4NNpC4MIFtMnhj0r1iL/9gupnkO5A= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=uFna20PE/rUI5Sa235iAp8jicT42E0rT4PHfQbUtaJI=; b=3SqiFTdFm3WxR3MS2diKquebk3E79jwpG1qKsZ9dZuvdcTxmourjvbErgEm0GPNOmB y8TXE9hSXdxuykTOYvrD8rAFTMhVxTpBPbwiprxFqTDO3L+aMmKWi2jk2RFaDK8WdIUd UuCYP/piONzjY5v0kybRxHXjEcrWF/xaykqjgOGZnG0B5wcnc8NWVKuAdA8Q2WYO4zyp r+TTRmqLrhCgU0S1BAR7Pcwq6D1fUtGrvbaMeYED7h+N5i6+4Gm4d7ZANcSUxUwBfczD tkjgExV+2+bUPZk6zzxbAlepsARN6OVh5Yx6349zbRoYlPjSOJa3wpuY24MHa1IHOQ01 JijQ== X-Gm-Message-State: AFqh2krO8stW1xe0h/G+otFjvkNm3BHPAm+oGoaIrmzjOCzvOS1tK2MN F8gy4F9CH6neTu6gg84nYlO9pQ== X-Received: by 2002:a17:903:292:b0:188:bd82:2b7c with SMTP id j18-20020a170903029200b00188bd822b7cmr42034236plr.5.1673253694181; Mon, 09 Jan 2023 00:41:34 -0800 (PST) Received: from treapking.tpe.corp.google.com ([2401:fa00:1:10:801:a736:715:9a15]) by smtp.gmail.com with ESMTPSA id c14-20020a170902d48e00b00186acb14c4asm5568119plg.67.2023.01.09.00.41.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Jan 2023 00:41:33 -0800 (PST) From: Pin-yen Lin To: Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , David Airlie , Daniel Vetter , Rob Herring , Krzysztof Kozlowski , Andy Shevchenko , Daniel Scally , Heikki Krogerus , Sakari Ailus , Greg Kroah-Hartman , "Rafael J . Wysocki" , Prashant Malani , Benson Leung , Guenter Roeck Cc: Hsin-Yi Wang , Pin-yen Lin , dri-devel@lists.freedesktop.org, Marek Vasut , Stephen Boyd , AngeloGioacchino Del Regno , Xin Ji , linux-acpi@vger.kernel.org, devicetree@vger.kernel.org, chrome-platform@lists.linux.dev, Thomas Zimmermann , Allen Chen , Javier Martinez Canillas , Lyude Paul , =?utf-8?q?N=C3=ADcolas_F_=2E_R_=2E_A_=2E_Prado?= , linux-kernel@vger.kernel.org, Krzysztof Kozlowski Subject: [PATCH v9 4/9] dt-bindings: display: bridge: anx7625: Add mode-switch support Date: Mon, 9 Jan 2023 16:40:56 +0800 Message-Id: <20230109084101.265664-5-treapking@chromium.org> X-Mailer: git-send-email 2.39.0.314.g84b9a713c41-goog In-Reply-To: <20230109084101.265664-1-treapking@chromium.org> References: <20230109084101.265664-1-treapking@chromium.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1754533841264538267?= X-GMAIL-MSGID: =?utf-8?q?1754533841264538267?= Analogix 7625 can be used in systems to switch the DP traffic between two downstreams, which can be USB Type-C DisplayPort alternate mode lane or regular DisplayPort output ports. Update the binding to accommodate this usage by introducing a data-lanes and a mode-switch property on endpoints. Also include the link to the product brief in the bindings. Signed-off-by: Pin-yen Lin Reviewed-by: Krzysztof Kozlowski Reviewed-by: Chen-Yu Tsai Tested-by: Chen-Yu Tsai Reviewed-by: AngeloGioacchino Del Regno --- Changes in v9: - Collected Reviewed-by tag Changes in v8: - Updated anx7625 bindings for data-lane property - Fixed the subject prefix Changes in v7: - Fixed issues reported by dt_binding_check - Updated the schema and the example dts for data-lanes. - Changed to generic naming for the example dts node. Changes in v6: - Remove switches node and use endpoints and data-lanes property to describe the connections. .../display/bridge/analogix,anx7625.yaml | 99 ++++++++++++++++++- 1 file changed, 96 insertions(+), 3 deletions(-) diff --git a/Documentation/devicetree/bindings/display/bridge/analogix,anx7625.yaml b/Documentation/devicetree/bindings/display/bridge/analogix,anx7625.yaml index 4590186c4a0b..b49a350c40e3 100644 --- a/Documentation/devicetree/bindings/display/bridge/analogix,anx7625.yaml +++ b/Documentation/devicetree/bindings/display/bridge/analogix,anx7625.yaml @@ -12,7 +12,8 @@ maintainers: description: | The ANX7625 is an ultra-low power 4K Mobile HD Transmitter - designed for portable devices. + designed for portable devices. Product brief is available at + https://www.analogix.com/en/system/files/AA-002291-PB-6-ANX7625_ProductBrief.pdf properties: compatible: @@ -112,10 +113,48 @@ properties: data-lanes: true port@1: - $ref: /schemas/graph.yaml#/properties/port + $ref: /schemas/graph.yaml#/$defs/port-base description: Video port for panel or connector. + patternProperties: + "^endpoint@[01]$": + $ref: /schemas/graph.yaml#/$defs/endpoint-base + unevaluatedProperties: false + + properties: + reg: + maxItems: 1 + + remote-endpoint: true + + data-lanes: + oneOf: + - items: + - enum: [0, 1, 2, 3] + + - items: + - const: 0 + - const: 1 + + - items: + - const: 2 + - const: 3 + + - items: + - const: 0 + - const: 1 + - const: 2 + - const: 3 + + mode-switch: + type: boolean + description: Register this node as a Type-C mode switch or not. + + required: + - reg + - remote-endpoint + required: - port@0 - port@1 @@ -164,8 +203,12 @@ examples: }; mipi2dp_bridge_out: port@1 { + #address-cells = <1>; + #size-cells = <0>; + reg = <1>; - anx7625_out: endpoint { + anx7625_out: endpoint@0 { + reg = <0>; remote-endpoint = <&panel_in>; }; }; @@ -186,3 +229,53 @@ examples: }; }; }; + - | + i2c3 { + #address-cells = <1>; + #size-cells = <0>; + + encoder@58 { + compatible = "analogix,anx7625"; + reg = <0x58>; + pinctrl-names = "default"; + pinctrl-0 = <&anx7625_dp_pins>; + enable-gpios = <&pio 176 GPIO_ACTIVE_HIGH>; + reset-gpios = <&pio 177 GPIO_ACTIVE_HIGH>; + vdd10-supply = <&pp1100_dpbrdg>; + vdd18-supply = <&pp1800_dpbrdg_dx>; + vdd33-supply = <&pp3300_dpbrdg_dx>; + analogix,audio-enable; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + anx7625_dp_in: endpoint { + bus-type = <7>; + remote-endpoint = <&dpi_out>; + }; + }; + + port@1 { + #address-cells = <1>; + #size-cells = <0>; + + reg = <1>; + anx_typec0: endpoint@0 { + reg = <0>; + mode-switch; + data-lanes = <0 1>; + remote-endpoint = <&typec_port0>; + }; + anx_typec1: endpoint@1 { + reg = <1>; + mode-switch; + data-lanes = <2 3>; + remote-endpoint = <&typec_port1>; + }; + }; + }; + }; + }; From patchwork Mon Jan 9 08:40:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pin-yen Lin X-Patchwork-Id: 40712 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp2043275wrt; Mon, 9 Jan 2023 00:45:24 -0800 (PST) X-Google-Smtp-Source: AMrXdXu6fg9An+u9FYnelGdgbpIXZv94ncNLWiUg6LEjymGB7rxJgCoUAzMkgIcNHSvmO4S0sNs7 X-Received: by 2002:a17:907:c99d:b0:7c0:d88b:1695 with SMTP id uj29-20020a170907c99d00b007c0d88b1695mr45484361ejc.55.1673253924681; Mon, 09 Jan 2023 00:45:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673253924; cv=none; d=google.com; s=arc-20160816; b=0rUffhN86uPkNOY8e6n4FpnkR/JHxvdTHol9e2MCPIbm6iZiJ0BxayYLRKCQmKO9A1 YRl4ZAAbxuyeVX83sfWz82lUntEXOTD1/nmEL0UlsBkizYDsbWaF168weQ0jsE909wxp BqrQyoq2FXnxFW10yisPsiC9afc58+vXULgFZHYucl9nrRHJ3EqpZIgdzoCZFBF8Cscn B+ZUnIeTbaIR0sVPpAWRXVyQffytaWpD7qu4jXXSw8cMwJDK4FZEYhLV1ThSrmGcH2O1 0ZSQ2j8zNH+MDhW+rvpIcdY860058Gr0fB4waWIhkrbqlUxfiyB4+eq9Lo7efU1SngI8 BpUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=C65HbTqm4aoCrwDl2BLz1roa80SXzNKa5x0ufot4CrI=; b=FdA6NVLSu/HPwQl1lUPdPJNameLmF7JaCh1G/SqXVwd3OX2MySh5piAXjGiS0Ln3MB Jjvn8yoF1B+T5q4lpV/RQw8Hya/BmSVXrssFW/Ffp/4HnGLlMwgM/j4+1dS/XsAwEt1i 81nvB9KBXJBeg8rcyenT/i1HZjNlYZnF5Je/TS5tZN2EkXzWXko11sxvIH5uHPg33jXM bwrhh5fpR1VaQkhtzVFongwQ+n7zVS4l/HhUnMWiRn3RUm5E5yB2g4LPukhNudV528iG oAijWNvOkSCJP7wXmP4SzvgnTx+htI5MODnz0oayVxnJ0BHewpci3wb3H6Pgqt7+o6hA oZeQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=kwl6+6yN; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ae1-20020a17090725c100b007c4f78e610asi8047778ejc.442.2023.01.09.00.45.01; Mon, 09 Jan 2023 00:45:24 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=kwl6+6yN; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236849AbjAIImY (ORCPT + 99 others); Mon, 9 Jan 2023 03:42:24 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50726 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236618AbjAIIlm (ORCPT ); Mon, 9 Jan 2023 03:41:42 -0500 Received: from mail-pj1-x1032.google.com (mail-pj1-x1032.google.com [IPv6:2607:f8b0:4864:20::1032]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7441DBE00 for ; Mon, 9 Jan 2023 00:41:40 -0800 (PST) Received: by mail-pj1-x1032.google.com with SMTP id z4-20020a17090a170400b00226d331390cso8654640pjd.5 for ; Mon, 09 Jan 2023 00:41:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=C65HbTqm4aoCrwDl2BLz1roa80SXzNKa5x0ufot4CrI=; b=kwl6+6yNvmPlViyGA6MWyvEgFFpOn9l6Nlq4UwNmIoOAW/tQ1PUl3kldt28HENt/hv K8LSxwF+YxZ+5qLVbgwM7KPc0xLVNZotnK6YLa2G8XMn7DseLbTmvOAdJrBWIllrPZP8 P2bdx7qO8wYfxT4hoCXs/0pUlVRoM1vyLOEO8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=C65HbTqm4aoCrwDl2BLz1roa80SXzNKa5x0ufot4CrI=; b=iM1GFitFo6iggjArJH5atQIcW5qZeuk3cEL1+jyyV9FozR4xcZwj+eBCKrd7ioCVjP 1Hf/+mSk6LOMxEw4LKYsUedehzl4zfq7FjKaTSnb1XuZ7MRMHd/8mcKrF2YVVSRPbPPk KhawPBEOeAkuP7733+wI3z8VmZmmPyww5w1ZOmbWUhrL/5pqpAahMsPQklG/aaL4hlxF w0QGTYBj60Ih9dBbGor7IA0We2GW+5INLGU8cLxR5tbbFE2MVpAzFAVvns/xWf5s4m1I UxgB5oJ9QVkUpHSyWTF/4AvXhew95ptyiYFingFnk4zBkOnIQerF9oxK8LkEQ5BHnxp/ o8mQ== X-Gm-Message-State: AFqh2kooWiaPhHf5WG3Ewr3Gas4H/RrlTpOZSSQetw8xcbSivWRVJ9dR DI3mjxkWgbzbeyM3Lj3lXN4JLw== X-Received: by 2002:a17:902:7c07:b0:193:bec:2122 with SMTP id x7-20020a1709027c0700b001930bec2122mr10562741pll.32.1673253700000; Mon, 09 Jan 2023 00:41:40 -0800 (PST) Received: from treapking.tpe.corp.google.com ([2401:fa00:1:10:801:a736:715:9a15]) by smtp.gmail.com with ESMTPSA id c14-20020a170902d48e00b00186acb14c4asm5568119plg.67.2023.01.09.00.41.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Jan 2023 00:41:39 -0800 (PST) From: Pin-yen Lin To: Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , David Airlie , Daniel Vetter , Rob Herring , Krzysztof Kozlowski , Andy Shevchenko , Daniel Scally , Heikki Krogerus , Sakari Ailus , Greg Kroah-Hartman , "Rafael J . Wysocki" , Prashant Malani , Benson Leung , Guenter Roeck Cc: Hsin-Yi Wang , Pin-yen Lin , dri-devel@lists.freedesktop.org, Marek Vasut , Stephen Boyd , AngeloGioacchino Del Regno , Xin Ji , linux-acpi@vger.kernel.org, devicetree@vger.kernel.org, chrome-platform@lists.linux.dev, Thomas Zimmermann , Allen Chen , Javier Martinez Canillas , Lyude Paul , =?utf-8?q?N=C3=ADcolas_F_=2E_R_=2E_A_=2E_Prado?= , linux-kernel@vger.kernel.org Subject: [PATCH v9 5/9] drm/bridge: anx7625: Check for Type-C during panel registration Date: Mon, 9 Jan 2023 16:40:57 +0800 Message-Id: <20230109084101.265664-6-treapking@chromium.org> X-Mailer: git-send-email 2.39.0.314.g84b9a713c41-goog In-Reply-To: <20230109084101.265664-1-treapking@chromium.org> References: <20230109084101.265664-1-treapking@chromium.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1754533907076330698?= X-GMAIL-MSGID: =?utf-8?q?1754533907076330698?= The output port endpoints can be connected to USB-C connectors. Running drm_of_find_panel_or_bridge() with such endpoints leads to a continuous return value of -EPROBE_DEFER, even though there is no panel present. To avoid this, check for the existence of a "mode-switch" property in the port endpoint, and skip panel registration completely if so. Signed-off-by: Pin-yen Lin Reviewed-by: Chen-Yu Tsai Tested-by: Chen-Yu Tsai --- (no changes since v6) Changes in v6: - New in v6 drivers/gpu/drm/bridge/analogix/anx7625.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/bridge/analogix/anx7625.c b/drivers/gpu/drm/bridge/analogix/anx7625.c index b375887e655d..1cf242130b91 100644 --- a/drivers/gpu/drm/bridge/analogix/anx7625.c +++ b/drivers/gpu/drm/bridge/analogix/anx7625.c @@ -1649,7 +1649,7 @@ static int anx7625_get_swing_setting(struct device *dev, static int anx7625_parse_dt(struct device *dev, struct anx7625_platform_data *pdata) { - struct device_node *np = dev->of_node, *ep0; + struct device_node *np = dev->of_node, *ep0, *sw; int bus_type, mipi_lanes; anx7625_get_swing_setting(dev, pdata); @@ -1688,6 +1688,17 @@ static int anx7625_parse_dt(struct device *dev, if (of_property_read_bool(np, "analogix,audio-enable")) pdata->audio_en = 1; + /* + * Don't bother finding a panel if a Type-C `mode-switch` property is + * present in one of the endpoints. + */ + for_each_endpoint_of_node(np, sw) { + if (of_property_read_bool(sw, "mode-switch")) { + of_node_put(sw); + return 0; + } + } + pdata->panel_bridge = devm_drm_of_get_bridge(dev, np, 1, 0); if (IS_ERR(pdata->panel_bridge)) { if (PTR_ERR(pdata->panel_bridge) == -ENODEV) { From patchwork Mon Jan 9 08:40:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pin-yen Lin X-Patchwork-Id: 40711 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp2043263wrt; Mon, 9 Jan 2023 00:45:21 -0800 (PST) X-Google-Smtp-Source: AMrXdXvdnrt8kPFADjAomvapXMIl1R5OjoOnXZx/KFV1mzPaCU4ndpZoHdralTtzvaAq1yvlSic0 X-Received: by 2002:a17:906:8d03:b0:83f:743e:86d with SMTP id rv3-20020a1709068d0300b0083f743e086dmr14390640ejc.14.1673253921389; Mon, 09 Jan 2023 00:45:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673253921; cv=none; d=google.com; s=arc-20160816; b=rkXfubDjOOw+pTbiWL+zIcL/HDHTVl+WLsyBgGOk5T+ZuU86IGnuAObOscmeufppT/ wAtiM9vft6kZhIcrd5gvQlYqfm15cXAWxwB5Ea3inZpDSvoxeNP4wRwYUC8oQ9Ku7XLw FFTVQuFWTNQ2zRU7B3ZRAMtHGbw03++U4fWOM/QLiIOdBGQpf3h3gzTmOr/8Rt1qihuS /6wUcrRI/2LgMlnBnJoWyhV0i4qW1wLOFjtGQtmmX7nmYB4HxnWzyKg1jL+tMCW/ln/J fS0Mz17F4UkQVsKIuiCARwBoxZU8MOCEV86CGcZsuqqc4jv5IRG+aBegt5JkgExjAh9v F0rA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=pb08j6ef/XKfmfzrAl6D47q85iNk8V/i2frcck8touc=; b=U9Ge0Np7ZnquICZVeBJGtJy4ytS1qqM6ma1oOwyHZ2kBtiT37mZgLslyCPyrxJKS+7 2GNO9fSCOLlPGMhmW78/SjAuZi1KV+/xFaJXmqhziJpfKv/ORtWsRfx42vrf8Qo9fmEZ oEEyG+vmHvCaXMxzWJx6wAjXwcxA24D3karcsQg1ToxZvmn8RoyIBC8u14U3NgktOKUM pN5kkB0TJF7kJ6fc32FK6J0A+ak4ov3Vfm0tfA9CnkLyAgA/fYAviP5RdAbdL4iAwK6H csn4cx6vwurJ/znYcv3Oo/V9pwQuIiGc3Yxdd7kIGy1e5VNj6kjO8LkWoNOiyK4uonEc 8l9Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=MiVxoQSU; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id go44-20020a1709070dac00b0084d45631a5dsi3106852ejc.587.2023.01.09.00.44.57; Mon, 09 Jan 2023 00:45:21 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=MiVxoQSU; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236818AbjAIImU (ORCPT + 99 others); Mon, 9 Jan 2023 03:42:20 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50746 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236621AbjAIIls (ORCPT ); Mon, 9 Jan 2023 03:41:48 -0500 Received: from mail-pj1-x1030.google.com (mail-pj1-x1030.google.com [IPv6:2607:f8b0:4864:20::1030]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A61782DEC for ; Mon, 9 Jan 2023 00:41:46 -0800 (PST) Received: by mail-pj1-x1030.google.com with SMTP id cp9-20020a17090afb8900b00226a934e0e5so10613905pjb.1 for ; Mon, 09 Jan 2023 00:41:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=pb08j6ef/XKfmfzrAl6D47q85iNk8V/i2frcck8touc=; b=MiVxoQSUT4BLSH84iXxfTlqP+k1eqaWKGRYJgm2kD6UxBD1ZSeXDJ9ExFKfjJY0s/m CLvE5LJJpQFQaEW1vKSr0kEf7eHHY/Q9+qd5gVU7jpdY/cb40/cmILjfmAvrgE7vchJv 5ElNKDGGR0oy9SO/LoXUgxvspkpPIJWeobDTA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=pb08j6ef/XKfmfzrAl6D47q85iNk8V/i2frcck8touc=; b=UV6Gxd5YYxZ8Mqax3XLUjoYhdTbTGNhnPCh/ix0w4U2IwOx01c3hqtgN13hAEiS3rP AB+SGFXEmF/+z+Ln4LC281ktKYGrK/ZJ95ooCQlUvncCJ2EuGIX9eqrw+QYBD1Jvgy5o y3YFKZ38YAvmZdpMAuNhJiEkMepHtxNSqiY7fF9tQweSZkGa5gecrDdCoRihGbhdM1DV ui4bDMjNhgzn+D8OtYhxg1wo8PEVvhRVplo8Jj/zH5uus8KL97Sl7OwDnobgoC4GE5Xc oRlcn28sfTC6zO1PNcRVdu1WU/XdVU2+QLGXdW1j8MdkFDuRcZi7hHahG/oZ7hWe7ZNa ihNw== X-Gm-Message-State: AFqh2kp/oyKVtyOAnAd9NvUL93IMGACSKbVAowB92tXKqKfnAr3tPNkd pCB3+sf1res34h2+j2wgeqL2wA== X-Received: by 2002:a17:903:110d:b0:189:89e2:5406 with SMTP id n13-20020a170903110d00b0018989e25406mr110196313plh.24.1673253706139; Mon, 09 Jan 2023 00:41:46 -0800 (PST) Received: from treapking.tpe.corp.google.com ([2401:fa00:1:10:801:a736:715:9a15]) by smtp.gmail.com with ESMTPSA id c14-20020a170902d48e00b00186acb14c4asm5568119plg.67.2023.01.09.00.41.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Jan 2023 00:41:45 -0800 (PST) From: Pin-yen Lin To: Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , David Airlie , Daniel Vetter , Rob Herring , Krzysztof Kozlowski , Andy Shevchenko , Daniel Scally , Heikki Krogerus , Sakari Ailus , Greg Kroah-Hartman , "Rafael J . Wysocki" , Prashant Malani , Benson Leung , Guenter Roeck Cc: Hsin-Yi Wang , Pin-yen Lin , dri-devel@lists.freedesktop.org, Marek Vasut , Stephen Boyd , AngeloGioacchino Del Regno , Xin Ji , linux-acpi@vger.kernel.org, devicetree@vger.kernel.org, chrome-platform@lists.linux.dev, Thomas Zimmermann , Allen Chen , Javier Martinez Canillas , Lyude Paul , =?utf-8?q?N=C3=ADcolas_F_=2E_R_=2E_A_=2E_Prado?= , linux-kernel@vger.kernel.org, =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= Subject: [PATCH v9 6/9] drm/bridge: anx7625: Register Type C mode switches Date: Mon, 9 Jan 2023 16:40:58 +0800 Message-Id: <20230109084101.265664-7-treapking@chromium.org> X-Mailer: git-send-email 2.39.0.314.g84b9a713c41-goog In-Reply-To: <20230109084101.265664-1-treapking@chromium.org> References: <20230109084101.265664-1-treapking@chromium.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1754533903836655339?= X-GMAIL-MSGID: =?utf-8?q?1754533903836655339?= Register USB Type-C mode switches when the "mode-switch" property and relevant port are available in Device Tree. Configure the crosspoint switch based on the entered alternate mode for a specific Type-C connector. Signed-off-by: Pin-yen Lin Tested-by: Chen-Yu Tsai --- (no changes since v7) Changes in v7: - Fixed style issues in anx7625 driver - Removed DT property validation in anx7625 driver. - Extracted common codes to another commit. Changes in v6: - Squashed to a single patch drivers/gpu/drm/bridge/analogix/Kconfig | 1 + drivers/gpu/drm/bridge/analogix/anx7625.c | 88 +++++++++++++++++++++++ drivers/gpu/drm/bridge/analogix/anx7625.h | 13 ++++ 3 files changed, 102 insertions(+) diff --git a/drivers/gpu/drm/bridge/analogix/Kconfig b/drivers/gpu/drm/bridge/analogix/Kconfig index 173dada218ec..992b43ed1dd7 100644 --- a/drivers/gpu/drm/bridge/analogix/Kconfig +++ b/drivers/gpu/drm/bridge/analogix/Kconfig @@ -34,6 +34,7 @@ config DRM_ANALOGIX_ANX7625 tristate "Analogix Anx7625 MIPI to DP interface support" depends on DRM depends on OF + depends on TYPEC || TYPEC=n select DRM_DISPLAY_DP_HELPER select DRM_DISPLAY_HDCP_HELPER select DRM_DISPLAY_HELPER diff --git a/drivers/gpu/drm/bridge/analogix/anx7625.c b/drivers/gpu/drm/bridge/analogix/anx7625.c index 1cf242130b91..2bb504a8d789 100644 --- a/drivers/gpu/drm/bridge/analogix/anx7625.c +++ b/drivers/gpu/drm/bridge/analogix/anx7625.c @@ -15,6 +15,8 @@ #include #include #include +#include +#include #include #include @@ -2572,6 +2574,86 @@ static void anx7625_runtime_disable(void *data) pm_runtime_disable(data); } +static void anx7625_set_crosspoint_switch(struct anx7625_data *ctx, + enum typec_orientation orientation) +{ + if (orientation == TYPEC_ORIENTATION_NORMAL) { + anx7625_reg_write(ctx, ctx->i2c.tcpc_client, TCPC_SWITCH_0, + SW_SEL1_SSRX_RX1 | SW_SEL1_DPTX0_RX2); + anx7625_reg_write(ctx, ctx->i2c.tcpc_client, TCPC_SWITCH_1, + SW_SEL2_SSTX_TX1 | SW_SEL2_DPTX1_TX2); + } else if (orientation == TYPEC_ORIENTATION_REVERSE) { + anx7625_reg_write(ctx, ctx->i2c.tcpc_client, TCPC_SWITCH_0, + SW_SEL1_SSRX_RX2 | SW_SEL1_DPTX0_RX1); + anx7625_reg_write(ctx, ctx->i2c.tcpc_client, TCPC_SWITCH_1, + SW_SEL2_SSTX_TX2 | SW_SEL2_DPTX1_TX1); + } +} + +static void anx7625_typec_two_ports_update(struct anx7625_data *ctx) +{ + struct drm_dp_typec_switch_desc switch_desc = ctx->switch_desc; + /* Check if both ports available and do nothing to retain the current one */ + if (switch_desc.typec_ports[0].dp_connected && switch_desc.typec_ports[1].dp_connected) + return; + + if (switch_desc.typec_ports[0].dp_connected) + anx7625_set_crosspoint_switch(ctx, TYPEC_ORIENTATION_NORMAL); + else if (switch_desc.typec_ports[1].dp_connected) + anx7625_set_crosspoint_switch(ctx, TYPEC_ORIENTATION_REVERSE); +} + +static int anx7625_typec_mux_set(struct typec_mux_dev *mux, + struct typec_mux_state *state) +{ + struct drm_dp_typec_port_data *port_data = typec_mux_get_drvdata(mux); + struct anx7625_data *ctx = (struct anx7625_data *) port_data->data; + struct device *dev = &ctx->client->dev; + struct drm_dp_typec_switch_desc switch_desc = ctx->switch_desc; + bool new_dp_connected, old_dp_connected; + + if (switch_desc.num_typec_switches == 1) + return 0; + + old_dp_connected = switch_desc.typec_ports[0].dp_connected || + switch_desc.typec_ports[1].dp_connected; + + port_data->dp_connected = state->alt && + state->alt->svid == USB_TYPEC_DP_SID && + state->alt->mode == USB_TYPEC_DP_MODE; + + dev_dbg(dev, "mux_set dp_connected: c0=%d, c1=%d\n", + switch_desc.typec_ports[0].dp_connected, switch_desc.typec_ports[1].dp_connected); + + new_dp_connected = switch_desc.typec_ports[0].dp_connected || + switch_desc.typec_ports[1].dp_connected; + + /* dp on, power on first */ + if (!old_dp_connected && new_dp_connected) + pm_runtime_get_sync(dev); + + anx7625_typec_two_ports_update(ctx); + + /* dp off, power off last */ + if (old_dp_connected && !new_dp_connected) + pm_runtime_put_sync(dev); + + return 0; +} + +static void anx7625_unregister_typec_switches(struct anx7625_data *ctx) +{ + drm_dp_unregister_typec_switches(&ctx->switch_desc); +} + +static int anx7625_register_typec_switches(struct device *dev, struct anx7625_data *ctx) +{ + struct device_node *port = of_graph_get_port_by_id(dev->of_node, 1); + + return drm_dp_register_typec_switches(dev, port, &ctx->switch_desc, + ctx, anx7625_typec_mux_set); +} + static int anx7625_i2c_probe(struct i2c_client *client) { struct anx7625_data *platform; @@ -2679,6 +2761,10 @@ static int anx7625_i2c_probe(struct i2c_client *client) if (platform->pdata.intp_irq) queue_work(platform->workqueue, &platform->work); + ret = anx7625_register_typec_switches(dev, platform); + if (ret && ret != -ENODEV) + dev_warn(dev, "Didn't register Type-C switches, err: %d\n", ret); + platform->bridge.funcs = &anx7625_bridge_funcs; platform->bridge.of_node = client->dev.of_node; if (!anx7625_of_panel_on_aux_bus(&client->dev)) @@ -2730,6 +2816,8 @@ static void anx7625_i2c_remove(struct i2c_client *client) drm_bridge_remove(&platform->bridge); + anx7625_unregister_typec_switches(platform); + if (platform->pdata.intp_irq) destroy_workqueue(platform->workqueue); diff --git a/drivers/gpu/drm/bridge/analogix/anx7625.h b/drivers/gpu/drm/bridge/analogix/anx7625.h index 14f33d6be289..38abbd3d6b36 100644 --- a/drivers/gpu/drm/bridge/analogix/anx7625.h +++ b/drivers/gpu/drm/bridge/analogix/anx7625.h @@ -55,6 +55,18 @@ #define HPD_STATUS_CHANGE 0x80 #define HPD_STATUS 0x80 +#define TCPC_SWITCH_0 0xB4 +#define SW_SEL1_DPTX0_RX2 BIT(0) +#define SW_SEL1_DPTX0_RX1 BIT(1) +#define SW_SEL1_SSRX_RX2 BIT(4) +#define SW_SEL1_SSRX_RX1 BIT(5) + +#define TCPC_SWITCH_1 0xB5 +#define SW_SEL2_DPTX1_TX2 BIT(0) +#define SW_SEL2_DPTX1_TX1 BIT(1) +#define SW_SEL2_SSTX_TX2 BIT(4) +#define SW_SEL2_SSTX_TX1 BIT(5) + /******** END of I2C Address 0x58 ********/ /***************************************************************/ @@ -479,6 +491,7 @@ struct anx7625_data { struct drm_connector *connector; struct mipi_dsi_device *dsi; struct drm_dp_aux aux; + struct drm_dp_typec_switch_desc switch_desc; }; #endif /* __ANX7625_H__ */ From patchwork Mon Jan 9 08:40:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pin-yen Lin X-Patchwork-Id: 40709 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp2043069wrt; Mon, 9 Jan 2023 00:44:33 -0800 (PST) X-Google-Smtp-Source: AMrXdXsvI0ftKhaaNS9oA6a3bgQ/EMh61I4/Dc4EwVNkMhSu+MYatt31w81NyLDyVJ9bk/4f+aRY X-Received: by 2002:a17:906:279a:b0:7c1:10b4:4742 with SMTP id j26-20020a170906279a00b007c110b44742mr51949308ejc.55.1673253872965; Mon, 09 Jan 2023 00:44:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673253872; cv=none; d=google.com; s=arc-20160816; b=ZZiU4HZFp8tHoiXN/0vo4+uyzmMjNRz5QpgOEvOPBqPIEnPZMZu6HTbS1CJipTPc18 +x3BNG5AxBTjFIzC1xcrsHPLWkzYQgIdGXMrG/SRiz9p1W9OpXqlH/tt2r1j9NqltZX/ a3Tek/vdTjfTd2GHdBY270JRDsOfaRgq7Y5oRDrx3+a33MT2594rNWyXUes1f3yBuzCj T14+Rt2LZM5jsflGhCQQ5+vawKO0peoxFg8zb8Fb9DVvmPeo07/qlRrHlj/lXUjQEPH1 U3kBW1FYva1jBbSqIiQtaUuvZhaqLbGPTPh/vIqPcMyKsvsDsQw81FH0KDQWPW8jm4nP m9cQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=YuBntEAB46uq9NIQO1VAT8l/nJZs8T0gBPKThJWSv7I=; b=HinMBuQWfWwdddQKlBNYz9FrZe3OuYB9cRauw/0aLoR254ElEIYpNglRpc3nUvus12 KbIt916+VOMPumJfmYKkXSoHxnTd4Oc/dBma4VySSAeDCIU671/jDQYVA5CRQprRInor FY9A5XVXmGCO+x7Fmu2K0eNp+vTw0ymRt1aJl/kAXkCyBRT4d34xXCSaOd87MKEKDytE poBLbnNFq+M6PqkU8/bpHtjjzTrf062Y0Q56IgaMqYpShPDxsBu20v9aBQpHuTcpeSbS AmVL9ADGbG9WtfBLE/+ys7gnZTEmLGPlPBKlWGxpOrgnY6AVB8Dw9NHMmpcVZT/nnf4y jVWg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=iUYEpsOF; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id x4-20020a05640226c400b004988c10c7a8si6367473edd.467.2023.01.09.00.44.08; Mon, 09 Jan 2023 00:44:32 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=iUYEpsOF; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236811AbjAIImr (ORCPT + 99 others); Mon, 9 Jan 2023 03:42:47 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50780 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236641AbjAIIly (ORCPT ); Mon, 9 Jan 2023 03:41:54 -0500 Received: from mail-pl1-x629.google.com (mail-pl1-x629.google.com [IPv6:2607:f8b0:4864:20::629]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9540D263B for ; Mon, 9 Jan 2023 00:41:52 -0800 (PST) Received: by mail-pl1-x629.google.com with SMTP id w3so8766526ply.3 for ; Mon, 09 Jan 2023 00:41:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=YuBntEAB46uq9NIQO1VAT8l/nJZs8T0gBPKThJWSv7I=; b=iUYEpsOFVpkwHqzDy/fjVHkDanLyXPOt1Soq2FK2phFPaJrYQ0ebAJ/74WqZeulXKz byRYe1O+kkr1hb6NxOsEdX9FRk98PV0Fd1Dji04sHauxJwEDbAut7R+pf2Hhw536LOO5 AOieK5jiddKIvazneu/HxDk5eAY+YX+rdPQxg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=YuBntEAB46uq9NIQO1VAT8l/nJZs8T0gBPKThJWSv7I=; b=E5gSrDKDIeY0uRWlItz/2cxsxAYOcKZmJz0W3NNvoGmhhXugj1PbIFNkJNCSSrpn6K MMqfoFu7mIwzQUgu+MfBBb1hhE+sWQwCFtKo7lbioxGbpA9ptwIcnFG2Wmu+QchTupY7 5dH1WtIMxWjQmNdeYvXlezMjazj83tEzZoJYYav4mXBXvT+mITgNEaO9gJX13kvs45cN zsx3TfacjG2xx3BpM5D9Z1voJivCad/hUGz1Jdji7uZaG1yMUsWKvtOuHvNikLCiJNiE 1rz5o9FA+GC0TkSslhpNr0DhUpUt3yDtwyjwn5zFBQsVM0ol5WnWoV3Gt0u8z9R0IONv 7oSA== X-Gm-Message-State: AFqh2kq13ZVc0E8hg47LYkjfyVwDBgqgPNTya5l1Egk8DUevxRotByx3 5APpdCBwQsBdWIo7Dz0eWS3PPw== X-Received: by 2002:a17:902:8208:b0:193:10b9:8fc3 with SMTP id x8-20020a170902820800b0019310b98fc3mr10463870pln.30.1673253712088; Mon, 09 Jan 2023 00:41:52 -0800 (PST) Received: from treapking.tpe.corp.google.com ([2401:fa00:1:10:801:a736:715:9a15]) by smtp.gmail.com with ESMTPSA id c14-20020a170902d48e00b00186acb14c4asm5568119plg.67.2023.01.09.00.41.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Jan 2023 00:41:51 -0800 (PST) From: Pin-yen Lin To: Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , David Airlie , Daniel Vetter , Rob Herring , Krzysztof Kozlowski , Andy Shevchenko , Daniel Scally , Heikki Krogerus , Sakari Ailus , Greg Kroah-Hartman , "Rafael J . Wysocki" , Prashant Malani , Benson Leung , Guenter Roeck Cc: Hsin-Yi Wang , Pin-yen Lin , dri-devel@lists.freedesktop.org, Marek Vasut , Stephen Boyd , AngeloGioacchino Del Regno , Xin Ji , linux-acpi@vger.kernel.org, devicetree@vger.kernel.org, chrome-platform@lists.linux.dev, Thomas Zimmermann , Allen Chen , Javier Martinez Canillas , Lyude Paul , =?utf-8?q?N=C3=ADcolas_F_=2E_R_=2E_A_=2E_Prado?= , linux-kernel@vger.kernel.org Subject: [PATCH v9 7/9] dt-bindings: display: bridge: it6505: Add mode-switch support Date: Mon, 9 Jan 2023 16:40:59 +0800 Message-Id: <20230109084101.265664-8-treapking@chromium.org> X-Mailer: git-send-email 2.39.0.314.g84b9a713c41-goog In-Reply-To: <20230109084101.265664-1-treapking@chromium.org> References: <20230109084101.265664-1-treapking@chromium.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1754533853187262590?= X-GMAIL-MSGID: =?utf-8?q?1754533853187262590?= ITE IT6505 can be used in systems to switch the DP traffic between two downstreams, which can be USB Type-C DisplayPort alternate mode lane or regular DisplayPort output ports. Update the binding to accommodate this usage by introducing a data-lanes and a mode-switch property on endpoints. Signed-off-by: Pin-yen Lin --- Changes in v9: - Fixed subject prefix again - Changed the naming of the example node for it6505 Changes in v8: - Updated bindings for data-lanes property - Fixed subject prefix Changes in v7: - Fixed issues reported by dt_binding_check. - Updated the schema and the example dts for data-lanes. - Changed to generic naming for the example dts node. Changes in v6: - Remove switches node and use endpoints and data-lanes property to describe the connections. .../bindings/display/bridge/ite,it6505.yaml | 93 ++++++++++++++++--- 1 file changed, 82 insertions(+), 11 deletions(-) diff --git a/Documentation/devicetree/bindings/display/bridge/ite,it6505.yaml b/Documentation/devicetree/bindings/display/bridge/ite,it6505.yaml index b16a9d9127dd..94182f131f86 100644 --- a/Documentation/devicetree/bindings/display/bridge/ite,it6505.yaml +++ b/Documentation/devicetree/bindings/display/bridge/ite,it6505.yaml @@ -77,20 +77,43 @@ properties: unevaluatedProperties: false description: Video port for DP output - properties: - endpoint: + patternProperties: + "^endpoint@[01]$": $ref: /schemas/graph.yaml#/$defs/endpoint-base unevaluatedProperties: false properties: + reg: + maxItems: 1 + + remote-endpoint: true + data-lanes: - minItems: 1 - uniqueItems: true - items: - - enum: [ 0, 1 ] - - const: 1 - - const: 2 - - const: 3 + oneOf: + - items: + - enum: [0, 1, 2, 3] + + - items: + - const: 0 + - const: 1 + + - items: + - const: 2 + - const: 3 + + - items: + - const: 0 + - const: 1 + - const: 2 + - const: 3 + + mode-switch: + type: boolean + description: Register this node as a Type-C mode switch or not. + + required: + - reg + - remote-endpoint required: - port@0 @@ -102,7 +125,6 @@ required: - pwr18-supply - interrupts - reset-gpios - - extcon - ports additionalProperties: false @@ -139,8 +161,11 @@ examples: }; port@1 { + #address-cells = <1>; + #size-cells = <0>; reg = <1>; - it6505_out: endpoint { + it6505_out: endpoint@0 { + reg = <0>; remote-endpoint = <&dp_in>; data-lanes = <0 1>; }; @@ -148,3 +173,49 @@ examples: }; }; }; + - | + #include + + i2c { + #address-cells = <1>; + #size-cells = <0>; + + dp-bridge@5c { + compatible = "ite,it6505"; + interrupts = <8 IRQ_TYPE_LEVEL_LOW 8 0>; + reg = <0x5c>; + pinctrl-names = "default"; + pinctrl-0 = <&it6505_pins>; + ovdd-supply = <&mt6366_vsim2_reg>; + pwr18-supply = <&pp1800_dpbrdg_dx>; + reset-gpios = <&pio 177 0>; + + ports { + #address-cells = <1>; + #size-cells = <0>; + port@0 { + reg = <0>; + it6505_dpi_in: endpoint { + remote-endpoint = <&dpi_out>; + }; + }; + port@1 { + #address-cells = <1>; + #size-cells = <0>; + reg = <1>; + ite_typec0: endpoint@0 { + reg = <0>; + mode-switch; + data-lanes = <0 1>; + remote-endpoint = <&typec_port0>; + }; + ite_typec1: endpoint@1 { + reg = <1>; + mode-switch; + data-lanes = <2 3>; + remote-endpoint = <&typec_port1>; + }; + }; + }; + }; + }; From patchwork Mon Jan 9 08:41:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pin-yen Lin X-Patchwork-Id: 40702 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp2042652wrt; Mon, 9 Jan 2023 00:43:00 -0800 (PST) X-Google-Smtp-Source: AMrXdXvVAJy/yHsN4CBJznkwMH10I8xBufx3Ndlenrr26Vrmbhrcc+LgR/X7is9U3eoq2eBVy0F1 X-Received: by 2002:a17:907:bb8b:b0:84d:1f41:1177 with SMTP id xo11-20020a170907bb8b00b0084d1f411177mr9111598ejc.68.1673253780208; Mon, 09 Jan 2023 00:43:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673253780; cv=none; d=google.com; s=arc-20160816; b=X5+JAJap1QEVf0NNO3RlxvbirKkFTBjw20MF5Dljdn5PzU3dazb2tE5W9mTo9dhzkz WFDebAZx7rfYeOzHDSRT7pgTARvvq6Msv2mUvx0qh/2nfDX+Bw/RGrbtOKOiNPmK4sD6 QbjsbMEnB0Q/rlmJhAj23oP9fysMkOJ4JEYyCdItyNqROjzlFyzKklKDe+shawtWoKGq oRdoD1dW6mVoWLNTCNVeM2PkHJa3+/h4H3JjAnZUI7F6KcTZzFARHbqQHvmI9aNRf7Xw i+E8OQXubdCpFn57OFFXf7yJPlczQ3KE4t9KhWRQqBN7vQOAcWJTt82pEYyyFZaEety5 SfAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=jPjxduVrJWs9QjkeXTkdGS+Nv07pQY0+SOufeW3dySQ=; b=TaoEAgD2PDmw3+XnnEvJNbxU9SJcVCGsRlWuucF2X2rUipbsJ6lzEVPu0tIuOaN9ab SihW7Afjqe7oc3TTqmFE2TW0eX5FNla/yfZhIzLni7g/afIC6jPyThUiMvLJ4ZS5GXXW JNgXg4/CddVIY2KSIgBmkTiXI4Fr8xYR/iFpayYy3wmW7wPnmk5XRG31VgmXZ5ILvgxM HMURB/12RQFyqGEBkPeqQ0yrdklE6gcT8UC/SDzDq71z6QztvjTEKyr5JkRJWcJUDzpl rlGT51Tz3gFIv4+BpdcJx+xW2FC7vt6YbD7ErC43gAPTcOXZwh3v+24M0HYgYUW/vaQT UzUA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=RpAYkJOf; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ss2-20020a170907c00200b007c1600359d9si7571622ejc.451.2023.01.09.00.42.36; Mon, 09 Jan 2023 00:43:00 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=RpAYkJOf; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236687AbjAIImD (ORCPT + 99 others); Mon, 9 Jan 2023 03:42:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50804 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236653AbjAIIl6 (ORCPT ); Mon, 9 Jan 2023 03:41:58 -0500 Received: from mail-pj1-x1030.google.com (mail-pj1-x1030.google.com [IPv6:2607:f8b0:4864:20::1030]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2A47C2DEC for ; Mon, 9 Jan 2023 00:41:58 -0800 (PST) Received: by mail-pj1-x1030.google.com with SMTP id w4-20020a17090ac98400b002186f5d7a4cso12100843pjt.0 for ; Mon, 09 Jan 2023 00:41:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=jPjxduVrJWs9QjkeXTkdGS+Nv07pQY0+SOufeW3dySQ=; b=RpAYkJOfA9L7CmmwDu2y3RUT2VZ8BPL5S7CgOAobzmYDX14UbYITzBcCxSqCEKXaj8 L43GAz9HivY57f1AvtG3stC1vtrvt3VmSV+IIvj01lMcS2zMnn+13OsuIuFOeBkKF42T 2CtXmxRkIDsJ+Ehgy/Jpy7gs810xHFExVUPY8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=jPjxduVrJWs9QjkeXTkdGS+Nv07pQY0+SOufeW3dySQ=; b=amYD1Aogv2sJX2u9PqV5w6vQmWE+7KJLNh3k/msbhHdyzorUlRPyLXkeJBxqTx3bze 4GJBDT357dZORBIKKNnv8F2CopXNCBk90nryCT5GRu5Z9WLLoTn+lkDkFUFT1AMc1m7J 8ZS4KRkSK3LkUEhjcvym+YBSWN3KNxqYMSZq2rzOojhdkQ7NaN6p/xMskXqWKZj2HJ/k NviBtTcw8Iu0P+aqnvNPOyScOA52GadXY0Xjsw0l7tSzbKxN56AbA407Lk4jXNEODruB Hg06Irlmw+2ZnYQiyS4KbrXZUAUg+UzIs9zup5fJy9eY/BEqLg7FjgvQYrhumL5NoCAD nqPw== X-Gm-Message-State: AFqh2koQHX1MVEtF0yAas6qwjBci1YPwZUGMi65zZmutOe+wz88pvlcF tYf5ZPAiBWY+xKFsUNs2YnnlFg== X-Received: by 2002:a17:902:da83:b0:189:8425:730d with SMTP id j3-20020a170902da8300b001898425730dmr91679245plx.27.1673253717716; Mon, 09 Jan 2023 00:41:57 -0800 (PST) Received: from treapking.tpe.corp.google.com ([2401:fa00:1:10:801:a736:715:9a15]) by smtp.gmail.com with ESMTPSA id c14-20020a170902d48e00b00186acb14c4asm5568119plg.67.2023.01.09.00.41.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Jan 2023 00:41:57 -0800 (PST) From: Pin-yen Lin To: Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , David Airlie , Daniel Vetter , Rob Herring , Krzysztof Kozlowski , Andy Shevchenko , Daniel Scally , Heikki Krogerus , Sakari Ailus , Greg Kroah-Hartman , "Rafael J . Wysocki" , Prashant Malani , Benson Leung , Guenter Roeck Cc: Hsin-Yi Wang , Pin-yen Lin , dri-devel@lists.freedesktop.org, Marek Vasut , Stephen Boyd , AngeloGioacchino Del Regno , Xin Ji , linux-acpi@vger.kernel.org, devicetree@vger.kernel.org, chrome-platform@lists.linux.dev, Thomas Zimmermann , Allen Chen , Javier Martinez Canillas , Lyude Paul , =?utf-8?q?N=C3=ADcolas_F_=2E_R_=2E_A_=2E_Prado?= , linux-kernel@vger.kernel.org Subject: [PATCH v9 8/9] drm/bridge: it6505: Fix Kconfig indentation Date: Mon, 9 Jan 2023 16:41:00 +0800 Message-Id: <20230109084101.265664-9-treapking@chromium.org> X-Mailer: git-send-email 2.39.0.314.g84b9a713c41-goog In-Reply-To: <20230109084101.265664-1-treapking@chromium.org> References: <20230109084101.265664-1-treapking@chromium.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1754533756097095942?= X-GMAIL-MSGID: =?utf-8?q?1754533756097095942?= Replace the spaces with tab characters in the Kconfig file. Signed-off-by: Pin-yen Lin Reviewed-by: AngeloGioacchino Del Regno --- (no changes since v7) Changes in v7: - New in v7 drivers/gpu/drm/bridge/Kconfig | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/bridge/Kconfig b/drivers/gpu/drm/bridge/Kconfig index 57946d80b02d..737578dd57ed 100644 --- a/drivers/gpu/drm/bridge/Kconfig +++ b/drivers/gpu/drm/bridge/Kconfig @@ -85,19 +85,19 @@ config DRM_FSL_LDB Support for i.MX8MP DPI-to-LVDS on-SoC encoder. config DRM_ITE_IT6505 - tristate "ITE IT6505 DisplayPort bridge" - depends on OF + tristate "ITE IT6505 DisplayPort bridge" + depends on OF select DRM_DISPLAY_DP_HELPER select DRM_DISPLAY_HDCP_HELPER select DRM_DISPLAY_HELPER - select DRM_DP_AUX_BUS - select DRM_KMS_HELPER - select DRM_DP_HELPER - select EXTCON - select CRYPTO - select CRYPTO_HASH - help - ITE IT6505 DisplayPort bridge chip driver. + select DRM_DP_AUX_BUS + select DRM_KMS_HELPER + select DRM_DP_HELPER + select EXTCON + select CRYPTO + select CRYPTO_HASH + help + ITE IT6505 DisplayPort bridge chip driver. config DRM_LONTIUM_LT8912B tristate "Lontium LT8912B DSI/HDMI bridge" From patchwork Mon Jan 9 08:41:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pin-yen Lin X-Patchwork-Id: 40714 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp2043313wrt; Mon, 9 Jan 2023 00:45:29 -0800 (PST) X-Google-Smtp-Source: AMrXdXsygJuKGY5X//i5yer/2Xg3iE/+eYdjZCDmAfrsAWEDiAhIz93WlGGRlIvHPeFBopO3/kUb X-Received: by 2002:a17:906:9f07:b0:7c1:6f0a:a2cf with SMTP id fy7-20020a1709069f0700b007c16f0aa2cfmr57394127ejc.32.1673253929667; Mon, 09 Jan 2023 00:45:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673253929; cv=none; d=google.com; s=arc-20160816; b=ymkBpHkMCp71RrYDVjwbBwKrx7PMbINgwx1HowID9tEUekapvCTmDl7KP0SHiD7F9I xpOJnbnbmxXRc+gavkoC+9XZ8unFqXc96V8UuMwGRnV0IY2RGsuW5c9748b0ENSYE79D o6DTwFRLB87l+/Bkg8dV74EEoKx3oJfJohQcJoJhRr2s+Ja6kZeSFmDybpCH8CgRI1YX 0hsreIE/nqQhRtDp071es4TBUbLqeA6Jea/RsGfFW3tSkCOgS2rd+LHS18h7Z/loblmz nBxdSKa2eLQPgiPL5wZI9ITXBS8QJiMgLk4snOGwrwiilMwsYi3rQrLO/+Ddh7Ul2G/H +fXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=9iAqigrmRtbOwkIjEJ3yqHcs8IpEn5bVcl0Fnp8oBxA=; b=XqFDABX3AAVYCzTz/Lj3B5mt7i5UeE+51bn/2NDqbaDmhgleArvsOFGBNEz8g3j6Jg CiQOHm71XfGsqPEDWAeoIqHuPNhxGuCZWJhgMfSD/qhFs+jpM0bIauGBZiWbl1FvcuFp xOEG8NL9ZFC9eaZXThhaJfo72DQjqePKUG96wRuSw2c9KckqhtgRCqDTkd8yJC4rMjLn hpsoeulIinFVm9JbHOPUjZt3tgP7+iYVAKoyPI4iBWFYh2I/QecgvUYPabXoLuwjnGo3 N9i0SZOQtuG97TkIhV+ycYnf7hTYj+Vv/cp2uhseVWgA0h8B1paGpK0S1U1IyrQGPaY4 H6Pw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=UsXasHbi; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id a16-20020aa7cf10000000b0046351fa4ae2si7735921edy.99.2023.01.09.00.45.06; Mon, 09 Jan 2023 00:45:29 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=UsXasHbi; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236726AbjAIIm4 (ORCPT + 99 others); Mon, 9 Jan 2023 03:42:56 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50976 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234003AbjAIImI (ORCPT ); Mon, 9 Jan 2023 03:42:08 -0500 Received: from mail-pj1-x1029.google.com (mail-pj1-x1029.google.com [IPv6:2607:f8b0:4864:20::1029]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AFA3612D2C for ; Mon, 9 Jan 2023 00:42:03 -0800 (PST) Received: by mail-pj1-x1029.google.com with SMTP id o1-20020a17090a678100b00219cf69e5f0so12061788pjj.2 for ; Mon, 09 Jan 2023 00:42:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=9iAqigrmRtbOwkIjEJ3yqHcs8IpEn5bVcl0Fnp8oBxA=; b=UsXasHbilcmH352bWImADdEHGkeKLDKY8/6LTgkfSwTDOlG3fZbpIS6jGqe5W2B/9D HwQNfa5wSvNFIbxNsyPR7nKuty0ce3XFiUo/sEkI5eyHTPdIPaH0Wq8a3Uuiw44EB3Zs +7SVGSXED0FlrhRmhE2qJO5Z6uIp0t8QNaGF8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9iAqigrmRtbOwkIjEJ3yqHcs8IpEn5bVcl0Fnp8oBxA=; b=Bj95PiKQXExT5kJqkaMoJjr9vIQTZWiPcAdB6Nk3BvtTxbkFTORIylCRkpaS7KFFud kTD//Cvze2kSlntVZtnRxbt13Ms+tqHPGNGy3d5J+33z5RL3O7ymDVDyZpzb1EWrCORv Y9LWcG+e9l3x96wVYTHJNX8VCX5/GpZ6f9e6Kr8ZNS2qSyc83dxaG9DtUqljCUgFqB3S WmTa8MP05K8MSq9uWQ+g1UnUWqdlZlcBshJhBcG5fOxG7RosTHaG5NJmOJzR1l4aPUo7 fgRuodTsB+NGg21atYZyS+e0Wx3Kk9uJCjvx4f18JaFO/rM4MGCC2P5uhYa50Ef3Ba+8 KdUA== X-Gm-Message-State: AFqh2kr16ObCWQmCfkj69ykKcVMYl0PW9qusaMTGtEH7w6iIonyuPT2C 8CWBIk8pXK2e08xwk3FFlVSHAg== X-Received: by 2002:a17:902:6ac6:b0:192:cd8a:f358 with SMTP id i6-20020a1709026ac600b00192cd8af358mr24722274plt.69.1673253723421; Mon, 09 Jan 2023 00:42:03 -0800 (PST) Received: from treapking.tpe.corp.google.com ([2401:fa00:1:10:801:a736:715:9a15]) by smtp.gmail.com with ESMTPSA id c14-20020a170902d48e00b00186acb14c4asm5568119plg.67.2023.01.09.00.41.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Jan 2023 00:42:03 -0800 (PST) From: Pin-yen Lin To: Andrzej Hajda , Neil Armstrong , Robert Foss , Laurent Pinchart , Jonas Karlman , Jernej Skrabec , David Airlie , Daniel Vetter , Rob Herring , Krzysztof Kozlowski , Andy Shevchenko , Daniel Scally , Heikki Krogerus , Sakari Ailus , Greg Kroah-Hartman , "Rafael J . Wysocki" , Prashant Malani , Benson Leung , Guenter Roeck Cc: Hsin-Yi Wang , Pin-yen Lin , dri-devel@lists.freedesktop.org, Marek Vasut , Stephen Boyd , AngeloGioacchino Del Regno , Xin Ji , linux-acpi@vger.kernel.org, devicetree@vger.kernel.org, chrome-platform@lists.linux.dev, Thomas Zimmermann , Allen Chen , Javier Martinez Canillas , Lyude Paul , =?utf-8?q?N=C3=ADcolas_F_=2E_R_=2E_A_=2E_Prado?= , linux-kernel@vger.kernel.org Subject: [PATCH v9 9/9] drm/bridge: it6505: Register Type C mode switches Date: Mon, 9 Jan 2023 16:41:01 +0800 Message-Id: <20230109084101.265664-10-treapking@chromium.org> X-Mailer: git-send-email 2.39.0.314.g84b9a713c41-goog In-Reply-To: <20230109084101.265664-1-treapking@chromium.org> References: <20230109084101.265664-1-treapking@chromium.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1754533912695401672?= X-GMAIL-MSGID: =?utf-8?q?1754533912695401672?= Register USB Type-C mode switches when the "mode-switch" property and relevant port are available in Device Tree. Configure the "lane_swap" state based on the entered alternate mode for a specific Type-C connector, which ends up updating the lane swap registers of the it6505 chip. Signed-off-by: Pin-yen Lin --- (no changes since v7) Changes in v7: - Fixed style issues in it6505 driver - Removed the redundant sleep in it6505 driver - Removed DT property validation in it6505 driver - Rebased to drm-misc-next - Extracted common codes to another commit Changes in v6: - Changed it6505_typec_mux_set callback function to accommodate with the latest drm-misc patches - Changed the driver implementation to accommodate with the new binding - Squashed to a single patch drivers/gpu/drm/bridge/Kconfig | 1 + drivers/gpu/drm/bridge/ite-it6505.c | 119 +++++++++++++++++++++++++++- 2 files changed, 116 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/bridge/Kconfig b/drivers/gpu/drm/bridge/Kconfig index 737578dd57ed..33803f581562 100644 --- a/drivers/gpu/drm/bridge/Kconfig +++ b/drivers/gpu/drm/bridge/Kconfig @@ -87,6 +87,7 @@ config DRM_FSL_LDB config DRM_ITE_IT6505 tristate "ITE IT6505 DisplayPort bridge" depends on OF + depends on TYPEC || TYPEC=n select DRM_DISPLAY_DP_HELPER select DRM_DISPLAY_HDCP_HELPER select DRM_DISPLAY_HELPER diff --git a/drivers/gpu/drm/bridge/ite-it6505.c b/drivers/gpu/drm/bridge/ite-it6505.c index 9cda2df21b88..d9be09e889e2 100644 --- a/drivers/gpu/drm/bridge/ite-it6505.c +++ b/drivers/gpu/drm/bridge/ite-it6505.c @@ -17,6 +17,8 @@ #include #include #include +#include +#include #include #include @@ -28,6 +30,7 @@ #include #include #include +#include #include #include @@ -455,6 +458,7 @@ struct it6505 { struct delayed_work delayed_audio; struct it6505_audio_data audio; struct dentry *debugfs; + struct drm_dp_typec_switch_desc switch_desc; /* it6505 driver hold option */ bool enable_drv_hold; @@ -3346,12 +3350,105 @@ static void it6505_shutdown(struct i2c_client *client) it6505_lane_off(it6505); } +static void it6505_typec_ports_update(struct it6505 *it6505) +{ + struct drm_dp_typec_switch_desc switch_desc = it6505->switch_desc; + + /* Check if both ports available and do nothing to retain the current one */ + if (switch_desc.typec_ports[0].dp_connected && switch_desc.typec_ports[1].dp_connected) + return; + + if (switch_desc.typec_ports[0].dp_connected) + it6505->lane_swap = false; + else if (switch_desc.typec_ports[1].dp_connected) + it6505->lane_swap = true; +} + +static int it6505_typec_mux_set(struct typec_mux_dev *mux, + struct typec_mux_state *state) +{ + struct drm_dp_typec_port_data *port_data = typec_mux_get_drvdata(mux); + struct it6505 *it6505 = (struct it6505 *) port_data->data; + struct device *dev = &it6505->client->dev; + struct drm_dp_typec_switch_desc switch_desc = it6505->switch_desc; + bool old_dp_connected, new_dp_connected; + + if (switch_desc.num_typec_switches == 1) + return 0; + + mutex_lock(&it6505->extcon_lock); + + old_dp_connected = switch_desc.typec_ports[0].dp_connected || + switch_desc.typec_ports[1].dp_connected; + + port_data->dp_connected = state->alt && + state->alt->svid == USB_TYPEC_DP_SID && + state->alt->mode == USB_TYPEC_DP_MODE; + + dev_dbg(dev, "mux_set dp_connected: c0=%d, c1=%d\n", + switch_desc.typec_ports[0].dp_connected, switch_desc.typec_ports[1].dp_connected); + + new_dp_connected = switch_desc.typec_ports[0].dp_connected || + switch_desc.typec_ports[1].dp_connected; + + if (it6505->enable_drv_hold) { + dev_dbg(dev, "enable driver hold\n"); + goto unlock; + } + + it6505_typec_ports_update(it6505); + + if (!old_dp_connected && new_dp_connected) { + int ret = pm_runtime_get_sync(dev); + + /* + * pm_runtime_force_suspend() disables runtime PM when the + * system enters suspend state. But on system resume, mux_set + * can be triggered before pm_runtime_force_resume() re-enables + * runtime PM. This makes the bridge stay powered off if the + * downstream display is connected when the system is suspended. + * Handling the error here to make sure the bridge is powered + * on, and leave the PM runtime usage count incremented so + * the future runtime PM calls is balanced. + */ + if (ret < 0) + it6505_poweron(it6505); + + complete_all(&it6505->extcon_completion); + } + + if (old_dp_connected && !new_dp_connected) { + reinit_completion(&it6505->extcon_completion); + pm_runtime_put_sync(dev); + if (it6505->bridge.dev) + drm_helper_hpd_irq_event(it6505->bridge.dev); + memset(it6505->dpcd, 0, sizeof(it6505->dpcd)); + } + +unlock: + mutex_unlock(&it6505->extcon_lock); + return 0; +} + +static void it6505_unregister_typec_switches(struct it6505 *it6505) +{ + drm_dp_unregister_typec_switches(&it6505->switch_desc); +} + +static int it6505_register_typec_switches(struct device *dev, struct it6505 *it6505) +{ + struct device_node *port = of_graph_get_port_by_id(dev->of_node, 1); + + return drm_dp_register_typec_switches(dev, port, &it6505->switch_desc, + it6505, it6505_typec_mux_set); +} + static int it6505_i2c_probe(struct i2c_client *client) { struct it6505 *it6505; struct device *dev = &client->dev; struct extcon_dev *extcon; - int err, intp_irq; + int err, intp_irq, ret; it6505 = devm_kzalloc(&client->dev, sizeof(*it6505), GFP_KERNEL); if (!it6505) @@ -3371,11 +3468,24 @@ static int it6505_i2c_probe(struct i2c_client *client) if (PTR_ERR(extcon) == -EPROBE_DEFER) return -EPROBE_DEFER; if (IS_ERR(extcon)) { - dev_err(dev, "can not get extcon device!"); - return PTR_ERR(extcon); + if (PTR_ERR(extcon) != -ENODEV) + dev_warn(dev, "Cannot get extcon device: %ld\n", + PTR_ERR(extcon)); + it6505->extcon = NULL; + } else { + it6505->extcon = extcon; } - it6505->extcon = extcon; + ret = it6505_register_typec_switches(dev, it6505); + if (ret) { + if (ret != -ENODEV) + dev_warn(dev, "Didn't register Type-C switches, err: %d\n", + ret); + if (!it6505->extcon) { + dev_err(dev, "Both extcon and typec-switch are not registered.\n"); + return -EINVAL; + } + } it6505->regmap = devm_regmap_init_i2c(client, &it6505_regmap_config); if (IS_ERR(it6505->regmap)) { @@ -3447,6 +3557,7 @@ static void it6505_i2c_remove(struct i2c_client *client) it6505_debugfs_remove(it6505); it6505_poweroff(it6505); it6505_remove_edid(it6505); + it6505_unregister_typec_switches(it6505); } static const struct i2c_device_id it6505_id[] = {