mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Rhyland Klein <rklein@nvidia.com>
To: Peter De Schrijver <pdeschrijver@nvidia.com>,
	Thierry Reding <thierry.reding@gmail.com>
Cc: Mike Turquette <mturquette@linaro.org>,
	Stephen Warren <swarren@wwwdotorg.org>,
	Stephen Boyd <sboyd@codeaurora.org>,
	Alexandre Courbot <gnurou@gmail.com>,
	Bill Huang <bilhuang@nvidia.com>, Jim Lin <jilin@nvidia.com>,
	Benson Leung <bleung@chromium.org>,
	linux-clk@vger.kernel.org, linux-tegra@vger.kernel.org,
	linux-kernel@vger.kernel.org,
	Andrew Bresticker <abrestic@chromium.org>,
	Rhyland Klein <rklein@nvidia.com>
Subject: [PATCH v6 25/25] clk: tegra: Add interface to enable hardware control of SATA/XUSB PLLs
Date: Thu, 18 Jun 2015 17:28:40 -0400	[thread overview]
Message-ID: <1434662920-21469-26-git-send-email-rklein@nvidia.com> (raw)
In-Reply-To: <1434662920-21469-1-git-send-email-rklein@nvidia.com>

From: Andrew Bresticker <abrestic@chromium.org>

On Tegra210, hardware control of the SATA and XUSB pad PLLs must be
done during the UPHY enable sequence rather than the PLLE enable
sequence.  Export functions to do this so that hardware control can
be enabled from the XUSB padctl driver.

Signed-off-by: Andrew Bresticker <abrestic@chromium.org>
Signed-off-by: Rhyland Klein <rklein@nvidia.com>
---
 drivers/clk/tegra/clk-tegra210.c |   58 ++++++++++++++++++++++++++++++++++++++
 include/linux/clk/tegra.h        |    5 ++++
 2 files changed, 63 insertions(+)

diff --git a/drivers/clk/tegra/clk-tegra210.c b/drivers/clk/tegra/clk-tegra210.c
index 3990b5624d3a..be9843f6140d 100644
--- a/drivers/clk/tegra/clk-tegra210.c
+++ b/drivers/clk/tegra/clk-tegra210.c
@@ -175,6 +175,19 @@
 #define UTMIP_PLL_CFG1_FORCE_PLL_ENABLE_POWERDOWN BIT(14)
 #define UTMIP_PLL_CFG1_FORCE_PLL_ACTIVE_POWERDOWN BIT(12)
 
+#define SATA_PLL_CFG0				0x490
+#define SATA_PLL_CFG0_PADPLL_RESET_SWCTL	BIT(0)
+#define SATA_PLL_CFG0_PADPLL_USE_LOCKDET	BIT(2)
+#define SATA_PLL_CFG0_PADPLL_SLEEP_IDDQ		BIT(13)
+#define SATA_PLL_CFG0_SEQ_ENABLE		BIT(24)
+
+#define XUSBIO_PLL_CFG0				0x51c
+#define XUSBIO_PLL_CFG0_PADPLL_RESET_SWCTL	BIT(0)
+#define XUSBIO_PLL_CFG0_CLK_ENABLE_SWCTL	BIT(2)
+#define XUSBIO_PLL_CFG0_PADPLL_USE_LOCKDET	BIT(6)
+#define XUSBIO_PLL_CFG0_PADPLL_SLEEP_IDDQ	BIT(13)
+#define XUSBIO_PLL_CFG0_SEQ_ENABLE		BIT(24)
+
 #define UTMIPLL_HW_PWRDN_CFG0			0x52c
 #define UTMIPLL_HW_PWRDN_CFG0_UTMIPLL_LOCK	BIT(31)
 #define UTMIPLL_HW_PWRDN_CFG0_SEQ_START_STATE	BIT(25)
