From patchwork Fri Apr 17 05:23:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Macpaul Lin X-Patchwork-Id: 11494113 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 77E5613B2 for ; Fri, 17 Apr 2020 05:23:45 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 559A32063A for ; Fri, 17 Apr 2020 05:23:45 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="S0g+y5LX"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=mediatek.com header.i=@mediatek.com header.b="Miljsmve" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 559A32063A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=mediatek.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=u9g9MPQYsLhgdh662hFMKyXWbpL2shUHi8oFBZNZ9Q8=; b=S0g+y5LXo8HwdG gmiVmODfnmmeXs9gsEVaTTYlHyt2la0LAPNOq63NLI2zwmOqHAvh91rPx5z2V9XLaZnnI/clMEkXw 8jFteuyrrhA0xXmBf9F62UIYQ4ds8RDxfpHZmzKK1K3svP5aUeYRkGswoNnKBcbgCaUoHLNOp7VNi VKOHIEriKuKZV9iXeUZM9LQ5tikeeaZzPljTwFVOt+4xSII69uoqHKNJqRTFi7i1x4t9SxryGxDbe M4kYv0ZqlNUaj+9f7FLXKF3VgljOmKMh1nO5dq0OQuWudHdelZon1cSKHzcTd0fk84rMz3Zg6C14Q fN8gyrw8iX0PbPgIQ+0A==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jPJTZ-0002YD-Tv; Fri, 17 Apr 2020 05:23:41 +0000 Received: from mailgw01.mediatek.com ([216.200.240.184]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jPJTM-0002Jc-A3; Fri, 17 Apr 2020 05:23:29 +0000 X-UUID: f127d1de36b64854827075a95f7e5d87-20200416 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Transfer-Encoding:Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=+zpT5B2IshhZ214mCSGdW/SvpDv7hKMz1rnXfEoTBUc=; b=MiljsmvesNAjTzcryn9BOY90EuXWSeTKVZOhLQHv7FCngg8UuCptbyLct3iyvUjQHsqjcgpWRhvQ7ZVVyvIiOt+Merq6p1BTp4CRTecvj1MfPUc1KF5Qbc/GxzTWtJV2dViDX0pLO7hRup40IQzF1hJUtVNaeymY3tKxv0bB9x8=; X-UUID: f127d1de36b64854827075a95f7e5d87-20200416 Received: from mtkcas68.mediatek.inc [(172.29.94.19)] by mailgw01.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLS) with ESMTP id 1143253080; Thu, 16 Apr 2020 21:23:11 -0800 Received: from mtkmbs08n2.mediatek.inc (172.21.101.56) by MTKMBS62N2.mediatek.inc (172.29.193.42) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Thu, 16 Apr 2020 22:23:14 -0700 Received: from mtkcas08.mediatek.inc (172.21.101.126) by mtkmbs08n2.mediatek.inc (172.21.101.56) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Fri, 17 Apr 2020 13:23:11 +0800 Received: from mtkswgap22.mediatek.inc (172.21.77.33) by mtkcas08.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Fri, 17 Apr 2020 13:23:12 +0800 From: Macpaul Lin To: Min Guo , Chunfeng Yun , Kishon Vijay Abraham I , Rob Herring , Matthias Brugger , , , , Subject: [PATCH 2/2] phy: phy-mtk-tphy: introduce force_vbus for u2 phy Date: Fri, 17 Apr 2020 13:23:06 +0800 Message-ID: <1587100986-3104-2-git-send-email-macpaul.lin@mediatek.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1587100986-3104-1-git-send-email-macpaul.lin@mediatek.com> References: <1587100986-3104-1-git-send-email-macpaul.lin@mediatek.com> MIME-Version: 1.0 X-TM-SNTS-SMTP: E815C42225B82684929207EFF6F91564BF86715E507A584A4955B6A5F960DCE12000:8 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200416_222328_363387_70E06105 X-CRM114-Status: GOOD ( 11.67 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on bombadil.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [216.200.240.184 listed in list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record 0.0 MIME_BASE64_TEXT RAW: Message text disguised using base64 encoding 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.0 UNPARSEABLE_RELAY Informational: message has unparseable relay lines X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Macpaul Lin , Macpaul Lin , Mediatek WSD Upstream Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org For some platforms, they don't have vbus pin connection between usb phy and mac. Hence we need to control force_vbus related registers to keep hardware works normal. This patch add corresponding behavior of force vbus in u2 phy related functions. Signed-off-by: Macpaul Lin --- drivers/phy/mediatek/phy-mtk-tphy.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/drivers/phy/mediatek/phy-mtk-tphy.c b/drivers/phy/mediatek/phy-mtk-tphy.c index cdbcc49f7115..46f0fea175e5 100644 --- a/drivers/phy/mediatek/phy-mtk-tphy.c +++ b/drivers/phy/mediatek/phy-mtk-tphy.c @@ -99,6 +99,7 @@ #define U3P_U2PHYDTM1 0x06C #define P2C_RG_UART_EN BIT(16) +#define P2C_FORCE_VBUSVALID BIT(13) #define P2C_FORCE_IDDIG BIT(9) #define P2C_RG_VBUSVALID BIT(5) #define P2C_RG_SESSEND BIT(4) @@ -318,6 +319,7 @@ struct mtk_tphy { int nphys; int src_ref_clk; /* MHZ, reference clock for slew rate calibrate */ int src_coef; /* coefficient for slew rate calibrate */ + bool force_vbus; }; static void hs_slew_rate_calibrate(struct mtk_tphy *tphy, @@ -611,13 +613,20 @@ static void u2_phy_instance_set_mode(struct mtk_tphy *tphy, switch (mode) { case PHY_MODE_USB_DEVICE: tmp |= P2C_FORCE_IDDIG | P2C_RG_IDDIG; + if (tphy->force_vbus) + tmp |= P2C_RG_VBUSVALID | P2C_FORCE_VBUSVALID; break; case PHY_MODE_USB_HOST: tmp |= P2C_FORCE_IDDIG; - tmp &= ~P2C_RG_IDDIG; + if (tphy->force_vbus) + tmp &= ~(P2C_RG_VBUSVALID | P2C_FORCE_VBUSVALID); + else + tmp &= ~P2C_RG_IDDIG; break; case PHY_MODE_USB_OTG: tmp &= ~(P2C_FORCE_IDDIG | P2C_RG_IDDIG); + if (tphy->force_vbus) + tmp &= ~(P2C_RG_VBUSVALID | P2C_FORCE_VBUSVALID); break; default: return; @@ -1187,6 +1196,11 @@ static int mtk_tphy_probe(struct platform_device *pdev) retval = PTR_ERR(instance->da_ref_clk); goto put_child; } + + /* + * On some platform, vbus is dis-connected between PHY and MAC. + */ + tphy->force_vbus = device_property_read_bool(dev, "force_vbus"); } provider = devm_of_phy_provider_register(dev, mtk_phy_xlate);