From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.3 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2B94CC2D0C0 for ; Thu, 19 Dec 2019 10:13:15 +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 E7BF824650 for ; Thu, 19 Dec 2019 10:13:14 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="JbZeQ9uN"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=baylibre-com.20150623.gappssmtp.com header.i=@baylibre-com.20150623.gappssmtp.com header.b="hKwR/KhQ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E7BF824650 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-amlogic-bounces+linux-amlogic=archiver.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:In-Reply-To:MIME-Version:Date: Message-ID:From:References:To:Subject:Reply-To:Content-ID:Content-Description :Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=i522QPkS+saDilodGWwCEfPAjK9OytT9OlRt0mWxazo=; b=JbZeQ9uNQn0K5U HEpTgETx0IrTSA2+PKXlwovrcBsNleNqTu32iPXiN0faDJGw3RY0XNpitJZJeMnQ2rsNS61m9S23P Dl9g4ohNHKU8p41H2NgJiLNXFMaLoiP4+baWCueYw2lba2gFBbjrjgf6sD1u6QJw6Yb7ks0prCwbz /98Yerd7+uEMsaCZjOqh8jM3M4bunwwUUZM8C5TTp6oZCEnOjgFxOoJM7DAjhQ9Ayndl0sQ3eq8Ea P59ZwXsauPH5nrkMHT3jj2JZuDZxz6VKPOLS2NzKugEvCd/CbEZTVHA7LLnq/U1/AeKmvFAZJoFzP j1njbiiCUEgQMJg8xPow==; 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 1ihsns-0004cf-VF; Thu, 19 Dec 2019 10:13:08 +0000 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1ihsni-0004Ty-3j for linux-amlogic@lists.infradead.org; Thu, 19 Dec 2019 10:13:00 +0000 Received: by mail-wr1-x444.google.com with SMTP id d16so5336436wre.10 for ; Thu, 19 Dec 2019 02:12:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=subject:to:cc:references:from:openpgp:autocrypt:organization :message-id:date:user-agent:mime-version:in-reply-to :content-language:content-transfer-encoding; bh=PN6pgtTj4yzd4L0ViZh1lrsVzR0no/4rRFGhnwNsTvw=; b=hKwR/KhQlU2XaqqrNx983HkUgOqRyAk+SOPYXfQ9TuDLzdxMDSs2Tc0JMuOr3i16sg 0zIDGJ6E4bXDzCACOFe5DMiCmoLKkxdUY8cUMhgO6gSWe17XQDUua2EGKsD9iiOOMA27 TSfwsyvpcrn7rL2p1DxT3J+PLsk1jzlSr5t10i38s6T+IkPejg8OYjDRPMmOyHAltv7Y ZqlQsGzqtTiJB0xXA7g56jWgUdLztAwRlQPfUPXNHhxFCKlm/Y9h8coAkGV3RygcEG8f RWfr1EZ4OcOM2XhFdD10437BuXfMguPB18t03jxJwD2DwbcUbEkFd/78WrD0fkyAJ/kW x38w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:openpgp:autocrypt :organization:message-id:date:user-agent:mime-version:in-reply-to :content-language:content-transfer-encoding; bh=PN6pgtTj4yzd4L0ViZh1lrsVzR0no/4rRFGhnwNsTvw=; b=KW5H28TRjdtFUUmjF7i24y9Hn71g6dbXPN/PcZ2nlrVvhe8IYeGUeMx6EXsrNSFwrw c7Cln9bVav9rTFrx5rU0RBGlHe3H6H1IoaaMLd0yM7apVuws0p91QKovAoZ1U2X8P3s3 CXcL1KM+0sW0FpoEKZjb6L7rMYfCnMsvyOGTmSd5vByZ4EWdBzGcm6VVgz8efGFcqfhv cWEAAnp8baUS/kyj+K2grhtHOlR80IlZt+jYNpYIyKKm2Yeidg/yA66lr+XKUicM0dOx HlAbzXLnbelghjFMwRrgPs6O3fmBW5meimVIpcQCQ7qhRv464+hRhvnVGBEIgDNGdjNr ZY7A== X-Gm-Message-State: APjAAAUU/j66Ax4LeoOU30RrF6rXrAZ88KE7xPWcVcgPld+RfYpmBbJ4 4NjdA0zDhQ+dAMWHEkWIGttKAQ== X-Google-Smtp-Source: APXvYqyBxurjzFz3D9NwcI1h4K33j6B1IjLmbjChbkMXhw6rTcNalNzCpm4B4UCbvOxZSyRiE4EIeQ== X-Received: by 2002:adf:f448:: with SMTP id f8mr8873278wrp.263.1576750376133; Thu, 19 Dec 2019 02:12:56 -0800 (PST) Received: from [10.2.4.229] (lfbn-nic-1-505-157.w90-116.abo.wanadoo.fr. [90.116.92.157]) by smtp.gmail.com with ESMTPSA id a1sm5587661wmj.40.2019.12.19.02.12.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 19 Dec 2019 02:12:55 -0800 (PST) Subject: Re: [PATCH v2 3/6] phy: amlogic: Add Amlogic A1 USB2 PHY Driver To: Hanjie Lin , Jerome Brunet , Rob Herring , Greg Kroah-Hartman , Felipe Balbi , Kevin Hilman References: <1576636944-196192-1-git-send-email-hanjie.lin@amlogic.com> <1576636944-196192-4-git-send-email-hanjie.lin@amlogic.com> <4cbc4216-4f1b-dab2-fccd-4ece7cfedb77@baylibre.com> From: Neil Armstrong Openpgp: preference=signencrypt Autocrypt: addr=narmstrong@baylibre.com; prefer-encrypt=mutual; keydata= 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 ZaTUOEkgIor5losDrePdPgE= Organization: Baylibre Message-ID: Date: Thu, 19 Dec 2019 11:12:54 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.9.0 MIME-Version: 1.0 In-Reply-To: Content-Language: en-US X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191219_021258_218527_AD85BB95 X-CRM114-Status: GOOD ( 21.56 ) X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, Victor Wan , Jianxin Pan , Stephen Boyd , Michael Turquette , linux-usb@vger.kernel.org, Yue Wang , Martin Blumenstingl , Liang Yang , Qiufang Dai , Xingyu Chen , Carlo Caione , linux-amlogic@lists.infradead.org, linux-arm-kernel@lists.infradead.org, Jian Hu Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+linux-amlogic=archiver.kernel.org@lists.infradead.org On 19/12/2019 10:48, Hanjie Lin wrote: > > > On 2019/12/18 21:17, Neil Armstrong wrote: >> Hi, >> >> On 18/12/2019 03:42, Hanjie Lin wrote: >>> This adds support for the USB2 PHY found in the Amlogic A1 SoC Family. >>> >>> It supports host mode only. >>> >>> Signed-off-by: Hanjie Lin >>> Signed-off-by: Yue Wang >>> --- >>> drivers/phy/amlogic/phy-meson-g12a-usb2.c | 102 ++++++++++++++++++++++-------- >>> 1 file changed, 74 insertions(+), 28 deletions(-) >>> >>> diff --git a/drivers/phy/amlogic/phy-meson-g12a-usb2.c b/drivers/phy/amlogic/phy-meson-g12a-usb2.c >>> index 9065ffc..2c242d3 100644 >>> --- a/drivers/phy/amlogic/phy-meson-g12a-usb2.c >>> +++ b/drivers/phy/amlogic/phy-meson-g12a-usb2.c >>> @@ -146,11 +146,18 @@ >>> #define RESET_COMPLETE_TIME 1000 >>> #define PLL_RESET_COMPLETE_TIME 100 >>> >>> +enum { >>> + MESON_USB2_PHY_VERSION_10 = 0, >>> + MESON_USB2_PHY_VERSION_11, >> >> Are these the real "versions" of the phy or it's made up ? >> > > This version is made up and only for distinguish a1 and g12a. No problem, in this case simply use the SoC family instead of 10 and 11. Neil > >>> + MESON_USB2_PHY_VERSION_COUNT, >>> +}; >>> + >>> struct phy_meson_g12a_usb2_priv { >>> struct device *dev; >>> struct regmap *regmap; >>> struct clk *clk; >>> struct reset_control *reset; >>> + int phy_version; >>> }; >>> >>> static const struct regmap_config phy_meson_g12a_usb2_regmap_conf = { >>> @@ -192,18 +199,33 @@ static int phy_meson_g12a_usb2_init(struct phy *phy) >>> FIELD_PREP(PHY_CTRL_R17_MPLL_FILTER_PVT2, 2) | >>> FIELD_PREP(PHY_CTRL_R17_MPLL_FILTER_PVT1, 9)); >>> >>> - regmap_write(priv->regmap, PHY_CTRL_R18, >>> - FIELD_PREP(PHY_CTRL_R18_MPLL_LKW_SEL, 1) | >>> - FIELD_PREP(PHY_CTRL_R18_MPLL_LK_W, 9) | >>> - FIELD_PREP(PHY_CTRL_R18_MPLL_LK_S, 0x27) | >>> - FIELD_PREP(PHY_CTRL_R18_MPLL_PFD_GAIN, 1) | >>> - FIELD_PREP(PHY_CTRL_R18_MPLL_ROU, 7) | >>> - FIELD_PREP(PHY_CTRL_R18_MPLL_DATA_SEL, 3) | >>> - FIELD_PREP(PHY_CTRL_R18_MPLL_BIAS_ADJ, 1) | >>> - FIELD_PREP(PHY_CTRL_R18_MPLL_BB_MODE, 0) | >>> - FIELD_PREP(PHY_CTRL_R18_MPLL_ALPHA, 3) | >>> - FIELD_PREP(PHY_CTRL_R18_MPLL_ADJ_LDO, 1) | >>> - PHY_CTRL_R18_MPLL_ACG_RANGE); >>> + if (priv->phy_version == MESON_USB2_PHY_VERSION_10) >>> + regmap_write(priv->regmap, PHY_CTRL_R18, >>> + FIELD_PREP(PHY_CTRL_R18_MPLL_LKW_SEL, 1) | >>> + FIELD_PREP(PHY_CTRL_R18_MPLL_LK_W, 9) | >>> + FIELD_PREP(PHY_CTRL_R18_MPLL_LK_S, 0x27) | >>> + FIELD_PREP(PHY_CTRL_R18_MPLL_PFD_GAIN, 1) | >>> + FIELD_PREP(PHY_CTRL_R18_MPLL_ROU, 7) | >>> + FIELD_PREP(PHY_CTRL_R18_MPLL_DATA_SEL, 3) | >>> + FIELD_PREP(PHY_CTRL_R18_MPLL_BIAS_ADJ, 1) | >>> + FIELD_PREP(PHY_CTRL_R18_MPLL_BB_MODE, 0) | >>> + FIELD_PREP(PHY_CTRL_R18_MPLL_ALPHA, 3) | >>> + FIELD_PREP(PHY_CTRL_R18_MPLL_ADJ_LDO, 1) | >>> + PHY_CTRL_R18_MPLL_ACG_RANGE); >>> + else if (priv->phy_version == MESON_USB2_PHY_VERSION_11) >>> + regmap_write(priv->regmap, PHY_CTRL_R18, >>> + FIELD_PREP(PHY_CTRL_R18_MPLL_LKW_SEL, 1) | >>> + FIELD_PREP(PHY_CTRL_R18_MPLL_LK_W, 9) | >>> + FIELD_PREP(PHY_CTRL_R18_MPLL_LK_S, 0x27) | >>> + FIELD_PREP(PHY_CTRL_R18_MPLL_PFD_GAIN, 1) | >>> + FIELD_PREP(PHY_CTRL_R18_MPLL_ROU, 7) | >>> + FIELD_PREP(PHY_CTRL_R18_MPLL_DATA_SEL, 3) | >>> + FIELD_PREP(PHY_CTRL_R18_MPLL_BIAS_ADJ, 1) | >>> + FIELD_PREP(PHY_CTRL_R18_MPLL_BB_MODE, 0) | >>> + FIELD_PREP(PHY_CTRL_R18_MPLL_ALPHA, 3) | >>> + FIELD_PREP(PHY_CTRL_R18_MPLL_ADJ_LDO, 1) | >>> + PHY_CTRL_R18_MPLL_ACG_RANGE | >>> + PHY_CTRL_R18_MPLL_DCO_CLK_SEL); >> >> The only difference is PHY_CTRL_R18_MPLL_ACG_RANGE | PHY_CTRL_R18_MPLL_DCO_CLK_SEL, >> you can easily simplify the code here by using a temp variable. >> > > Yes, it will looks more clearly. > >>> >>> udelay(PLL_RESET_COMPLETE_TIME); >>> >>> @@ -227,13 +249,24 @@ static int phy_meson_g12a_usb2_init(struct phy *phy) >>> FIELD_PREP(PHY_CTRL_R20_USB2_BGR_VREF_4_0, 0) | >>> FIELD_PREP(PHY_CTRL_R20_USB2_BGR_DBG_1_0, 0)); >>> >>> - regmap_write(priv->regmap, PHY_CTRL_R4, >>> - FIELD_PREP(PHY_CTRL_R4_CALIB_CODE_7_0, 0xf) | >>> - FIELD_PREP(PHY_CTRL_R4_CALIB_CODE_15_8, 0xf) | >>> - FIELD_PREP(PHY_CTRL_R4_CALIB_CODE_23_16, 0xf) | >>> - PHY_CTRL_R4_TEST_BYPASS_MODE_EN | >>> - FIELD_PREP(PHY_CTRL_R4_I_C2L_BIAS_TRIM_1_0, 0) | >>> - FIELD_PREP(PHY_CTRL_R4_I_C2L_BIAS_TRIM_3_2, 0)); >>> + if (priv->phy_version == MESON_USB2_PHY_VERSION_10) >>> + regmap_write(priv->regmap, PHY_CTRL_R4, >>> + FIELD_PREP(PHY_CTRL_R4_CALIB_CODE_7_0, 0xf) | >>> + FIELD_PREP(PHY_CTRL_R4_CALIB_CODE_15_8, 0xf) | >>> + FIELD_PREP(PHY_CTRL_R4_CALIB_CODE_23_16, 0xf) | >>> + PHY_CTRL_R4_TEST_BYPASS_MODE_EN | >>> + FIELD_PREP(PHY_CTRL_R4_I_C2L_BIAS_TRIM_1_0, 0) | >>> + FIELD_PREP(PHY_CTRL_R4_I_C2L_BIAS_TRIM_3_2, 0)); >>> + else if (priv->phy_version == MESON_USB2_PHY_VERSION_11) { >>> + regmap_write(priv->regmap, PHY_CTRL_R21, >>> + PHY_CTRL_R21_USB2_CAL_ACK_EN | >>> + PHY_CTRL_R21_USB2_TX_STRG_PD | >>> + FIELD_PREP(PHY_CTRL_R21_USB2_OTG_ACA_TRIM_1_0, 2)); >>> + >>> + /* Analog Settings */ >>> + regmap_write(priv->regmap, PHY_CTRL_R13, >>> + FIELD_PREP(PHY_CTRL_R13_MIN_COUNT_FOR_SYNC_DET, 7)); >>> + } >>> >>> /* Tuning Disconnect Threshold */ >>> regmap_write(priv->regmap, PHY_CTRL_R3, >>> @@ -241,11 +274,13 @@ static int phy_meson_g12a_usb2_init(struct phy *phy) >>> FIELD_PREP(PHY_CTRL_R3_HSDIC_REF, 1) | >>> FIELD_PREP(PHY_CTRL_R3_DISC_THRESH, 3)); >>> >>> - /* Analog Settings */ >>> - regmap_write(priv->regmap, PHY_CTRL_R14, 0); >>> - regmap_write(priv->regmap, PHY_CTRL_R13, >>> - PHY_CTRL_R13_UPDATE_PMA_SIGNALS | >>> - FIELD_PREP(PHY_CTRL_R13_MIN_COUNT_FOR_SYNC_DET, 7)); >>> + if (priv->phy_version == MESON_USB2_PHY_VERSION_10) { >>> + /* Analog Settings */ >>> + regmap_write(priv->regmap, PHY_CTRL_R14, 0); >>> + regmap_write(priv->regmap, PHY_CTRL_R13, >>> + PHY_CTRL_R13_UPDATE_PMA_SIGNALS | >>> + FIELD_PREP(PHY_CTRL_R13_MIN_COUNT_FOR_SYNC_DET, 7)); >>> + } >>> >>> return 0; >>> } >>> @@ -271,6 +306,7 @@ static int phy_meson_g12a_usb2_probe(struct platform_device *pdev) >>> struct resource *res; >>> struct phy_meson_g12a_usb2_priv *priv; >>> struct phy *phy; >>> + struct device_node *np = dev->of_node; >>> void __iomem *base; >>> int ret; >>> >>> @@ -286,14 +322,23 @@ static int phy_meson_g12a_usb2_probe(struct platform_device *pdev) >>> if (IS_ERR(base)) >>> return PTR_ERR(base); >>> >>> + if (of_device_is_compatible(np, "amlogic,g12a-usb2-phy")) >>> + priv->phy_version = MESON_USB2_PHY_VERSION_10; >>> + else if (of_device_is_compatible(np, "amlogic,a1-usb2-phy")) >>> + priv->phy_version = MESON_USB2_PHY_VERSION_11; >>> + else >>> + return -EINVAL; >> >> Please use of_device_get_match_data() and a match data for each compatible instead. >> > > OK, I will fix it in next version. > >>> + >>> priv->regmap = devm_regmap_init_mmio(dev, base, >>> &phy_meson_g12a_usb2_regmap_conf); >>> if (IS_ERR(priv->regmap)) >>> return PTR_ERR(priv->regmap); >>> >>> - priv->clk = devm_clk_get(dev, "xtal"); >>> - if (IS_ERR(priv->clk)) >>> - return PTR_ERR(priv->clk); >>> + if (priv->phy_version == MESON_USB2_PHY_VERSION_10) { >>> + priv->clk = devm_clk_get(dev, "xtal"); >>> + if (IS_ERR(priv->clk)) >>> + return PTR_ERR(priv->clk); >>> + } >>> >>> priv->reset = devm_reset_control_get(dev, "phy"); >>> if (IS_ERR(priv->reset)) >>> @@ -322,7 +367,8 @@ static int phy_meson_g12a_usb2_probe(struct platform_device *pdev) >>> >>> static const struct of_device_id phy_meson_g12a_usb2_of_match[] = { >>> { .compatible = "amlogic,g12a-usb2-phy", }, >>> - { }, >>> + { .compatible = "amlogic,a1-usb2-phy", }, >>> + { /* Sentinel */ } >>> }; >>> MODULE_DEVICE_TABLE(of, phy_meson_g12a_usb2_of_match); >>> >>> >> >> Thanks, >> Neil >> >> . >> > > Thanks, > Hanjie.Lin > _______________________________________________ linux-amlogic mailing list linux-amlogic@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-amlogic