linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Brian Norris <briannorris@chromium.org>
To: Kishon Vijay Abraham I <kishon@ti.com>
Cc: Heiko Stuebner <heiko@sntech.de>,
	linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org,
	Doug Anderson <dianders@chromium.org>,
	Shawn Lin <shawn.lin@rock-chips.com>,
	linux-arm-kernel@lists.infradead.org,
	Brian Norris <computersforpeace@gmail.com>
Subject: [PATCH v2 2/4] phy: rockchip-emmc: configure frequency range and drive impedance
Date: Fri, 13 May 2016 14:09:43 -0700	[thread overview]
Message-ID: <20160513210943.GB99074@google.com> (raw)
In-Reply-To: <1463092986-61777-2-git-send-email-briannorris@chromium.org>

From: Shawn Lin <shawn.lin@rock-chips.com>

Signal integrity analysis has suggested we set these values. Do this in
power_on(), so that they get reconfigured after suspend/resume.

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Signed-off-by: Brian Norris <briannorris@chromium.org>
---
v2:
 * Sent only patch 2/4 with version 2, to avoid spamming; will move on to v3
   for all patches if I need to send another
 * Drop 170 MHz comment; this was only applicable to a subtly different Arasan
   PHY

 drivers/phy/phy-rockchip-emmc.c | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/drivers/phy/phy-rockchip-emmc.c b/drivers/phy/phy-rockchip-emmc.c
index 48cbe691a889..f2f75cf69af1 100644
--- a/drivers/phy/phy-rockchip-emmc.c
+++ b/drivers/phy/phy-rockchip-emmc.c
@@ -56,6 +56,19 @@
 #define PHYCTRL_DLLRDY_SHIFT	0x5
 #define PHYCTRL_DLLRDY_DONE	0x1
 #define PHYCTRL_DLLRDY_GOING	0x0
+#define PHYCTRL_FREQSEL_200M	0x0
+#define PHYCTRL_FREQSEL_50M	0x1
+#define PHYCTRL_FREQSEL_100M	0x2
+#define PHYCTRL_FREQSEL_150M	0x3
+#define PHYCTRL_FREQSEL_MASK	0x3
+#define PHYCTRL_FREQSEL_SHIFT	0xc
+#define PHYCTRL_DR_MASK		0x7
+#define PHYCTRL_DR_SHIFT	0x4
+#define PHYCTRL_DR_50OHM	0x0
+#define PHYCTRL_DR_33OHM	0x1
+#define PHYCTRL_DR_66OHM	0x2
+#define PHYCTRL_DR_100OHM	0x3
+#define PHYCTRL_DR_40OHM	0x4
 
 struct rockchip_emmc_phy {
 	unsigned int	reg_offset;
@@ -154,6 +167,20 @@ static int rockchip_emmc_phy_power_on(struct phy *phy)
 	struct rockchip_emmc_phy *rk_phy = phy_get_drvdata(phy);
 	int ret = 0;
 
+	/* DLL operation: 200 MHz */
+	regmap_write(rk_phy->reg_base,
+		     rk_phy->reg_offset + GRF_EMMCPHY_CON0,
+		     HIWORD_UPDATE(PHYCTRL_FREQSEL_200M,
+				   PHYCTRL_FREQSEL_MASK,
+				   PHYCTRL_FREQSEL_SHIFT));
+
+	/* Drive impedance: 50 Ohm */
+	regmap_write(rk_phy->reg_base,
+		     rk_phy->reg_offset + GRF_EMMCPHY_CON6,
+		     HIWORD_UPDATE(PHYCTRL_DR_50OHM,
+				   PHYCTRL_DR_MASK,
+				   PHYCTRL_DR_SHIFT));
+
 	/* Power up emmc phy analog blocks */
 	ret = rockchip_emmc_phy_power(rk_phy, PHYCTRL_PDB_PWR_ON);
 	if (ret)
-- 
2.8.0.rc3.226.g39d4020

  parent reply	other threads:[~2016-05-13 21:09 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-05-12 22:43 [PATCH 1/4] phy: rockchip-emmc: give DLL some extra time to be ready Brian Norris
2016-05-12 22:43 ` [PATCH 2/4] phy: rockchip-emmc: configure frequency range and drive impedance Brian Norris
2016-05-13  1:02   ` Shawn Lin
2016-05-13 18:46     ` Doug Anderson
2016-05-13 21:04       ` Brian Norris
2016-05-24  4:51       ` Doug Anderson
2016-05-13 21:09   ` Brian Norris [this message]
2016-05-13 22:04     ` [PATCH v2 " Doug Anderson
2016-06-16 23:36     ` Heiko Stuebner
2016-06-20 13:11   ` [PATCH " Kishon Vijay Abraham I
2016-05-12 22:43 ` [PATCH 3/4] phy: rockchip-emmc: configure default output tap delay Brian Norris
2016-05-13 22:25   ` Doug Anderson
2016-05-16  4:15     ` Shawn Lin
2016-05-16 15:12       ` Doug Anderson
2016-06-16 23:36   ` Heiko Stuebner
2016-06-20 13:11   ` Kishon Vijay Abraham I
2016-05-12 22:43 ` [PATCH 4/4] phy: rockchip-emmc: reindent the register definitions Brian Norris
2016-05-13 22:26   ` Doug Anderson
2016-06-16 23:37   ` Heiko Stuebner
2016-06-20 13:12   ` Kishon Vijay Abraham I
2016-05-13 22:01 ` [PATCH 1/4] phy: rockchip-emmc: give DLL some extra time to be ready Doug Anderson
2016-06-16 23:35 ` Heiko Stuebner
2016-06-20 13:11 ` Kishon Vijay Abraham I
2016-06-20 16:19   ` Brian Norris
2016-06-20 16:25     ` Doug Anderson
2016-06-20 16:50       ` Brian Norris

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20160513210943.GB99074@google.com \
    --to=briannorris@chromium.org \
    --cc=computersforpeace@gmail.com \
    --cc=dianders@chromium.org \
    --cc=heiko@sntech.de \
    --cc=kishon@ti.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-rockchip@lists.infradead.org \
    --cc=shawn.lin@rock-chips.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).