Received: by 2002:a05:6520:4211:b029:f4:110d:56bc with SMTP id o17csp1547176lkv; Wed, 19 May 2021 12:28:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw4OUXr7oM+FE4LTRHovpcimpagza12Em+5csRepa4rIMRBKQIGpLWRNwHf6pR2gxzigmJc X-Received: by 2002:a05:6e02:54d:: with SMTP id i13mr731391ils.26.1621452528680; Wed, 19 May 2021 12:28:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621452528; cv=none; d=google.com; s=arc-20160816; b=EyUrzBSCDDBVsb9BmEUD6LKbLB9D0sT2E3MdXCvaguwpIPC6T+yt1tT2KXMSTNuvH2 sQMiTrRIMrNxshlQyQ0VlXXI1xRoy5AaU/yivxdWJf8mr4ru6n+wsRFWOdt7lkHlRNN2 454zG4WS+vmJcpEhBf+LK3ka3WszYUwllfxur1KJT0HBY6YAlgbv8M9ADwwr3xzdAdYH RD/HY0lKqYxWFRYXvFeqf/Z2ykVgLKaRS/NKsp8jEXnWWo4Kj3mF+M22RA6KAHj1W4VQ PhVphmKYzHS99R2F9XAdgarVHCxGouM15RiwhmZ4Xg7r0ObBfE+NjvXEAn14puPhnIQF Pg8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:in-reply-to:message-id:date:subject :cc:to:from; bh=lhhnwZRFPlTRKuMQM8+8bNe1XCKa3I3YGdyoM5r18Hs=; b=MvWioAuY3ZiGwo7GGwM0bzmvSQ2OENskmtnSu6IGyD0/FEGrwLx4BDWocNnUe5I0m0 MtMSC6Ef5bZPGRVWntYCKJ28g531lt+7PE9UpGeN9Jvrmb4ILL9lyPoy/Qnjf0fn41oU jyqtcX/KodL8Ejnmis4tK7lriSPGAfGFzlMaTgn+WKxs+qdyschEUiLTMMgbO86zHwCU b9Ac2zYi4MGS550DEOwKWCGwEr1i0Z0oiMRNR/Ip+EpKVwO7daXMuzLa37XbXpUd+hUY OMUOd695wDCaEztDiIMJoNib5mVDxP1cMBkdHuHP+t0Q19kmFv1c//AzZRRys5lO3UzD BPIg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id b9si538749ilj.58.2021.05.19.12.28.35; Wed, 19 May 2021 12:28:48 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1348970AbhESKoQ (ORCPT + 99 others); Wed, 19 May 2021 06:44:16 -0400 Received: from foss.arm.com ([217.140.110.172]:59130 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1349061AbhESKn4 (ORCPT ); Wed, 19 May 2021 06:43:56 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 2069914FF; Wed, 19 May 2021 03:42:37 -0700 (PDT) Received: from localhost.localdomain (unknown [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id DE4B43F719; Wed, 19 May 2021 03:42:34 -0700 (PDT) From: Andre Przywara To: Maxime Ripard , Chen-Yu Tsai , Jernej Skrabec Cc: Rob Herring , Icenowy Zheng , Samuel Holland , Ondrej Jirman , linux-arm-kernel@lists.infradead.org, linux-sunxi@googlegroups.com, linux-sunxi@lists.linux.dev, linux-kernel@vger.kernel.org, Kishon Vijay Abraham I , Vinod Koul , linux-phy@lists.infradead.org, linux-usb@vger.kernel.org Subject: [PATCH v6 12/17] phy: sun4i-usb: Introduce port2 SIDDQ quirk Date: Wed, 19 May 2021 11:41:47 +0100 Message-Id: <20210519104152.21119-13-andre.przywara@arm.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20210519104152.21119-1-andre.przywara@arm.com> References: <20210519104152.21119-1-andre.przywara@arm.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org At least the Allwinner H616 SoC requires a weird quirk to make most USB PHYs work: Only port2 works out of the box, but all other ports need some help from this port2 to work correctly: The CLK_BUS_PHY2 and RST_USB_PHY2 clock and reset need to be enabled, and the SIDDQ bit in the PMU PHY control register needs to be cleared. For this register to be accessible, CLK_BUS_ECHI2 needs to be ungated. Don't ask .... Instead of disguising this as some generic feature, do exactly that in our PHY init: If the quirk bit is set, and we initialise a PHY other than PHY2, ungate this one special clock, and clear the SIDDQ bit. We can pull in the other required clocks via the DT. Signed-off-by: Andre Przywara --- drivers/phy/allwinner/phy-sun4i-usb.c | 29 +++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/drivers/phy/allwinner/phy-sun4i-usb.c b/drivers/phy/allwinner/phy-sun4i-usb.c index 126ef74d013c..ed7b9cc5a424 100644 --- a/drivers/phy/allwinner/phy-sun4i-usb.c +++ b/drivers/phy/allwinner/phy-sun4i-usb.c @@ -120,6 +120,7 @@ struct sun4i_usb_phy_cfg { u8 phyctl_offset; bool dedicated_clocks; bool phy0_dual_route; + bool needs_phy2_siddq; int missing_phys; }; @@ -331,6 +332,27 @@ static int sun4i_usb_phy_init(struct phy *_phy) queue_delayed_work(system_wq, &data->detect, 0); } + /* Some PHYs on some SoCs need the help of PHY2 to work. */ + if (data->cfg->needs_phy2_siddq && phy->index != 2) { + struct sun4i_usb_phy *phy2 = &data->phys[2]; + + /* + * This extra clock is just needed to access the + * REG_HCI_PHY_CTL PMU register for PHY2. + */ + ret = clk_prepare_enable(phy2->clk2); + if (ret) + return ret; + + if (phy2->pmu && data->cfg->hci_phy_ctl_clear) { + val = readl(phy2->pmu + REG_HCI_PHY_CTL); + val &= ~data->cfg->hci_phy_ctl_clear; + writel(val, phy2->pmu + REG_HCI_PHY_CTL); + } + + clk_disable_unprepare(phy->clk2); + } + return 0; } @@ -785,6 +807,13 @@ static int sun4i_usb_phy_probe(struct platform_device *pdev) dev_err(dev, "failed to get clock %s\n", name); return PTR_ERR(phy->clk2); } + } else { + snprintf(name, sizeof(name), "pmu%d_clk", i); + phy->clk2 = devm_clk_get_optional(dev, name); + if (IS_ERR(phy->clk2)) { + dev_err(dev, "failed to get clock %s\n", name); + return PTR_ERR(phy->clk2); + } } snprintf(name, sizeof(name), "usb%d_reset", i); -- 2.17.5