Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp231884ybl; Thu, 5 Dec 2019 18:50:25 -0800 (PST) X-Google-Smtp-Source: APXvYqzly2dPJ23uwTkjp1QjshKjJtc5TKgEakMvb9wOHFUF9/cqyi7+Yp1t8dC2zMczc/8vhAIy X-Received: by 2002:a9d:73ca:: with SMTP id m10mr9248270otk.289.1575600625423; Thu, 05 Dec 2019 18:50:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575600625; cv=none; d=google.com; s=arc-20160816; b=rVRMv/JSCTRmsd0OfQ/eqT94eMovwmgtM2D0JagKTqBfPZ1fnFrcUO0KzbQqdQUic5 ENKxXnX1USGalTPmlCWkEawNKBgOl6NajrTQV3otqHwxQcSin32Gu+/kyiXQ1a1U5nm1 27rvdKfaFpS+YACrendaj4qKEVj2HA5h1yhLSNTeix16L4KzpNchuMh01eXAWluWoKPk RyneAvnupIB/kzQqzFdCQo22ml7Qdyry8sV4VLaounp+VOIg2nHK6EUbr6JQooth5SkS TOsA40HGMLqYDeDoEnzkXmO/wmqTTklwEYiVn+UmVHToqHiu10DTBljFYxNBcSl/MysD PmRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:dkim-signature:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from; bh=oxw9SgZ2Sbq71IPUJI3V62H7+XD2x5snoum836QL4U8=; b=E9LdXva0DqLKRr67OL+u0AC4dFmrcrpfhseu5B6ezI5kqQcqcTg+28qEXlJoyepDkr UfPrZtE9MRYe4fpAPx4BEKxWJb1JFXpvtc17Z/INIWt5aiGjBi+dCBHK7M/rkyBLR2Pw Z6afqs861vfZNrbDEyoparpeAcLBNUf67gFf8AWWi7R1ZznhHAovPmZgDj3WOgHpDsbC WxxmNCn0608tMjAG9vGhO0h0b0FgLBpVOY5S5letDN1EYnOFqjjBUetQlrf3GC4F9/MX A3Dr9U5yKwpu1BbfqhzvgC5Y+vx9RABO0RhnD0bB8iymj0NuvAoBIbqES+NXRliTTObP i4Kg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nvidia.com header.s=n1 header.b=GhZ9w0RU; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=nvidia.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 11si7703489otz.101.2019.12.05.18.50.13; Thu, 05 Dec 2019 18:50:25 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nvidia.com header.s=n1 header.b=GhZ9w0RU; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=nvidia.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726811AbfLFCtK (ORCPT + 99 others); Thu, 5 Dec 2019 21:49:10 -0500 Received: from hqnvemgate24.nvidia.com ([216.228.121.143]:15964 "EHLO hqnvemgate24.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726659AbfLFCtG (ORCPT ); Thu, 5 Dec 2019 21:49:06 -0500 Received: from hqpgpgate101.nvidia.com (Not Verified[216.228.121.13]) by hqnvemgate24.nvidia.com (using TLS: TLSv1.2, DES-CBC3-SHA) id ; Thu, 05 Dec 2019 18:48:49 -0800 Received: from hqmail.nvidia.com ([172.20.161.6]) by hqpgpgate101.nvidia.com (PGP Universal service); Thu, 05 Dec 2019 18:49:05 -0800 X-PGP-Universal: processed; by hqpgpgate101.nvidia.com on Thu, 05 Dec 2019 18:49:05 -0800 Received: from HQMAIL109.nvidia.com (172.20.187.15) by HQMAIL111.nvidia.com (172.20.187.18) with Microsoft SMTP Server (TLS) id 15.0.1473.3; Fri, 6 Dec 2019 02:49:05 +0000 Received: from rnnvemgw01.nvidia.com (10.128.109.123) by HQMAIL109.nvidia.com (172.20.187.15) with Microsoft SMTP Server (TLS) id 15.0.1473.3 via Frontend Transport; Fri, 6 Dec 2019 02:49:04 +0000 Received: from skomatineni-linux.nvidia.com (Not Verified[10.2.163.171]) by rnnvemgw01.nvidia.com with Trustwave SEG (v7,5,8,10121) id ; Thu, 05 Dec 2019 18:49:04 -0800 From: Sowjanya Komatineni To: , , , , , , , , , CC: , , , , , , , , , , , , , , , , , , , , , , , Subject: [PATCH v3 05/15] soc: pmc: Add blink output clock registration to Tegra PMC Date: Thu, 5 Dec 2019 18:48:45 -0800 Message-ID: <1575600535-26877-6-git-send-email-skomatineni@nvidia.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1575600535-26877-1-git-send-email-skomatineni@nvidia.com> References: <1575600535-26877-1-git-send-email-skomatineni@nvidia.com> X-NVConfidentiality: public MIME-Version: 1.0 Content-Type: text/plain DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nvidia.com; s=n1; t=1575600529; bh=oxw9SgZ2Sbq71IPUJI3V62H7+XD2x5snoum836QL4U8=; h=X-PGP-Universal:From:To:CC:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:X-NVConfidentiality:MIME-Version: Content-Type; b=GhZ9w0RUPPTl79AEKZCbA87PwZVP94kL7EvwZGt/rSakMWMj+Qz8YY0JuTPk/qYXw gYVyZaRzyqy9DEj8f3bLxe38Fh/H35d4yV0QKwjUilFHaH5fgXWT957xLqQPap9a7/ 2O+hV2cnIQbzsmReHwJxFtOOyUA+CduIZ9HJu9wCjCHXCIjWwBJmuL/LXDPH1fvmKP LTZn5xCDNqDnUEQ90dYK8SV/wQ58mL8i11ZfIA6cRx0Abce0V+3q7fbQi3fGXPLz5C 8XTlgVgY5zJt83lKXTO7oNWEHih0jGeQ/nqwYgcOBV9IP0WFoWpspl7ofD90H7k43T V8co+vVu0OAgg== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Tegra PMC has blink control to output 32 Khz clock out to Tegra blink pin. Blink pad DPD state and enable controls are part of Tegra PMC register space. Currently Tegra clock driver registers blink control by passing PMC address and register offset to clk_register_gate which performs direct PMC access during clk_ops and with this when PMC is in secure mode, any access from non-secure world does not go through. This patch adds blink control registration to the Tegra PMC driver using PMC specific clock gate operations that use tegra_pmc_readl and tegra_pmc_writel to support both secure mode and non-secure mode PMC register access. Signed-off-by: Sowjanya Komatineni --- drivers/soc/tegra/pmc.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/drivers/soc/tegra/pmc.c b/drivers/soc/tegra/pmc.c index b8f6eb0ed8aa..c62ab84cce9c 100644 --- a/drivers/soc/tegra/pmc.c +++ b/drivers/soc/tegra/pmc.c @@ -61,12 +61,15 @@ #define PMC_CNTRL_SYSCLK_OE BIT(11) /* system clock enable */ #define PMC_CNTRL_SYSCLK_POLARITY BIT(10) /* sys clk polarity */ #define PMC_CNTRL_PWRREQ_POLARITY BIT(8) +#define PMC_CNTRL_BLINK_EN 7 #define PMC_CNTRL_MAIN_RST BIT(4) #define PMC_WAKE_MASK 0x0c #define PMC_WAKE_LEVEL 0x10 #define PMC_WAKE_STATUS 0x14 #define PMC_SW_WAKE_STATUS 0x18 +#define PMC_DPD_PADS_ORIDE 0x1c +#define PMC_DPD_PADS_ORIDE_BLINK 20 #define DPD_SAMPLE 0x020 #define DPD_SAMPLE_ENABLE BIT(0) @@ -79,6 +82,7 @@ #define PWRGATE_STATUS 0x38 +#define PMC_BLINK_TIMER 0x40 #define PMC_IMPL_E_33V_PWR 0x40 #define PMC_PWR_DET 0x48 @@ -339,6 +343,7 @@ struct tegra_pmc_soc { const struct pmc_clk_init_data *pmc_clks_data; unsigned int num_pmc_clks; + bool has_blink_output; }; static const char * const tegra186_reset_sources[] = { @@ -2388,6 +2393,9 @@ static void tegra_pmc_clock_register(struct tegra_pmc *pmc, /* each pmc clock output has a mux and a gate */ num_clks = pmc->soc->num_pmc_clks * 2; + if (pmc->soc->has_blink_output) + num_clks += 1; + if (!num_clks) return; @@ -2442,6 +2450,26 @@ static void tegra_pmc_clock_register(struct tegra_pmc *pmc, clk_register_clkdev(clk, data->dev_name, data->gate_name); } + if (pmc->soc->has_blink_output) { + tegra_pmc_writel(pmc, 0x0, PMC_BLINK_TIMER); + clk = tegra_pmc_clk_gate_register("blink_override", + "clk_32k", 0, + PMC_DPD_PADS_ORIDE, + PMC_DPD_PADS_ORIDE_BLINK); + if (IS_ERR(clk)) + goto free_clks; + + clk = tegra_pmc_clk_gate_register("blink", + "blink_override", 0, + PMC_CNTRL, + PMC_CNTRL_BLINK_EN); + if (IS_ERR(clk)) + goto free_clks; + + clk_data->clks[TEGRA_PMC_CLK_BLINK] = clk; + clk_register_clkdev(clk, "blink", NULL); + } + of_clk_add_provider(np, of_clk_src_onecell_get, clk_data); return; @@ -2715,6 +2743,7 @@ static const struct tegra_pmc_soc tegra20_pmc_soc = { .num_reset_levels = 0, .pmc_clks_data = NULL, .num_pmc_clks = 0, + .has_blink_output = true, }; static const char * const tegra30_powergates[] = { @@ -2764,6 +2793,7 @@ static const struct tegra_pmc_soc tegra30_pmc_soc = { .num_reset_levels = 0, .pmc_clks_data = tegra_pmc_clks_data, .num_pmc_clks = ARRAY_SIZE(tegra_pmc_clks_data), + .has_blink_output = true, }; static const char * const tegra114_powergates[] = { @@ -2817,6 +2847,7 @@ static const struct tegra_pmc_soc tegra114_pmc_soc = { .num_reset_levels = 0, .pmc_clks_data = tegra_pmc_clks_data, .num_pmc_clks = ARRAY_SIZE(tegra_pmc_clks_data), + .has_blink_output = true, }; static const char * const tegra124_powergates[] = { @@ -2930,6 +2961,7 @@ static const struct tegra_pmc_soc tegra124_pmc_soc = { .num_reset_levels = 0, .pmc_clks_data = tegra_pmc_clks_data, .num_pmc_clks = ARRAY_SIZE(tegra_pmc_clks_data), + .has_blink_output = true, }; static const char * const tegra210_powergates[] = { @@ -3046,6 +3078,7 @@ static const struct tegra_pmc_soc tegra210_pmc_soc = { .wake_events = tegra210_wake_events, .pmc_clks_data = tegra_pmc_clks_data, .num_pmc_clks = ARRAY_SIZE(tegra_pmc_clks_data), + .has_blink_output = true, }; #define TEGRA186_IO_PAD_TABLE(_pad) \ @@ -3177,6 +3210,7 @@ static const struct tegra_pmc_soc tegra186_pmc_soc = { .wake_events = tegra186_wake_events, .pmc_clks_data = NULL, .num_pmc_clks = 0, + .has_blink_output = false, }; static const struct tegra_io_pad_soc tegra194_io_pads[] = { @@ -3296,6 +3330,7 @@ static const struct tegra_pmc_soc tegra194_pmc_soc = { .wake_events = tegra194_wake_events, .pmc_clks_data = NULL, .num_pmc_clks = 0, + .has_blink_output = false, }; static const struct of_device_id tegra_pmc_match[] = { -- 2.7.4