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 A0A21C33CB1 for ; Wed, 15 Jan 2020 08:02:13 +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 67B8824679 for ; Wed, 15 Jan 2020 08:02:13 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="S96H+13U"; 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="TvDS04c4" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 67B8824679 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=/+SJcqL17S391fAyxe+LyLsOmjxC1P37pMAmsCpqym4=; b=S96H+13U6ib3rK KsjPkl3jXY/uyFIr7D7MP75DoSBMrTWzniqrxZNI6sT4JjwBfySO5/9DeWncGAjkobf2Im1b8grec oiefcclzBr0npiEyXaM8TjYEiUkp8baMtczKc/B+aK1/29mJZokBTUBZpR8aslMbWn3IoH/BKDaE+ KbwpV0T3UdJj9SCGnlJsYVmnY1uheE/q9I3O/TSvDIeso7f4sIFApct33f4Q2/+e2YXBgBBG6aJXZ 3sVo8CVs7hD2jTM9/RkF/HLw4RdLt+P1N5WWnniuV5TL/zv3mNW+MGJNHWSIvqgdKTf4CQR1zQ2jr qkel8NjYWHZ/X08jRzLw==; 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 1irdcs-0002Ja-Fq; Wed, 15 Jan 2020 08:02:06 +0000 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1irdcb-00028G-A6 for linux-amlogic@lists.infradead.org; Wed, 15 Jan 2020 08:01:53 +0000 Received: by mail-wm1-x344.google.com with SMTP id d139so4115948wmd.0 for ; Wed, 15 Jan 2020 00:01:49 -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:autocrypt:organization:message-id :date:user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=LqGaezBmjqo1I3iqgzWcout33RhA0cLHgVioPXtlKd4=; b=TvDS04c4VdOECsl00gF0Bv6+U2ZHSIdozA3JRwRtpSqC/bv+uM9qW7Wuhgj5dV6yR+ KNUQ9gSe0rLjDk64dpSUp37KeTF5AuFk4t7gK63EJN01UDgt1fE3685VFSmQm5kaGhv1 XMNAj7GHBTp1bGJ1vpL41X10pmmq1xv09rFI0fKXq7IeLvvjG0pTg1shWmS/6r3Rm5Cx RKdUJLXJr2MAkBI5OAjmqx+uSxv+A48RV4oXWW9oOhL5+ffNaBzZA7f/Y0j3LNs3GL19 ThWZtIX1dhDA18wjoUc8x/8iAFmAITtr91SWB2AQIm9IWJEr9USk81M1qK5vx67Oh4rZ JW6A== 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:autocrypt :organization:message-id:date:user-agent:mime-version:in-reply-to :content-language:content-transfer-encoding; bh=LqGaezBmjqo1I3iqgzWcout33RhA0cLHgVioPXtlKd4=; b=W80IMVDdYmSv98CGeUs18cJMFDQlWn1vb8k21577ED2V8KoQo21ObfQZAtjri+9hz+ 4Cxk8VVbsSPDmDf4Heg7bFt1e7lt69PAExe9IMu6j3SoxLyySFDphf1cgYSJVDTcD8+u c47bhAaJa/HyV3i8NJAAHWNXREN2KnujQS3PZ1MQDdeDoUcNnCFOZ/HxrRZx+dTSRt83 Wm3IEE56xortX3/OnlDvHtM8f+LX+3DDwO35hd4Rh2Dz3ht7Zov94ISS9H+IMYRXT1GX nxtvVt5dZdb7/q+6hIs3SofdqIg0m9zQCpXn28hKZXiAn+UzfWDjj/WR5f39/hl+r5I3 jlfw== X-Gm-Message-State: APjAAAWRNvQTY3ukcKDZNWPXGPtZ/8WOZB8KO2qok0zUUsbV8ihrCq38 KvG53E03BDA6T7c1U6aKqs6djg== X-Google-Smtp-Source: APXvYqzrj/IVZkkvSCDE8i0Wj87kZF8tJojhg+NQAlJXlmypQIV1dS8AgnJnYPXM91mw9maNWCqeSA== X-Received: by 2002:a1c:541b:: with SMTP id i27mr33322177wmb.137.1579075307994; Wed, 15 Jan 2020 00:01:47 -0800 (PST) Received: from [10.1.2.12] (laubervilliers-658-1-213-31.w90-63.abo.wanadoo.fr. [90.63.244.31]) by smtp.gmail.com with ESMTPSA id r15sm22123624wmh.21.2020.01.15.00.01.46 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 15 Jan 2020 00:01:47 -0800 (PST) Subject: Re: [PATCH v5 3/6] phy: amlogic: Add Amlogic A1 USB2 PHY Driver To: Hanjie Lin , Jerome Brunet , Rob Herring , Greg Kroah-Hartman , Kevin Hilman References: <1578634957-54826-1-git-send-email-hanjie.lin@amlogic.com> <1578634957-54826-4-git-send-email-hanjie.lin@amlogic.com> From: Neil Armstrong Autocrypt: addr=narmstrong@baylibre.com; prefer-encrypt=mutual; keydata= xsBNBE1ZBs8BCAD78xVLsXPwV/2qQx2FaO/7mhWL0Qodw8UcQJnkrWmgTFRobtTWxuRx8WWP GTjuhvbleoQ5Cxjr+v+1ARGCH46MxFP5DwauzPekwJUD5QKZlaw/bURTLmS2id5wWi3lqVH4 BVF2WzvGyyeV1o4RTCYDnZ9VLLylJ9bneEaIs/7cjCEbipGGFlfIML3sfqnIvMAxIMZrvcl9 qPV2k+KQ7q+aXavU5W+yLNn7QtXUB530Zlk/d2ETgzQ5FLYYnUDAaRl+8JUTjc0CNOTpCeik 80TZcE6f8M76Xa6yU8VcNko94Ck7iB4vj70q76P/J7kt98hklrr85/3NU3oti3nrIHmHABEB AAHNKE5laWwgQXJtc3Ryb25nIDxuYXJtc3Ryb25nQGJheWxpYnJlLmNvbT7CwHsEEwEKACUC GyMGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheABQJXDO2CAhkBAAoJEBaat7Gkz/iubGIH/iyk RqvgB62oKOFlgOTYCMkYpm2aAOZZLf6VKHKc7DoVwuUkjHfIRXdslbrxi4pk5VKU6ZP9AKsN NtMZntB8WrBTtkAZfZbTF7850uwd3eU5cN/7N1Q6g0JQihE7w4GlIkEpQ8vwSg5W7hkx3yQ6 2YzrUZh/b7QThXbNZ7xOeSEms014QXazx8+txR7jrGF3dYxBsCkotO/8DNtZ1R+aUvRfpKg5 ZgABTC0LmAQnuUUf2PHcKFAHZo5KrdO+tyfL+LgTUXIXkK+tenkLsAJ0cagz1EZ5gntuheLD YJuzS4zN+1Asmb9kVKxhjSQOcIh6g2tw7vaYJgL/OzJtZi6JlIXOwU0EVid/pAEQAND7AFhr 5faf/EhDP9FSgYd/zgmb7JOpFPje3uw7jz9wFb28Cf0Y3CcncdElYoBNbRlesKvjQRL8mozV 9RN+IUMHdUx1akR/A4BPXNdL7StfzKWOCxZHVS+rIQ/fE3Qz/jRmT6t2ZkpplLxVBpdu95qJ YwSZjuwFXdC+A7MHtQXYi3UfCgKiflj4+/ITcKC6EF32KrmIRqamQwiRsDcUUKlAUjkCLcHL CQvNsDdm2cxdHxC32AVm3Je8VCsH7/qEPMQ+cEZk47HOR3+Ihfn1LEG5LfwsyWE8/JxsU2a1 q44LQM2lcK/0AKAL20XDd7ERH/FCBKkNVzi+svYJpyvCZCnWT0TRb72mT+XxLWNwfHTeGALE +1As4jIS72IglvbtONxc2OIid3tR5rX3k2V0iud0P7Hnz/JTdfvSpVj55ZurOl2XAXUpGbq5 XRk5CESFuLQV8oqCxgWAEgFyEapI4GwJsvfl/2Er8kLoucYO1Id4mz6N33+omPhaoXfHyLSy dxD+CzNJqN2GdavGtobdvv/2V0wukqj86iKF8toLG2/Fia3DxMaGUxqI7GMOuiGZjXPt/et/ qeOySghdQ7Sdpu6fWc8CJXV2mOV6DrSzc6ZVB4SmvdoruBHWWOR6YnMz01ShFE49pPucyU1h Av4jC62El3pdCrDOnWNFMYbbon3vABEBAAHCwn4EGAECAAkFAlYnf6QCGwICKQkQFpq3saTP +K7BXSAEGQECAAYFAlYnf6QACgkQd9zb2sjISdGToxAAkOjSfGxp0ulgHboUAtmxaU3viucV e2Hl1BVDtKSKmbIVZmEUvx9D06IijFaEzqtKD34LXD6fjl4HIyDZvwfeaZCbJbO10j3k7FJE QrBtpdVqkJxme/nYlGOVzcOiKIepNkwvnHVnuVDVPcXyj2wqtsU7VZDDX41z3X4xTQwY3SO1 9nRO+f+i4RmtJcITgregMa2PcB0LvrjJlWroI+KAKCzoTHzSTpCXMJ1U/dEqyc87bFBdc+DI k8mWkPxsccdbs4t+hH0NoE3Kal9xtAl56RCtO/KgBLAQ5M8oToJVatxAjO1SnRYVN1EaAwrR xkHdd97qw6nbg9BMcAoa2NMc0/9MeiaQfbgW6b0reIz/haHhXZ6oYSCl15Knkr4t1o3I2Bqr Mw623gdiTzotgtId8VfLB2Vsatj35OqIn5lVbi2ua6I0gkI6S7xJhqeyrfhDNgzTHdQVHB9/ 7jnM0ERXNy1Ket6aDWZWCvM59dTyu37g3VvYzGis8XzrX1oLBU/tTXqo1IFqqIAmvh7lI0Se gCrXz7UanxCwUbQBFjzGn6pooEHJYRLuVGLdBuoApl/I4dLqCZij2AGa4CFzrn9W0cwm3HCO lR43gFyz0dSkMwNUd195FrvfAz7Bjmmi19DnORKnQmlvGe/9xEEfr5zjey1N9+mt3//geDP6 clwKBkq0JggA+RTEAELzkgPYKJ3NutoStUAKZGiLOFMpHY6KpItbbHjF2ZKIU1whaRYkHpB2 uLQXOzZ0d7x60PUdhqG3VmFnzXSztA4vsnDKk7x2xw0pMSTKhMafpxaPQJf494/jGnwBHyi3 h3QGG1RjfhQ/OMTX/HKtAUB2ct3Q8/jBfF0hS5GzT6dYtj0Ci7+8LUsB2VoayhNXMnaBfh+Q pAhaFfRZWTjUFIV4MpDdFDame7PB50s73gF/pfQbjw5Wxtes/0FnqydfId95s+eej+17ldGp lMv1ok7K0H/WJSdr7UwDAHEYU++p4RRTJP6DHWXcByVlpNQ4SSAiivmWiwOt490+Ac7ATQRN WQbPAQgAvIoM384ZRFocFXPCOBir5m2J+96R2tI2XxMgMfyDXGJwFilBNs+fpttJlt2995A8 0JwPj8SFdm6FBcxygmxBBCc7i/BVQuY8aC0Z/w9Vzt3Eo561r6pSHr5JGHe8hwBQUcNPd/9l 2ynP57YTSE9XaGJK8gIuTXWo7pzIkTXfN40Wh5jeCCspj4jNsWiYhljjIbrEj300g8RUT2U0 FcEoiV7AjJWWQ5pi8lZJX6nmB0lc69Jw03V6mblgeZ/1oTZmOepkagwy2zLDXxihf0GowUif GphBDeP8elWBNK+ajl5rmpAMNRoKxpN/xR4NzBg62AjyIvigdywa1RehSTfccQARAQABwsBf BBgBAgAJBQJNWQbPAhsMAAoJEBaat7Gkz/iuteIH+wZuRDqK0ysAh+czshtG6JJlLW6eXJJR Vi7dIPpgFic2LcbkSlvB8E25Pcfz/+tW+04Urg4PxxFiTFdFCZO+prfd4Mge7/OvUcwoSub7 ZIPo8726ZF5/xXzajahoIu9/hZ4iywWPAHRvprXaim5E/vKjcTeBMJIqZtS4u/UK3EpAX59R XVxVpM8zJPbk535ELUr6I5HQXnihQm8l6rt9TNuf8p2WEDxc8bPAZHLjNyw9a/CdeB97m2Tr zR8QplXA5kogS4kLe/7/JmlDMO8Zgm9vKLHSUeesLOrjdZ59EcjldNNBszRZQgEhwaarfz46 BSwxi7g3Mu7u5kUByanqHyA= Organization: Baylibre Message-ID: <69cb2df5-92d0-03a8-aaa8-d9c98909a11e@baylibre.com> Date: Wed, 15 Jan 2020 09:01:46 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.2.2 MIME-Version: 1.0 In-Reply-To: <1578634957-54826-4-git-send-email-hanjie.lin@amlogic.com> Content-Language: en-US X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200115_000149_375440_089A8C51 X-CRM114-Status: GOOD ( 20.02 ) 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 10/01/2020 06: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 | 85 +++++++++++++++++++++---------- > 1 file changed, 59 insertions(+), 26 deletions(-) > > diff --git a/drivers/phy/amlogic/phy-meson-g12a-usb2.c b/drivers/phy/amlogic/phy-meson-g12a-usb2.c > index 9065ffc..33296f8 100644 > --- a/drivers/phy/amlogic/phy-meson-g12a-usb2.c > +++ b/drivers/phy/amlogic/phy-meson-g12a-usb2.c > @@ -146,11 +146,17 @@ > #define RESET_COMPLETE_TIME 1000 > #define PLL_RESET_COMPLETE_TIME 100 > > +enum meson_soc_id { > + MESON_SOC_G12A = 0, > + MESON_SOC_A1, > +}; > + > struct phy_meson_g12a_usb2_priv { > struct device *dev; > struct regmap *regmap; > struct clk *clk; > struct reset_control *reset; > + int soc_id; > }; > > static const struct regmap_config phy_meson_g12a_usb2_regmap_conf = { > @@ -164,6 +170,7 @@ static int phy_meson_g12a_usb2_init(struct phy *phy) > { > struct phy_meson_g12a_usb2_priv *priv = phy_get_drvdata(phy); > int ret; > + unsigned int value; > > ret = reset_control_reset(priv->reset); > if (ret) > @@ -192,18 +199,22 @@ 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); > + value = 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->soc_id == MESON_SOC_A1) > + value |= PHY_CTRL_R18_MPLL_DCO_CLK_SEL; > + > + regmap_write(priv->regmap, PHY_CTRL_R18, value); > > udelay(PLL_RESET_COMPLETE_TIME); > > @@ -227,13 +238,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->soc_id == MESON_SOC_G12A) > + 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->soc_id == MESON_SOC_A1) { > + 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 +263,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->soc_id == MESON_SOC_G12A) { > + /* 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; > } > @@ -286,6 +310,8 @@ static int phy_meson_g12a_usb2_probe(struct platform_device *pdev) > if (IS_ERR(base)) > return PTR_ERR(base); > > + priv->soc_id = (enum meson_soc_id)of_device_get_match_data(&pdev->dev); > + > priv->regmap = devm_regmap_init_mmio(dev, base, > &phy_meson_g12a_usb2_regmap_conf); > if (IS_ERR(priv->regmap)) > @@ -321,8 +347,15 @@ 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,g12a-usb2-phy", > + .data = (void *)MESON_SOC_G12A, > + }, > + { > + .compatible = "amlogic,a1-usb2-phy", > + .data = (void *)MESON_SOC_A1, > + }, > + { /* Sentinel */ } > }; > MODULE_DEVICE_TABLE(of, phy_meson_g12a_usb2_of_match); > > Reviewed-by: Neil Armstrong _______________________________________________ linux-amlogic mailing list linux-amlogic@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-amlogic