From patchwork Mon Jul 17 14:14:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AngeloGioacchino Del Regno X-Patchwork-Id: 121371 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp1149096vqt; Mon, 17 Jul 2023 07:32:05 -0700 (PDT) X-Google-Smtp-Source: APBJJlHVX9ZVhhJpI0+RTXk4VvOF6817gybHJ6n5W5LKuI1Dk9jEXFwLngM0MiMU4UPixkVp5FnC X-Received: by 2002:a17:90a:d789:b0:267:909f:3719 with SMTP id z9-20020a17090ad78900b00267909f3719mr3451029pju.19.1689604324864; Mon, 17 Jul 2023 07:32:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689604324; cv=none; d=google.com; s=arc-20160816; b=S4X8+oHJdA3nJ+k1vgTludCRcLbTjQ7U/sV3bJQoHinpscjqZC3w+DDlAORorSboDp C93/XYTYb6UCR1aLaVv7W0F1KHqounVxPcSzt8Je7i2uVBvs3KBdBiTNfW3mgCww9l8z rK+nju1rFrDeeQC+pP+GL+4Rh404VaJxhLEVaIm4CHWj+YVHrr/ayJduJaksFl9evCCx 7UVcx9Wj8Xwcf2ODd8RcBsaz1OK62d75H9DySq6vvHATNgJb8t2NzcDVs+ma+Izwahga vgzFP96FCJKS5G4bsRls/S6P/HAmS/3TVIuyUjmWNnslZdDO7+gryCowjFekyPNTxVn8 HSzA== 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=d55xgDNQ7VWQlI1GhjXYdLn4e1NE1xmtnLtkoae7sGY=; fh=JpmmvsKbFEtjFcPhKwAU/TS0J6xmkcPCzvp06hVht3s=; b=KGyOuO5Z2BiLjizLqIJQx1BO1Pq0ewMmxTtqmQhdeoWse5LVSQjyYsCV4gA5BHDH5F IqoQohYCmN3gAzB6at0aIgyuEI7CPl6vNI9wJ1Sq6SldopE7TAtB9K3oM3LB5bPwBhK2 UJcm909Oa1oJPIHpTnukCC9OrF7KAuS/HWsZJiVeJs5iMjUYC49+o8If05OppRGUA27p ZBcqa4wVBdjFPuULfJq23DJ9/7xxQ+GtDpNuV1CZKCB08J1T7fjlIbexxmEWJTftGEPc 69+pESZpy25Gzktk+nxPOQoNMxhrw/BpZdde58+ytS3xXmpb+1T7ezYPz0Z7cPYHotpU X+lQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=dCT0de41; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id nu17-20020a17090b1b1100b00263e46aa26asi6038313pjb.18.2023.07.17.07.31.51; Mon, 17 Jul 2023 07:32:04 -0700 (PDT) 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=@collabora.com header.s=mail header.b=dCT0de41; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232229AbjGQOPQ (ORCPT + 99 others); Mon, 17 Jul 2023 10:15:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42286 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232144AbjGQOOz (ORCPT ); Mon, 17 Jul 2023 10:14:55 -0400 Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7E64A19A for ; Mon, 17 Jul 2023 07:14:51 -0700 (PDT) Received: from IcarusMOD.eternityproject.eu (2-237-20-237.ip236.fastwebnet.it [2.237.20.237]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: kholk11) by madras.collabora.co.uk (Postfix) with ESMTPSA id A74AA660706F; Mon, 17 Jul 2023 15:14:49 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1689603290; bh=MTYqTiXP+9VBPluWnDbRM5Aq8M+c0b3eKDaIxQE6YVQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dCT0de41LveyRkV8kQF7wB58+3bsMLnhgZTbfJJMh8+st92dT/EX6fAaz2ifNhi/A vp5xffRe0vxRDJAgmmFwkRCddVC0gYz7L5PudUeozMQmxnxZ+oZWC5F2kRejclH6Hu +7w38gRXU3aZAsAOspKlFSPkRoNZ43QL3zAvJn0cNrww6c2uLAemAehf40VMixwCDJ nErJeZERhU0uW0PIM7OC5xLLNf6a86DCFYcXSomvEKcyLYinb1IvW3hY5QZ738NsEB FCQPvCqEV/WNBwXByaD3crhe04KlSshSPjiVnTzgf5igl/d2jTpA8WzQ22Jo4PQ0tJ EYMFQuFiUK0Yw== From: AngeloGioacchino Del Regno To: chunkuang.hu@kernel.org Cc: p.zabel@pengutronix.de, airlied@gmail.com, daniel@ffwll.ch, matthias.bgg@gmail.com, angelogioacchino.delregno@collabora.com, dri-devel@lists.freedesktop.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kernel@collabora.com, wenst@chromium.org, nfraprado@collabora.com Subject: [PATCH v6 08/11] drm/mediatek: dp: Move PHY registration to new function Date: Mon, 17 Jul 2023 16:14:35 +0200 Message-Id: <20230717141438.274419-9-angelogioacchino.delregno@collabora.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230717141438.274419-1-angelogioacchino.delregno@collabora.com> References: <20230717141438.274419-1-angelogioacchino.delregno@collabora.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE 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: INBOX X-GMAIL-THRID: 1771678544017788963 X-GMAIL-MSGID: 1771678544017788963 In preparation for adding support for eDP, move the PHY registration code to a new mtk_dp_register_phy() function for better readability. This commit brings no functional changes. Signed-off-by: AngeloGioacchino Del Regno Reviewed-by: Alexandre Mergnat --- drivers/gpu/drm/mediatek/mtk_dp.c | 43 +++++++++++++++++++------------ 1 file changed, 26 insertions(+), 17 deletions(-) diff --git a/drivers/gpu/drm/mediatek/mtk_dp.c b/drivers/gpu/drm/mediatek/mtk_dp.c index c1d1a882f1db..1b4219e6a00b 100644 --- a/drivers/gpu/drm/mediatek/mtk_dp.c +++ b/drivers/gpu/drm/mediatek/mtk_dp.c @@ -2478,6 +2478,29 @@ static int mtk_dp_register_audio_driver(struct device *dev) return PTR_ERR_OR_ZERO(mtk_dp->audio_pdev); } +static int mtk_dp_register_phy(struct mtk_dp *mtk_dp) +{ + struct device *dev = mtk_dp->dev; + + mtk_dp->phy_dev = platform_device_register_data(dev, "mediatek-dp-phy", + PLATFORM_DEVID_AUTO, + &mtk_dp->regs, + sizeof(struct regmap *)); + if (IS_ERR(mtk_dp->phy_dev)) + return dev_err_probe(dev, PTR_ERR(mtk_dp->phy_dev), + "Failed to create device mediatek-dp-phy\n"); + + mtk_dp_get_calibration_data(mtk_dp); + + mtk_dp->phy = devm_phy_get(&mtk_dp->phy_dev->dev, "dp"); + if (IS_ERR(mtk_dp->phy)) { + platform_device_unregister(mtk_dp->phy_dev); + return dev_err_probe(dev, PTR_ERR(mtk_dp->phy), "Failed to get phy\n"); + } + + return 0; +} + static int mtk_dp_probe(struct platform_device *pdev) { struct mtk_dp *mtk_dp; @@ -2536,23 +2559,9 @@ static int mtk_dp_probe(struct platform_device *pdev) } } - mtk_dp->phy_dev = platform_device_register_data(dev, "mediatek-dp-phy", - PLATFORM_DEVID_AUTO, - &mtk_dp->regs, - sizeof(struct regmap *)); - if (IS_ERR(mtk_dp->phy_dev)) - return dev_err_probe(dev, PTR_ERR(mtk_dp->phy_dev), - "Failed to create device mediatek-dp-phy\n"); - - mtk_dp_get_calibration_data(mtk_dp); - - mtk_dp->phy = devm_phy_get(&mtk_dp->phy_dev->dev, "dp"); - - if (IS_ERR(mtk_dp->phy)) { - platform_device_unregister(mtk_dp->phy_dev); - return dev_err_probe(dev, PTR_ERR(mtk_dp->phy), - "Failed to get phy\n"); - } + ret = mtk_dp_register_phy(mtk_dp); + if (ret) + return ret; mtk_dp->bridge.funcs = &mtk_dp_bridge_funcs; mtk_dp->bridge.of_node = dev->of_node;