@@ -415,6 +428,51 @@ static const char *mux_pllmcp_clkm[] = {
 #define PLLU_MISC0_WRITE_MASK		0xbfffffff
 #define PLLU_MISC1_WRITE_MASK		0x00000007
 
+void tegra210_xusb_pll_hw_control_enable(void)
+{
+	u32 val;
+
+	val = readl_relaxed(clk_base + XUSBIO_PLL_CFG0);
+	val &= ~(XUSBIO_PLL_CFG0_CLK_ENABLE_SWCTL |
+		 XUSBIO_PLL_CFG0_PADPLL_RESET_SWCTL);
+	val |= XUSBIO_PLL_CFG0_PADPLL_USE_LOCKDET |
+	       XUSBIO_PLL_CFG0_PADPLL_SLEEP_IDDQ;
+	writel_relaxed(val, clk_base + XUSBIO_PLL_CFG0);
+}
+EXPORT_SYMBOL_GPL(tegra210_xusb_pll_hw_control_enable);
+
+void tegra210_xusb_pll_hw_sequence_start(void)
+{
+	u32 val;
+
+	val = readl_relaxed(clk_base + XUSBIO_PLL_CFG0);
+	val |= XUSBIO_PLL_CFG0_SEQ_ENABLE;
+	writel_relaxed(val, clk_base + XUSBIO_PLL_CFG0);
+}
+EXPORT_SYMBOL_GPL(tegra210_xusb_pll_hw_sequence_start);
+
+void tegra210_sata_pll_hw_control_enable(void)
+{
+	u32 val;
+
+	val = readl_relaxed(clk_base + SATA_PLL_CFG0);
+	val &= ~SATA_PLL_CFG0_PADPLL_RESET_SWCTL;
+	val |= SATA_PLL_CFG0_PADPLL_USE_LOCKDET |
+	       SATA_PLL_CFG0_PADPLL_SLEEP_IDDQ;
+	writel_relaxed(val, clk_base + SATA_PLL_CFG0);
+}
+EXPORT_SYMBOL_GPL(tegra210_sata_pll_hw_control_enable);
+
+void tegra210_sata_pll_hw_sequence_start(void)
+{
+	u32 val;
+
+	val = readl_relaxed(clk_base + SATA_PLL_CFG0);
+	val |= SATA_PLL_CFG0_SEQ_ENABLE;
+	writel_relaxed(val, clk_base + SATA_PLL_CFG0);
+}
+EXPORT_SYMBOL_GPL(tegra210_sata_pll_hw_sequence_start);
+
 static inline void _pll_misc_chk_default(void __iomem *base,
 					struct tegra_clk_pll_params *params,
 					u8 misc_num, u32 default_val, u32 mask)
diff --git a/include/linux/clk/tegra.h b/include/linux/clk/tegra.h
index 19c4208f4752..26b2041cac61 100644
--- a/include/linux/clk/tegra.h
+++ b/include/linux/clk/tegra.h
@@ -120,4 +120,9 @@ static inline void tegra_cpu_clock_resume(void)
 }
 #endif
 
+extern void tegra210_xusb_pll_hw_control_enable(void);
+extern void tegra210_xusb_pll_hw_sequence_start(void);
+extern void tegra210_sata_pll_hw_control_enable(void);
+extern void tegra210_sata_pll_hw_sequence_start(void);
+
 #endif /* __LINUX_CLK_TEGRA_H_ */
