From patchwork Wed Feb 21 08:55:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrzej Hajda X-Patchwork-Id: 10231461 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3E16360209 for ; Wed, 21 Feb 2018 08:56:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 335F628A9B for ; Wed, 21 Feb 2018 08:56:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 27EBC28AA0; Wed, 21 Feb 2018 08:56:34 +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=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id ADF0828A9B for ; Wed, 21 Feb 2018 08:56:33 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 87A106E587; Wed, 21 Feb 2018 08:56:27 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mailout1.w1.samsung.com (mailout1.w1.samsung.com [210.118.77.11]) by gabe.freedesktop.org (Postfix) with ESMTPS id 808166E56C for ; Wed, 21 Feb 2018 08:56:13 +0000 (UTC) Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20180221085611euoutp01b7471ae9dd818730256d838ad27d5662~VS2rmgNVu2444524445euoutp01a; Wed, 21 Feb 2018 08:56:11 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20180221085611euoutp01b7471ae9dd818730256d838ad27d5662~VS2rmgNVu2444524445euoutp01a DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1519203371; bh=e6Hbjyhatxq5yAS7yLiRqxkDLvc1OnleS6HMUxpvsDU=; h=From:To:Cc:Subject:Date:In-reply-to:References:From; b=qUUNPJ5pyCAl8kJ3ac4sZZKiihOw67chnkvEFIV5apAs3adsKwfcKMnCj5UV0IwFe zKT5MEyNqXVRQc8GzgHBY7iajFUndMdF+xFa6NRDDqPHhlBBvWsXfIWgswVqV7PUVo vkWboZoJmhz/CqVJYv+/3kCyo8bge9LcA6/YuxYc= Received: from eusmges3new.samsung.com (unknown [203.254.199.245]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20180221085611eucas1p2441d32fc88a1b0302d41171951e96962~VS2q2yprc2614326143eucas1p2I; Wed, 21 Feb 2018 08:56:11 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges3new.samsung.com (EUCPMTA) with SMTP id 06.DD.10409.A243D8A5; Wed, 21 Feb 2018 08:56:10 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20180221085610eucas1p162a5cf356642e8556f6bc72163c3a5db~VS2p_zQdm2386123861eucas1p1R; Wed, 21 Feb 2018 08:56:10 +0000 (GMT) X-AuditID: cbfec7f5-b5fff700000028a9-f7-5a8d342a28a8 Received: from eusync4.samsung.com ( [203.254.199.214]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id F8.07.04183.A243D8A5; Wed, 21 Feb 2018 08:56:10 +0000 (GMT) Received: from AMDC2768.DIGITAL.local ([106.120.43.17]) by eusync4.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0P4H00IT3STE0I20@eusync4.samsung.com>; Wed, 21 Feb 2018 08:56:09 +0000 (GMT) From: Andrzej Hajda To: devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS) Subject: [PATCH v4 6/6] drm/bridge/sii8620: use micro-USB cable detection logic to detect MHL Date: Wed, 21 Feb 2018 09:55:41 +0100 Message-id: <20180221085541.14556-7-a.hajda@samsung.com> X-Mailer: git-send-email 2.16.1 In-reply-to: <20180221085541.14556-1-a.hajda@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrBIsWRmVeSWpSXmKPExsWy7djP87paJr1RBveealjcWneO1aKp4y2r xcYZ61ktrn95zmox/whQ7MrX92wWk+5PYLE4f34Du0XnxCXsFpseX2O1uLxrDpvFjPP7mCwW LWtltljw8haLxdojd9ktll6/yGTRuvcIu4Ogx5p5axg9Lvf1MnnM7pjJ6rFpVSebx/3u40we m5fUe/RtWcXo8XmTXABHFJdNSmpOZllqkb5dAlfG9/PT2Areq1U03v3E2MDYq9DFyMkhIWAi sedIK0sXIxeHkMAKRom2uTvYIJzPjBIrJs5mgak6tW0BE0RiGaPEpub1UM5/RolDnXuYQarY BDQl/m6+yQZiiwjESry7tIsZpIhZ4BuLxLxZ85lAEsIC8RJf5qxhBbFZBFQlOs//AWvgFbCQ +P38OzPEOnmJw2+awGo4BSwlfu+dBDZIQuAxm8TGz0cZIYpcJJ5sesEKYQtLvDq+hR3ClpG4 PLmbBaKhm1Hi1L5OqO4pjBLnX11mgqiyljh8/CJYN7MAn8SkbdOBijiA4rwSHW1CECUeEjMW X4W6yFHi7qprrBA/9wADYOIk1gmMUgsYGVYxiqeWFuempxYb56WW6xUn5haX5qXrJefnbmIE pofT/45/3cG470/SIUYBDkYlHl4LnZ4oIdbEsuLK3EOMEhzMSiK8lUK9UUK8KYmVValF+fFF pTmpxYcYpTlYlMR54zTqooQE0hNLUrNTUwtSi2CyTBycUg2MG5x2Tt/5Pzt4Z4RYiZ3bvEeS MTuFGaetFj7vJMNadNvko1/G3NSClayrp/GvKmzKPH9N5c7xpKZvwSqbc9dtkf7I66QflPNp 7dOuTA3rexe0Oub+XqG/YIEhm82BCV0K/r4/Vt6Z5lIlsu1Sw+I6xePtq9Y7ely8xLduH7vh P5u1Bna7RUJzlFiKMxINtZiLihMBo9MxPAsDAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrBLMWRmVeSWpSXmKPExsVy+t/xa7paJr1RBo9nMlvcWneO1aKp4y2r xcYZ61ktrn95zmox/whQ7MrX92wWk+5PYLE4f34Du0XnxCXsFpseX2O1uLxrDpvFjPP7mCwW LWtltljw8haLxdojd9ktll6/yGTRuvcIu4Ogx5p5axg9Lvf1MnnM7pjJ6rFpVSebx/3u40we m5fUe/RtWcXo8XmTXABHFJdNSmpOZllqkb5dAlfG9/PT2Areq1U03v3E2MDYq9DFyMkhIWAi cWrbAqYuRi4OIYEljBKrL/xnhHAamSSmT1jABlLFJqAp8XfzTTBbRCBW4u2pz8wgRcwCP1gk rp/cCZYQFoiXePhuFguIzSKgKtF5/g9YnFfAQuL38+/MEOvkJQ6/aWIFsTkFLCV+750EFhcC qvlw7iv7BEaeBYwMqxhFUkuLc9Nzi430ihNzi0vz0vWS83M3MQLDd9uxn1t2MHa9Cz7EKMDB qMTDa6HTEyXEmlhWXJl7iFGCg1lJhLdSqDdKiDclsbIqtSg/vqg0J7X4EKM0B4uSOO95g8oo IYH0xJLU7NTUgtQimCwTB6dUA6MGv0bn4ms5+38q/Z64iZd5fWxS+S9Op/bmEw+NhYuzag9k Ci+bWMYaf6rTx9Gghl//dv/UIpF+9smXPO+vPanNUlS+qXjxNf6Z17YJam8TLzWc1hpw4FRF hdFbg7TT8xfqvdZnOz1doDIt2GXZTdm8SXNuVq03vKA8S9Rbo+KF9rObllNuHFZiKc5INNRi LipOBADFS90CWwIAAA== X-CMS-MailID: 20180221085610eucas1p162a5cf356642e8556f6bc72163c3a5db X-Msg-Generator: CA CMS-TYPE: 201P X-CMS-RootMailID: 20180221085610eucas1p162a5cf356642e8556f6bc72163c3a5db X-RootMTR: 20180221085610eucas1p162a5cf356642e8556f6bc72163c3a5db References: <20180221085541.14556-1-a.hajda@samsung.com> X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , linux-samsung-soc@vger.kernel.org, Laurent Pinchart , Chanwoo Choi , Bartlomiej Zolnierkiewicz , linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Maciej Purski , Rob Herring , Krzysztof Kozlowski , linux-arm-kernel@lists.infradead.org, Marek Szyprowski MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Maciej Purski Currently MHL chip must be turned on permanently to detect MHL cable. It duplicates micro-USB controller's (MUIC) functionality and consumes unnecessary power. Lets use extcon attached to MUIC to enable MHL chip only if it detects MHL cable. Signed-off-by: Maciej Purski Signed-off-by: Andrzej Hajda --- This is rework of the patch by Maciej with following changes: - use micro-USB port bindings to get extcon, instead of extcon property, - fixed remove sequence, - fixed extcon get state logic. Code finding extcon node is hacky IMO, I guess ultimately it should be done via some framework (maybe even extcon), or at least via helper, I hope it can stay as is until the proper solution will be merged. Signed-off-by: Andrzej Hajda --- drivers/gpu/drm/bridge/sil-sii8620.c | 97 ++++++++++++++++++++++++++++++++++-- 1 file changed, 94 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/bridge/sil-sii8620.c b/drivers/gpu/drm/bridge/sil-sii8620.c index 9e785b8e0ea2..565cc352ca81 100644 --- a/drivers/gpu/drm/bridge/sil-sii8620.c +++ b/drivers/gpu/drm/bridge/sil-sii8620.c @@ -17,6 +17,7 @@ #include #include +#include #include #include #include @@ -25,6 +26,7 @@ #include #include #include +#include #include #include @@ -81,6 +83,10 @@ struct sii8620 { struct edid *edid; unsigned int gen2_write_burst:1; enum sii8620_mt_state mt_state; + struct extcon_dev *extcon; + struct notifier_block extcon_nb; + struct work_struct extcon_wq; + int cable_state; struct list_head mt_queue; struct { int r_size; @@ -2175,6 +2181,77 @@ static void sii8620_init_rcp_input_dev(struct sii8620 *ctx) ctx->rc_dev = rc_dev; } +static void sii8620_cable_out(struct sii8620 *ctx) +{ + disable_irq(to_i2c_client(ctx->dev)->irq); + sii8620_hw_off(ctx); +} + +static void sii8620_extcon_work(struct work_struct *work) +{ + struct sii8620 *ctx = + container_of(work, struct sii8620, extcon_wq); + int state = extcon_get_state(ctx->extcon, EXTCON_DISP_MHL); + + if (state == ctx->cable_state) + return; + + ctx->cable_state = state; + + if (state > 0) + sii8620_cable_in(ctx); + else + sii8620_cable_out(ctx); +} + +static int sii8620_extcon_notifier(struct notifier_block *self, + unsigned long event, void *ptr) +{ + struct sii8620 *ctx = + container_of(self, struct sii8620, extcon_nb); + + schedule_work(&ctx->extcon_wq); + + return NOTIFY_DONE; +} + +static int sii8620_extcon_init(struct sii8620 *ctx) +{ + struct extcon_dev *edev; + struct device_node *musb, *muic; + int ret; + + /* get micro-USB connector node */ + musb = of_graph_get_remote_node(ctx->dev->of_node, 1, -1); + /* next get micro-USB Interface Controller node */ + muic = of_get_next_parent(musb); + + if (!muic) { + dev_info(ctx->dev, "no extcon found, switching to 'always on' mode\n"); + return 0; + } + + edev = extcon_get_edev_by_of_node(muic); + of_node_put(muic); + if (IS_ERR(edev)) { + if (PTR_ERR(edev) == -EPROBE_DEFER) + return -EPROBE_DEFER; + dev_err(ctx->dev, "Invalid or missing extcon\n"); + return PTR_ERR(edev); + } + + ctx->extcon = edev; + ctx->extcon_nb.notifier_call = sii8620_extcon_notifier; + INIT_WORK(&ctx->extcon_wq, sii8620_extcon_work); + ret = extcon_register_notifier(edev, EXTCON_DISP_MHL, &ctx->extcon_nb); + if (ret) { + dev_err(ctx->dev, "failed to register notifier for MHL\n"); + return ret; + } + + return 0; +} + static inline struct sii8620 *bridge_to_sii8620(struct drm_bridge *bridge) { return container_of(bridge, struct sii8620, bridge); @@ -2307,13 +2384,20 @@ static int sii8620_probe(struct i2c_client *client, if (ret) return ret; + ret = sii8620_extcon_init(ctx); + if (ret < 0) { + dev_err(ctx->dev, "failed to initialize EXTCON\n"); + return ret; + } + i2c_set_clientdata(client, ctx); ctx->bridge.funcs = &sii8620_bridge_funcs; ctx->bridge.of_node = dev->of_node; drm_bridge_add(&ctx->bridge); - sii8620_cable_in(ctx); + if (!ctx->extcon) + sii8620_cable_in(ctx); return 0; } @@ -2322,8 +2406,15 @@ static int sii8620_remove(struct i2c_client *client) { struct sii8620 *ctx = i2c_get_clientdata(client); - disable_irq(to_i2c_client(ctx->dev)->irq); - sii8620_hw_off(ctx); + if (ctx->extcon) { + extcon_unregister_notifier(ctx->extcon, EXTCON_DISP_MHL, + &ctx->extcon_nb); + flush_work(&ctx->extcon_wq); + if (ctx->cable_state > 0) + sii8620_cable_out(ctx); + } else { + sii8620_cable_out(ctx); + } drm_bridge_remove(&ctx->bridge); return 0;