-- 
1.7.9.5


      parent reply	other threads:[~2015-06-18 21:31 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-06-18 21:28 [PATCH v6 00/25] Tegra210 Clock Support Rhyland Klein
2015-06-18 21:28 ` [PATCH v6 01/25] clk: tegra: Update struct tegra_clk_pll_params kerneldoc Rhyland Klein
2015-06-18 21:28 ` [PATCH v6 02/25] clk: tegra: Modify tegra_audio_clk_init to accept more plls Rhyland Klein
2015-06-18 21:28 ` [PATCH v6 03/25] clk: tegra: periph: add new periph clks and muxes for Tegra210 Rhyland Klein
2015-06-18 21:28 ` [PATCH v6 04/25] clk: tegra: pll: add tegra_pll_wait_for_lock to clk header Rhyland Klein
2015-06-18 21:28 ` [PATCH v6 05/25] clk: tegra: pll: simplify clk_enable_path Rhyland Klein
2015-06-18 21:28 ` [PATCH v6 06/25] clk: tegra: pll: update warning msg Rhyland Klein
2015-06-18 21:28 ` [PATCH v6 07/25] clk: tegra: pll-params: change misc_reg count from 3 -> 6 Rhyland Klein
2015-06-18 21:28 ` [PATCH v6 08/25] clk: tegra: pll: Don't unconditionally set LOCK flags Rhyland Klein
2015-06-18 21:28 ` [PATCH v6 09/25] clk: tegra: pll: Add logic for handling SDM data Rhyland Klein
2015-06-18 21:28 ` [PATCH v6 10/25] clk: tegra: pll: Add logic for out-of-table rates for T210 Rhyland Klein
2015-06-18 21:28 ` [PATCH v6 11/25] clk: tegra: pll: Add code to handle if resets are supported by PLL Rhyland Klein
2015-06-18 21:28 ` [PATCH v6 12/25] clk: tegra: Update PLLM handling Rhyland Klein
2015-06-18 21:28 ` [PATCH v6 13/25] clk: tegra: pll: Add specialized logic for T210 Rhyland Klein
2015-06-18 21:28 ` [PATCH v6 14/25] clk: tegra: pll: Add support for PLLMB " Rhyland Klein
2015-06-18 21:28 ` [PATCH v6 15/25] clk: tegra: pll: Adjust vco_min if SDM present Rhyland Klein
2015-06-18 21:28 ` [PATCH v6 16/25] clk: tegra: pll: Add Set_default logic Rhyland Klein
2015-06-18 21:28 ` [PATCH v6 17/25] clk: tegra: pll: Add dyn_ramp callback Rhyland Klein
2015-06-18 21:28 ` [PATCH v6 18/25] clk: tegra: pll: Add logic for SS Rhyland Klein
2015-06-18 21:28 ` [PATCH v6 19/25] clk: tegra: pll: Fix _pll_ramp_calc_pll logic and _calc_dynamic_ramp_rate Rhyland Klein
2015-06-18 21:28 ` [PATCH v6 20/25] clk: tegra: Add Super Gen5 Logic Rhyland Klein
2015-06-18 21:28 ` [PATCH v6 21/25] clk: tegra210: add support for Tegra210 clocks Rhyland Klein
2015-06-18 21:28 ` [PATCH v6 22/25] clk: tegra: pll: Fix issues with rates for VCO PLLs Rhyland Klein
2015-06-18 21:28 ` [PATCH v6 23/25] clk: tegra: fix WARN_ON in PLL_RE registration Rhyland Klein
2015-06-18 21:28 ` [PATCH v6 24/25] clk: tegra: read correct iddq register in PLL_SS registration Rhyland Klein
2015-06-18 21:28 ` Rhyland Klein [this message]

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=1434662920-21469-26-git-send-email-rklein@nvidia.com \
    --to=rklein@nvidia.com \
    --cc=abrestic@chromium.org \
    --cc=bilhuang@nvidia.com \
    --cc=bleung@chromium.org \
    --cc=gnurou@gmail.com \
    --cc=jilin@nvidia.com \
    --cc=linux-clk@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tegra@vger.kernel.org \
    --cc=mturquette@linaro.org \
    --cc=pdeschrijver@nvidia.com \
    --cc=sboyd@codeaurora.org \
    --cc=swarren@wwwdotorg.org \
    --cc=thierry.reding@gmail.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

all inboxes | Powered by JetHome®