soc/tegra: pmc: Sort includes alphabetically
PATCH 1/7 soc/tegra: pmc: Sort includes alphabetically
From: Thierry Reding <[email protected]>
This will make it easier to insert new includes in the right place in subsequent patches.
--- drivers/soc/tegra/pmc.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/soc/tegra/pmc.c +5 -5
@@ -20,7 +20,6 @@#define pr_fmt (fmt) "tegra-pmc: " fmt -#include <linux/kernel.h> #include <linux/clk.h> #include <linux/clk/tegra.h> #include <linux/debugfs.h>
@@ -30,16 +29,17 @@#include <linux/init.h> #include <linux/io.h> #include <linux/iopoll.h> -#include <linux/irq.h> #include <linux/irqdomain.h> -#include <linux/of.h> +#include <linux/irq.h> +#include <linux/kernel.h> #include <linux/of_address.h> #include <linux/of_clk.h> +#include <linux/of.h> #include <linux/of_irq.h> #include <linux/of_platform.h> -#include <linux/pinctrl/pinctrl.h> -#include <linux/pinctrl/pinconf.h> #include <linux/pinctrl/pinconf-generic.h> +#include <linux/pinctrl/pinconf.h> +#include <linux/pinctrl/pinctrl.h> #include <linux/platform_device.h> #include <linux/pm_domain.h> #include <linux/reboot.h>
Signature · 1 line
2.19.1
PATCH 2/7 soc/tegra: pmc: Add missing kerneldoc
From: Thierry Reding <[email protected]>
Some of the fields in struct tegra_pmc had not been documented when they were added. Add the missing kerneldoc.
--- drivers/soc/tegra/pmc.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/soc/tegra/pmc.c +6 -0
@@ -273,6 +273,9 @@ static const char * const tegra30_reset_sources[] = {* struct tegra_pmc - NVIDIA Tegra PMC * @dev: pointer to PMC device structure * @base: pointer to I/O remapped register region +* @wake: pointer to I/O remapped region for WAKE registers +* @aotag: pointer to I/O remapped region for AOTAG registers +* @scratch: pointer to I/O remapped region for scratch registers * @clk: pointer to pclk clock * @soc: pointer to SoC data structure * @debugfs: pointer to debugfs entry
@@ -291,6 +294,9 @@ static const char * const tegra30_reset_sources[] = {* @lp0_vec_size: size of the LP0 warm boot code * @powergates_available: Bitmap of available power gates * @powergates_lock: mutex for power gate register access +* @pctl_dev: pin controller exposed by the PMC +* @domain: IRQ domain provided by the PMC +* @irq: chip implementation for the IRQ domain */ struct tegra_pmc {struct device *dev;
Signature · 1 line
2.19.1
Re: [PATCH 2/7] soc/tegra: pmc: Add missing kerneldoc
Quoted 26 lines · Thierry Reding
From: Thierry Reding <[email protected]>
Some of the fields in struct
tegra_pmchad not been documented when they were added. Add the missing kerneldoc.Signed-off-by Thierry Reding <[email protected]>--- drivers/soc/tegra/pmc.c | 6 ++++++ 1 file changed, 6 insertions(+)drivers/soc/tegra/pmc.c +3
-0@@ -273,6 +273,9 @@ static const char * const tegra30_reset_sources[] = {* struct tegra_pmc - NVIDIA Tegra PMC * @dev: pointer to PMC device structure * @base: pointer to I/O remapped register region +* @wake: pointer to I/O remapped region for WAKE registers +* @aotag: pointer to I/O remapped region for AOTAG registers +* @scratch: pointer to I/O remapped region for scratch registers * @clk: pointer to pclk clock * @soc: pointer to SoC data structure * @debugfs: pointer to debugfs entry
drivers/soc/tegra/pmc.c static const char * const tegra30_reset_sources[] = { · line 302
Quoted 9 lines
drivers/soc/tegra/pmc.c +3
-0@@ -291,6 +294,9 @@ static const char * const tegra30_reset_sources[] = {* @lp0_vec_size: size of the LP0 warm boot code * @powergates_available: Bitmap of available power gates * @powergates_lock: mutex for power gate register access +* @pctl_dev: pin controller exposed by the PMC +* @domain: IRQ domain provided by the PMC +* @irq: chip implementation for the IRQ domain */ struct tegra_pmc {struct device *dev;
Cheers
Jon
Signature · 1 line
nvpublic
PATCH 3/7 soc/tegra: pmc: Make tegra_powergate_is_powered() a local function
In reply to Thierry RedingFrom: Jon Hunter <[email protected]>
Now there are no more external users of tegra_powergate_is_powered(), make this a local function.
--- drivers/soc/tegra/pmc.c | 2 +- include/soc/tegra/pmc.h | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-)
drivers/soc/tegra/pmc.c +1 -1
@@ -637,7 +637,7 @@ EXPORT_SYMBOL(tegra_powergate_power_off);* tegra_powergate_is_powered() - check if partition is powered * @id: partition ID */ -int tegra_powergate_is_powered (unsigned int id) +static int tegra_powergate_is_powered (unsigned int id) {if (!tegra_powergate_is_valid (id))return -EINVAL ;
include/soc/tegra/pmc.h +0 -6
@@ -161,7 +161,6 @@ enum tegra_io_pad {#define TEGRA_IO_RAIL_LVDS TEGRA_IO_PAD_LVDS#ifdef CONFIG_SOC_TEGRA_PMC -int tegra_powergate_is_powered (unsigned int id);int tegra_powergate_power_on (unsigned int id);int tegra_powergate_power_off (unsigned int id);int tegra_powergate_remove_clamping (unsigned int id);
@@ -182,11 +181,6 @@ void tegra_pmc_set_suspend_mode(enum tegra_suspend_mode mode);void tegra_pmc_enter_suspend_mode (enum tegra_suspend_mode mode);#else -static inline int tegra_powergate_is_powered (unsigned int id) -{ -return -ENOSYS ; -} -static inline int tegra_powergate_power_on (unsigned int id) {return -ENOSYS ;
Signature · 1 line
2.19.1
PATCH 4/7 soc/tegra: pmc: Pass struct tegra_pmc * where possible
In reply to Thierry RedingFrom: Thierry Reding <[email protected]>
Instead of using the global pmc variable, pass around a pointer where possible. Also, replace most occurrences of pr_*() functions by their equivalent dev_*() functions, reusing the pmc->dev pointer.
It's not possible to get completely rid of the global variable because some of the public API that this driver exposes still relies on it.
--- drivers/soc/tegra/pmc.c | 267 +++++++++++++++++++++++----------------- 1 file changed, 152 insertions(+), 115 deletions(-)
drivers/soc/tegra/pmc.c +152 -115
@@ -344,30 +344,36 @@ to_powergate(struct generic_pm_domain *domain) return container_of(domain, struct tegra_powergate, genpd); } -static u32 tegra_pmc_readl (unsigned long offset) +static u32 tegra_pmc_readl (struct tegra_pmc *pmc,unsigned long offset) {return readl (pmc->base + offset); } -static void tegra_pmc_writel (u32 value,unsigned long offset) +static void tegra_pmc_writel (struct tegra_pmc *pmc,u32 value, +unsigned long offset) {writel (value, pmc->base + offset); } +/* +* TODO Figure out a way to call this with the struct tegra_pmc * passed in. +* This currently doesn't work because readx_poll_timeout() can only operate +* on functions that take a single argument. +*/ static inline bool tegra_powergate_state (int id) {if (id ==TEGRA_POWERGATE_3D && pmc->soc->has_gpu_clamps) -return (tegra_pmc_readl (GPU_RG_CNTRL ) &0x1 ) ==0 ; +return (tegra_pmc_readl (pmc,GPU_RG_CNTRL ) &0x1 ) ==0 ;else -return (tegra_pmc_readl (PWRGATE_STATUS ) &BIT (id)) !=0 ; +return (tegra_pmc_readl (pmc,PWRGATE_STATUS ) &BIT (id)) !=0 ; } -static inline bool tegra_powergate_is_valid (int id) +static inline bool tegra_powergate_is_valid (struct tegra_pmc *pmc,int id) {return (pmc->soc && pmc->soc->powergates[id]); } -static inline bool tegra_powergate_is_available (int id) +static inline bool tegra_powergate_is_available (struct tegra_pmc *pmc,int id) {return test_bit (id, pmc->powergates_available); }
@@ -380,7 +386,7 @@ static int tegra_powergate_lookup(struct tegra_pmc *pmc, const char *name)return -EINVAL ;for (i =0 ; i < pmc->soc->num_powergates; i++) { -if (!tegra_powergate_is_valid (i)) +if (!tegra_powergate_is_valid (pmc, i))continue ;if (!strcmp (name, pmc->soc->powergates[i]))
@@ -392,10 +398,12 @@ static int tegra_powergate_lookup(struct tegra_pmc *pmc, const char *name)/** * tegra_powergate_set() - set the state of a partition +* @pmc: power management controller * @id: partition ID * @new_state: new state of the partition */ -static int tegra_powergate_set (unsigned int id,bool new_state) +static int tegra_powergate_set (struct tegra_pmc *pmc,unsigned int id, +bool new_state) {bool status;int err;
@@ -410,7 +418,7 @@ static int tegra_powergate_set(unsigned int id, bool new_state)return 0 ; } -tegra_pmc_writel (PWRGATE_TOGGLE_START | id,PWRGATE_TOGGLE ); +tegra_pmc_writel (pmc,PWRGATE_TOGGLE_START | id,PWRGATE_TOGGLE ); err =readx_poll_timeout (tegra_powergate_state, id, status, status == new_state,10 ,100000 );
@@ -420,7 +428,8 @@ static int tegra_powergate_set(unsigned int id, bool new_state)return err; } -static int __tegra_powergate_remove_clamping (unsigned int id) +static int __tegra_powergate_remove_clamping (struct tegra_pmc *pmc, +unsigned int id) {u32 mask;
@@ -432,7 +441,7 @@ static int __tegra_powergate_remove_clamping(unsigned int id)*/ if (id ==TEGRA_POWERGATE_3D ) {if (pmc->soc->has_gpu_clamps) { -tegra_pmc_writel (0 ,GPU_RG_CNTRL ); +tegra_pmc_writel (pmc,0 ,GPU_RG_CNTRL ); goto out; } }
@@ -448,7 +457,7 @@ static int __tegra_powergate_remove_clamping(unsigned int id)else mask = (1 << id); -tegra_pmc_writel (mask,REMOVE_CLAMPING ); +tegra_pmc_writel (pmc, mask,REMOVE_CLAMPING ); out:mutex_unlock (&pmc->powergates_lock);
@@ -500,7 +509,7 @@ static int tegra_powergate_power_up(struct tegra_powergate *pg,usleep_range (10 ,20 ); - err =tegra_powergate_set (pg->id, true); + err =tegra_powergate_set (pg->pmc, pg->id, true);if (err <0 )return err;
@@ -512,7 +521,7 @@ static int tegra_powergate_power_up(struct tegra_powergate *pg,usleep_range (10 ,20 ); - err =__tegra_powergate_remove_clamping (pg->id); + err =__tegra_powergate_remove_clamping (pg->pmc, pg->id);if (err) goto disable_clks;
@@ -539,7 +548,7 @@ static int tegra_powergate_power_up(struct tegra_powergate *pg,usleep_range (10 ,20 ); powergate_off: -tegra_powergate_set (pg->id, false); +tegra_powergate_set (pg->pmc, pg->id, false);return err; }
@@ -564,7 +573,7 @@ static int tegra_powergate_power_down(struct tegra_powergate *pg)usleep_range (10 ,20 ); - err =tegra_powergate_set (pg->id, false); + err =tegra_powergate_set (pg->pmc, pg->id, false);if (err) goto assert_resets;
@@ -585,12 +594,13 @@ static int tegra_powergate_power_down(struct tegra_powergate *pg)static int tegra_genpd_power_on (struct generic_pm_domain *domain) {struct tegra_powergate *pg =to_powergate (domain); +struct device *dev = pg->pmc->dev;int err; err =tegra_powergate_power_up (pg, true);if (err) -pr_err ("failed to turn on PM domain %s: %d\n" , pg->genpd.name, - err); +dev_err (dev,"failed to turn on PM domain %s: %d\n" , + pg->genpd.name, err);return err; }
@@ -598,12 +608,13 @@ static int tegra_genpd_power_on(struct generic_pm_domain *domain)static int tegra_genpd_power_off (struct generic_pm_domain *domain) {struct tegra_powergate *pg =to_powergate (domain); +struct device *dev = pg->pmc->dev;int err; err =tegra_powergate_power_down (pg);if (err) -pr_err ("failed to turn off PM domain %s: %d\n" , - pg->genpd.name, err); +dev_err (dev,"failed to turn off PM domain %s: %d\n" , + pg->genpd.name, err);return err; }
@@ -614,10 +625,10 @@ static int tegra_genpd_power_off(struct generic_pm_domain *domain)*/ int tegra_powergate_power_on (unsigned int id) { -if (!tegra_powergate_is_available (id)) +if (!tegra_powergate_is_available (pmc, id))return -EINVAL ; -return tegra_powergate_set (id, true); +return tegra_powergate_set (pmc, id, true); }/**
@@ -626,20 +637,21 @@ int tegra_powergate_power_on(unsigned int id)*/ int tegra_powergate_power_off (unsigned int id) { -if (!tegra_powergate_is_available (id)) +if (!tegra_powergate_is_available (pmc, id))return -EINVAL ; -return tegra_powergate_set (id, false); +return tegra_powergate_set (pmc, id, false); }EXPORT_SYMBOL (tegra_powergate_power_off);/** * tegra_powergate_is_powered() - check if partition is powered +* @pmc: power management controller * @id: partition ID */ -static int tegra_powergate_is_powered (unsigned int id) +static int tegra_powergate_is_powered (struct tegra_pmc *pmc,unsigned int id) { -if (!tegra_powergate_is_valid (id)) +if (!tegra_powergate_is_valid (pmc, id))return -EINVAL ;return tegra_powergate_state (id);
@@ -651,10 +663,10 @@ static int tegra_powergate_is_powered(unsigned int id)*/ int tegra_powergate_remove_clamping (unsigned int id) { -if (!tegra_powergate_is_available (id)) +if (!tegra_powergate_is_available (pmc, id))return -EINVAL ; -return __tegra_powergate_remove_clamping (id); +return __tegra_powergate_remove_clamping (pmc, id); }EXPORT_SYMBOL (tegra_powergate_remove_clamping);
@@ -672,7 +684,7 @@ int tegra_powergate_sequence_power_up(unsigned int id, struct clk *clk,struct tegra_powergate *pg;int err; -if (!tegra_powergate_is_available (id)) +if (!tegra_powergate_is_available (pmc, id))return -EINVAL ; pg =kzalloc (sizeof (*pg),GFP_KERNEL );
@@ -687,7 +699,8 @@ int tegra_powergate_sequence_power_up(unsigned int id, struct clk *clk, err =tegra_powergate_power_up (pg, false);if (err) -pr_err ("failed to turn on partition %d: %d\n" , id, err); +dev_err (pmc->dev,"failed to turn on partition %d: %d\n" , id, + err);kfree (pg);
@@ -697,12 +710,14 @@ EXPORT_SYMBOL(tegra_powergate_sequence_power_up);/** * tegra_get_cpu_powergate_id() - convert from CPU ID to partition ID +* @pmc: power management controller * @cpuid: CPU partition ID * * Returns the partition ID corresponding to the CPU partition ID or a * negative error code on failure. */ -static int tegra_get_cpu_powergate_id (unsigned int cpuid) +static int tegra_get_cpu_powergate_id (struct tegra_pmc *pmc, +unsigned int cpuid) {if (pmc->soc && cpuid < pmc->soc->num_cpu_powergates)return pmc->soc->cpu_powergates[cpuid];
@@ -718,11 +733,11 @@ bool tegra_pmc_cpu_is_powered(unsigned int cpuid) {int id; - id =tegra_get_cpu_powergate_id (cpuid); + id =tegra_get_cpu_powergate_id (pmc, cpuid);if (id <0 )return false; -return tegra_powergate_is_powered (id); +return tegra_powergate_is_powered (pmc, id); }/**
@@ -733,11 +748,11 @@ int tegra_pmc_cpu_power_on(unsigned int cpuid) {int id; - id =tegra_get_cpu_powergate_id (cpuid); + id =tegra_get_cpu_powergate_id (pmc, cpuid);if (id <0 )return id; -return tegra_powergate_set (id, true); +return tegra_powergate_set (pmc, id, true); }/**
@@ -748,7 +763,7 @@ int tegra_pmc_cpu_remove_clamping(unsigned int cpuid) {int id; - id =tegra_get_cpu_powergate_id (cpuid); + id =tegra_get_cpu_powergate_id (pmc, cpuid);if (id <0 )return id;
@@ -778,9 +793,9 @@ static int tegra_pmc_restart_notify(struct notifier_block *this,writel (value, pmc->scratch + pmc->soc->regs->scratch0);/* reset everything but PMC_SCRATCH0 and PMC_RST_STATUS */ - value =tegra_pmc_readl (PMC_CNTRL ); + value =tegra_pmc_readl (pmc,PMC_CNTRL ); value |=PMC_CNTRL_MAIN_RST ; -tegra_pmc_writel (value,PMC_CNTRL ); +tegra_pmc_writel (pmc, value,PMC_CNTRL );return NOTIFY_DONE ; }
@@ -799,7 +814,7 @@ static int powergate_show(struct seq_file *s, void *data)seq_printf (s,"------------------\n" );for (i =0 ; i < pmc->soc->num_powergates; i++) { - status =tegra_powergate_is_powered (i); + status =tegra_powergate_is_powered (pmc, i);if (status <0 )continue ;
@@ -861,12 +876,13 @@ static int tegra_powergate_of_get_clks(struct tegra_powergate *pg,static int tegra_powergate_of_get_resets (struct tegra_powergate *pg,struct device_node *np,bool off) { +struct device *dev = pg->pmc->dev;int err; pg->reset =of_reset_control_array_get_exclusive (np);if (IS_ERR (pg->reset)) { err =PTR_ERR (pg->reset); -pr_err ("failed to get device resets: %d\n" , err); +dev_err (dev,"failed to get device resets: %d\n" , err);return err; }
@@ -883,6 +899,7 @@ static int tegra_powergate_of_get_resets(struct tegra_powergate *pg,static void tegra_powergate_add (struct tegra_pmc *pmc,struct device_node *np) { +struct device *dev = pmc->dev;struct tegra_powergate *pg;int id, err;bool off;
@@ -893,7 +910,7 @@ static void tegra_powergate_add(struct tegra_pmc *pmc, struct device_node *np) id =tegra_powergate_lookup (pmc, np->name);if (id <0 ) { -pr_err ("powergate lookup failed for %pOFn: %d\n" , np, id); +dev_err (dev,"powergate lookup failed for %pOFn: %d\n" , np, id); goto free_mem; }
@@ -909,17 +926,17 @@ static void tegra_powergate_add(struct tegra_pmc *pmc, struct device_node *np) pg->genpd.power_on = tegra_genpd_power_on; pg->pmc = pmc; - off = !tegra_powergate_is_powered (pg->id); + off = !tegra_powergate_is_powered (pmc, pg->id); err =tegra_powergate_of_get_clks (pg, np);if (err <0 ) { -pr_err ("failed to get clocks for %pOFn: %d\n" , np, err); +dev_err (dev,"failed to get clocks for %pOFn: %d\n" , np, err); goto set_available; } err =tegra_powergate_of_get_resets (pg, np, off);if (err <0 ) { -pr_err ("failed to get resets for %pOFn: %d\n" , np, err); +dev_err (dev,"failed to get resets for %pOFn: %d\n" , np, err); goto remove_clks; }
@@ -932,19 +949,19 @@ static void tegra_powergate_add(struct tegra_pmc *pmc, struct device_node *np) err =pm_genpd_init (&pg->genpd,NULL , off);if (err <0 ) { -pr_err ("failed to initialise PM domain %pOFn: %d\n" , np, +dev_err (dev,"failed to initialise PM domain %pOFn: %d\n" , np, err); goto remove_resets; } err =of_genpd_add_provider_simple (np, &pg->genpd);if (err <0 ) { -pr_err ("failed to add PM domain provider for %pOFn: %d\n" , - np, err); +dev_err (dev,"failed to add PM domain provider for %pOFn: %d\n" , + np, err); goto remove_genpd; } -pr_debug ("added PM domain %s\n" , pg->genpd.name); +dev_dbg (dev,"added PM domain %s\n" , pg->genpd.name);return ;
@@ -1000,7 +1017,8 @@ tegra_io_pad_find(struct tegra_pmc *pmc, enum tegra_io_pad id)return NULL ; } -static int tegra_io_pad_get_dpd_register_bit (enum tegra_io_pad id, +static int tegra_io_pad_get_dpd_register_bit (struct tegra_pmc *pmc, +enum tegra_io_pad id,unsigned long *request,unsigned long *status,u32 *mask)
@@ -1009,7 +1027,7 @@ static int tegra_io_pad_get_dpd_register_bit(enum tegra_io_pad id, pad =tegra_io_pad_find (pmc, id);if (!pad) { -pr_err ("invalid I/O pad ID %u\n" , id); +dev_err (pmc->dev,"invalid I/O pad ID %u\n" , id);return -ENOENT ; }
@@ -1029,43 +1047,44 @@ static int tegra_io_pad_get_dpd_register_bit(enum tegra_io_pad id,return 0 ; } -static int tegra_io_pad_prepare (enum tegra_io_pad id,unsigned long *request, -unsigned long *status,u32 *mask) +static int tegra_io_pad_prepare (struct tegra_pmc *pmc,enum tegra_io_pad id, +unsigned long *request,unsigned long *status, +u32 *mask) {unsigned long rate, value;int err; - err =tegra_io_pad_get_dpd_register_bit (id, request, status, mask); + err =tegra_io_pad_get_dpd_register_bit (pmc, id, request, status, mask);if (err)return err;if (pmc->clk) { rate =clk_get_rate (pmc->clk);if (!rate) { -pr_err ("failed to get clock rate\n" ); +dev_err (pmc->dev,"failed to get clock rate\n" );return -ENODEV ; } -tegra_pmc_writel (DPD_SAMPLE_ENABLE ,DPD_SAMPLE ); +tegra_pmc_writel (pmc,DPD_SAMPLE_ENABLE ,DPD_SAMPLE );/* must be at least 200 ns, in APB (PCLK) clock cycles */ value =DIV_ROUND_UP (1000000000 , rate); value =DIV_ROUND_UP (200 , value); -tegra_pmc_writel (value,SEL_DPD_TIM ); +tegra_pmc_writel (pmc, value,SEL_DPD_TIM ); }return 0 ; } -static int tegra_io_pad_poll (unsigned long offset,u32 mask, -u32 val,unsigned long timeout) +static int tegra_io_pad_poll (struct tegra_pmc *pmc,unsigned long offset, +u32 mask,u32 val,unsigned long timeout) {u32 value; timeout = jiffies +msecs_to_jiffies (timeout);while (time_after (timeout, jiffies)) { - value =tegra_pmc_readl (offset); + value =tegra_pmc_readl (pmc, offset);if ((value & mask) == val)return 0 ;
@@ -1075,10 +1094,10 @@ static int tegra_io_pad_poll(unsigned long offset, u32 mask,return -ETIMEDOUT ; } -static void tegra_io_pad_unprepare (void ) +static void tegra_io_pad_unprepare (struct tegra_pmc *pmc) {if (pmc->clk) -tegra_pmc_writel (DPD_SAMPLE_DISABLE ,DPD_SAMPLE ); +tegra_pmc_writel (pmc,DPD_SAMPLE_DISABLE ,DPD_SAMPLE ); }/**
@@ -1095,21 +1114,21 @@ int tegra_io_pad_power_enable(enum tegra_io_pad id)mutex_lock (&pmc->powergates_lock); - err =tegra_io_pad_prepare (id, &request, &status, &mask); + err =tegra_io_pad_prepare (pmc, id, &request, &status, &mask);if (err <0 ) { -pr_err ("failed to prepare I/O pad: %d\n" , err); +dev_err (pmc->dev,"failed to prepare I/O pad: %d\n" , err); goto unlock; } -tegra_pmc_writel (IO_DPD_REQ_CODE_OFF | mask, request); +tegra_pmc_writel (pmc,IO_DPD_REQ_CODE_OFF | mask, request); - err =tegra_io_pad_poll (status, mask,0 ,250 ); + err =tegra_io_pad_poll (pmc, status, mask,0 ,250 );if (err <0 ) { -pr_err ("failed to enable I/O pad: %d\n" , err); +dev_err (pmc->dev,"failed to enable I/O pad: %d\n" , err); goto unlock; } -tegra_io_pad_unprepare (); +tegra_io_pad_unprepare (pmc); unlock:mutex_unlock (&pmc->powergates_lock);
@@ -1131,21 +1150,21 @@ int tegra_io_pad_power_disable(enum tegra_io_pad id)mutex_lock (&pmc->powergates_lock); - err =tegra_io_pad_prepare (id, &request, &status, &mask); + err =tegra_io_pad_prepare (pmc, id, &request, &status, &mask);if (err <0 ) { -pr_err ("failed to prepare I/O pad: %d\n" , err); +dev_err (pmc->dev,"failed to prepare I/O pad: %d\n" , err); goto unlock; } -tegra_pmc_writel (IO_DPD_REQ_CODE_ON | mask, request); +tegra_pmc_writel (pmc,IO_DPD_REQ_CODE_ON | mask, request); - err =tegra_io_pad_poll (status, mask, mask,250 ); + err =tegra_io_pad_poll (pmc, status, mask, mask,250 );if (err <0 ) { -pr_err ("failed to disable I/O pad: %d\n" , err); +dev_err (pmc->dev,"failed to disable I/O pad: %d\n" , err); goto unlock; } -tegra_io_pad_unprepare (); +tegra_io_pad_unprepare (pmc); unlock:mutex_unlock (&pmc->powergates_lock);
@@ -1153,22 +1172,24 @@ int tegra_io_pad_power_disable(enum tegra_io_pad id) }EXPORT_SYMBOL (tegra_io_pad_power_disable); -static int tegra_io_pad_is_powered (enum tegra_io_pad id) +static int tegra_io_pad_is_powered (struct tegra_pmc *pmc,enum tegra_io_pad id) {unsigned long request, status;u32 mask, value;int err; - err =tegra_io_pad_get_dpd_register_bit (id, &request, &status, &mask); + err =tegra_io_pad_get_dpd_register_bit (pmc, id, &request, &status, + &mask);if (err)return err; - value =tegra_pmc_readl (status); + value =tegra_pmc_readl (pmc, status);return !(value & mask); } -static int tegra_io_pad_set_voltage (enum tegra_io_pad id,int voltage) +static int tegra_io_pad_set_voltage (struct tegra_pmc *pmc,enum tegra_io_pad id, +int voltage) {const struct tegra_io_pad_soc *pad;u32 value;
@@ -1183,29 +1204,29 @@ static int tegra_io_pad_set_voltage(enum tegra_io_pad id, int voltage)mutex_lock (&pmc->powergates_lock);if (pmc->soc->has_impl_33v_pwr) { - value =tegra_pmc_readl (PMC_IMPL_E_33V_PWR ); + value =tegra_pmc_readl (pmc,PMC_IMPL_E_33V_PWR );if (voltage ==TEGRA_IO_PAD_VOLTAGE_1V8 ) value &= ~BIT (pad->voltage);else value |=BIT (pad->voltage); -tegra_pmc_writel (value,PMC_IMPL_E_33V_PWR ); +tegra_pmc_writel (pmc, value,PMC_IMPL_E_33V_PWR ); }else {/* write-enable PMC_PWR_DET_VALUE[pad->voltage] */ - value =tegra_pmc_readl (PMC_PWR_DET ); + value =tegra_pmc_readl (pmc,PMC_PWR_DET ); value |=BIT (pad->voltage); -tegra_pmc_writel (value,PMC_PWR_DET ); +tegra_pmc_writel (pmc, value,PMC_PWR_DET );/* update I/O voltage */ - value =tegra_pmc_readl (PMC_PWR_DET_VALUE ); + value =tegra_pmc_readl (pmc,PMC_PWR_DET_VALUE );if (voltage ==TEGRA_IO_PAD_VOLTAGE_1V8 ) value &= ~BIT (pad->voltage);else value |=BIT (pad->voltage); -tegra_pmc_writel (value,PMC_PWR_DET_VALUE ); +tegra_pmc_writel (pmc, value,PMC_PWR_DET_VALUE ); }mutex_unlock (&pmc->powergates_lock);
@@ -1215,7 +1236,7 @@ static int tegra_io_pad_set_voltage(enum tegra_io_pad id, int voltage)return 0 ; } -static int tegra_io_pad_get_voltage (enum tegra_io_pad id) +static int tegra_io_pad_get_voltage (struct tegra_pmc *pmc,enum tegra_io_pad id) {const struct tegra_io_pad_soc *pad;u32 value;
@@ -1228,9 +1249,9 @@ static int tegra_io_pad_get_voltage(enum tegra_io_pad id)return -ENOTSUPP ;if (pmc->soc->has_impl_33v_pwr) - value =tegra_pmc_readl (PMC_IMPL_E_33V_PWR ); + value =tegra_pmc_readl (pmc,PMC_IMPL_E_33V_PWR );else - value =tegra_pmc_readl (PMC_PWR_DET_VALUE ); + value =tegra_pmc_readl (pmc,PMC_PWR_DET_VALUE );if ((value &BIT (pad->voltage)) ==0 )return TEGRA_IO_PAD_VOLTAGE_1V8 ;
@@ -1302,21 +1323,21 @@ void tegra_pmc_enter_suspend_mode(enum tegra_suspend_mode mode) ticks = pmc->cpu_good_time * rate +USEC_PER_SEC -1 ;do_div (ticks,USEC_PER_SEC ); -tegra_pmc_writel (ticks,PMC_CPUPWRGOOD_TIMER ); +tegra_pmc_writel (pmc, ticks,PMC_CPUPWRGOOD_TIMER ); ticks = pmc->cpu_off_time * rate +USEC_PER_SEC -1 ;do_div (ticks,USEC_PER_SEC ); -tegra_pmc_writel (ticks,PMC_CPUPWROFF_TIMER ); +tegra_pmc_writel (pmc, ticks,PMC_CPUPWROFF_TIMER );wmb (); pmc->rate = rate; } - value =tegra_pmc_readl (PMC_CNTRL ); + value =tegra_pmc_readl (pmc,PMC_CNTRL ); value &= ~PMC_CNTRL_SIDE_EFFECT_LP0 ; value |=PMC_CNTRL_CPU_PWRREQ_OE ; -tegra_pmc_writel (value,PMC_CNTRL ); +tegra_pmc_writel (pmc, value,PMC_CNTRL ); }#endif
@@ -1438,13 +1459,13 @@ static void tegra_pmc_init_tsense_reset(struct tegra_pmc *pmc)if (of_property_read_u32 (np,"nvidia,pinmux-id" , &pinmux)) pinmux =0 ; - value =tegra_pmc_readl (PMC_SENSOR_CTRL ); + value =tegra_pmc_readl (pmc,PMC_SENSOR_CTRL ); value |=PMC_SENSOR_CTRL_SCRATCH_WRITE ; -tegra_pmc_writel (value,PMC_SENSOR_CTRL ); +tegra_pmc_writel (pmc, value,PMC_SENSOR_CTRL ); value = (reg_data <<PMC_SCRATCH54_DATA_SHIFT ) | (reg_addr <<PMC_SCRATCH54_ADDR_SHIFT ); -tegra_pmc_writel (value,PMC_SCRATCH54 ); +tegra_pmc_writel (pmc, value,PMC_SCRATCH54 ); value =PMC_SCRATCH55_RESET_TEGRA ; value |= ctrl_id <<PMC_SCRATCH55_CNTRL_ID_SHIFT ;
@@ -1462,11 +1483,11 @@ static void tegra_pmc_init_tsense_reset(struct tegra_pmc *pmc) value |= checksum <<PMC_SCRATCH55_CHECKSUM_SHIFT ; -tegra_pmc_writel (value,PMC_SCRATCH55 ); +tegra_pmc_writel (pmc, value,PMC_SCRATCH55 ); - value =tegra_pmc_readl (PMC_SENSOR_CTRL ); + value =tegra_pmc_readl (pmc,PMC_SENSOR_CTRL ); value |=PMC_SENSOR_CTRL_ENABLE_RST ; -tegra_pmc_writel (value,PMC_SENSOR_CTRL ); +tegra_pmc_writel (pmc, value,PMC_SENSOR_CTRL );dev_info (pmc->dev,"emergency thermal reset enabled\n" );
@@ -1476,12 +1497,16 @@ static void tegra_pmc_init_tsense_reset(struct tegra_pmc *pmc)static int tegra_io_pad_pinctrl_get_groups_count (struct pinctrl_dev *pctl_dev) { +struct tegra_pmc *pmc =pinctrl_dev_get_drvdata (pctl_dev); +return pmc->soc->num_io_pads; }static const char *tegra_io_pad_pinctrl_get_group_name (struct pinctrl_dev *pctl,unsigned int group) { +struct tegra_pmc *pmc =pinctrl_dev_get_drvdata (pctl); +return pmc->soc->io_pads[group].name; }
@@ -1490,6 +1515,8 @@ static int tegra_io_pad_pinctrl_get_group_pins(struct pinctrl_dev *pctl_dev,const unsigned int **pins, unsigned int *num_pins) { + struct tegra_pmc *pmc = pinctrl_dev_get_drvdata(pctl_dev); + *pins = &pmc->soc->io_pads[group].id; *num_pins =1 ;return 0 ;
@@ -1506,23 +1533,25 @@ static const struct pinctrl_ops tegra_io_pad_pinctrl_ops = {static int tegra_io_pad_pinconf_get (struct pinctrl_dev *pctl_dev,unsigned int pin,unsigned long *config) { -const struct tegra_io_pad_soc *pad =tegra_io_pad_find (pmc, pin);enum pin_config_param param =pinconf_to_config_param (*config); +struct tegra_pmc *pmc =pinctrl_dev_get_drvdata (pctl_dev); +const struct tegra_io_pad_soc *pad;int ret;u32 arg; + pad =tegra_io_pad_find (pmc, pin);if (!pad)return -EINVAL ;switch (param) {case PIN_CONFIG_POWER_SOURCE : - ret =tegra_io_pad_get_voltage (pad->id); + ret =tegra_io_pad_get_voltage (pmc, pad->id);if (ret <0 )return ret; arg = ret;break ;case PIN_CONFIG_LOW_POWER_MODE : - ret =tegra_io_pad_is_powered (pad->id); + ret =tegra_io_pad_is_powered (pmc, pad->id);if (ret <0 )return ret; arg = !ret;
@@ -1540,12 +1569,14 @@ static int tegra_io_pad_pinconf_set(struct pinctrl_dev *pctl_dev, unsigned int pin, unsigned long *configs, unsigned int num_configs) { - const struct tegra_io_pad_soc *pad = tegra_io_pad_find(pmc, pin); + struct tegra_pmc *pmc = pinctrl_dev_get_drvdata(pctl_dev); +const struct tegra_io_pad_soc *pad;enum pin_config_param param;unsigned int i;int err;u32 arg; + pad =tegra_io_pad_find (pmc, pin);if (!pad)return -EINVAL ;
@@ -1566,7 +1597,7 @@ static int tegra_io_pad_pinconf_set(struct pinctrl_dev *pctl_dev,if (arg !=TEGRA_IO_PAD_VOLTAGE_1V8 && arg !=TEGRA_IO_PAD_VOLTAGE_3V3 )return -EINVAL ; - err =tegra_io_pad_set_voltage (pad->id, arg); + err =tegra_io_pad_set_voltage (pmc, pad->id, arg);if (err)return err;break ;
@@ -1615,7 +1646,7 @@ static ssize_t reset_reason_show(struct device *dev, {u32 value, rst_src; - value =tegra_pmc_readl (pmc->soc->regs->rst_status); + value =tegra_pmc_readl (pmc, pmc->soc->regs->rst_status); rst_src = (value & pmc->soc->regs->rst_source_mask) >> pmc->soc->regs->rst_source_shift;
@@ -1629,7 +1660,7 @@ static ssize_t reset_level_show(struct device *dev, {u32 value, rst_lvl; - value =tegra_pmc_readl (pmc->soc->regs->rst_status); + value =tegra_pmc_readl (pmc, pmc->soc->regs->rst_status); rst_lvl = (value & pmc->soc->regs->rst_level_mask) >> pmc->soc->regs->rst_level_shift;
@@ -1926,6 +1957,8 @@ static int tegra_pmc_probe(struct platform_device *pdev) pmc->base = base;mutex_unlock (&pmc->powergates_lock); +platform_set_drvdata (pdev, pmc); +return 0 ; cleanup_restart_handler:
@@ -1938,14 +1971,18 @@ static int tegra_pmc_probe(struct platform_device *pdev)#if defined(CONFIG_PM_SLEEP ) && defined(CONFIG_ARM )static int tegra_pmc_suspend (struct device *dev) { -tegra_pmc_writel (virt_to_phys (tegra_resume),PMC_SCRATCH41 ); +struct tegra_pmc *pmc =dev_get_drvdata (dev); + +tegra_pmc_writel (pmc,virt_to_phys (tegra_resume),PMC_SCRATCH41 );return 0 ; }static int tegra_pmc_resume (struct device *dev) { -tegra_pmc_writel (0x0 ,PMC_SCRATCH41 ); +struct tegra_pmc *pmc,dev_get_drvdata (dev ); + +tegra_pmc_writel (pmc,0x0 ,PMC_SCRATCH41 );return 0 ; }
@@ -1982,11 +2019,11 @@ static void tegra20_pmc_init(struct tegra_pmc *pmc)u32 value;/* Always enable CPU power request */ - value =tegra_pmc_readl (PMC_CNTRL ); + value =tegra_pmc_readl (pmc,PMC_CNTRL ); value |=PMC_CNTRL_CPU_PWRREQ_OE ; -tegra_pmc_writel (value,PMC_CNTRL ); +tegra_pmc_writel (pmc, value,PMC_CNTRL ); - value =tegra_pmc_readl (PMC_CNTRL ); + value =tegra_pmc_readl (pmc,PMC_CNTRL );if (pmc->sysclkreq_high) value &= ~PMC_CNTRL_SYSCLK_POLARITY ;
@@ -1994,12 +2031,12 @@ static void tegra20_pmc_init(struct tegra_pmc *pmc) value |=PMC_CNTRL_SYSCLK_POLARITY ;/* configure the output polarity while the request is tristated */ -tegra_pmc_writel (value,PMC_CNTRL ); +tegra_pmc_writel (pmc, value,PMC_CNTRL );/* now enable the request */ - value =tegra_pmc_readl (PMC_CNTRL ); + value =tegra_pmc_readl (pmc,PMC_CNTRL ); value |=PMC_CNTRL_SYSCLK_OE ; -tegra_pmc_writel (value,PMC_CNTRL ); +tegra_pmc_writel (pmc, value,PMC_CNTRL ); } static void tegra20_pmc_setup_irq_polarity(struct tegra_pmc *pmc,
@@ -2008,14 +2045,14 @@ static void tegra20_pmc_setup_irq_polarity(struct tegra_pmc *pmc, {u32 value; - value =tegra_pmc_readl (PMC_CNTRL ); + value =tegra_pmc_readl (pmc,PMC_CNTRL );if (invert) value |=PMC_CNTRL_INTR_POLARITY ;else value &= ~PMC_CNTRL_INTR_POLARITY ; -tegra_pmc_writel (value,PMC_CNTRL ); +tegra_pmc_writel (pmc, value,PMC_CNTRL ); }static const struct tegra_pmc_soc tegra20_pmc_soc = {
@@ -2419,7 +2456,7 @@ static void tegra186_pmc_setup_irq_polarity(struct tegra_pmc *pmc, index =of_property_match_string (np,"reg-names" ,"wake" );if (index <0 ) { -pr_err ("failed to find PMC wake registers\n" ); +dev_err (pmc->dev,"failed to find PMC wake registers\n" );return ; }
@@ -2427,7 +2464,7 @@ static void tegra186_pmc_setup_irq_polarity(struct tegra_pmc *pmc, wake =ioremap_nocache (regs.start,resource_size (®s));if (!wake) { -pr_err ("failed to map PMC wake registers\n" ); +dev_err (pmc->dev,"failed to map PMC wake registers\n" );return ; }
Signature · 1 line
2.19.1
Re: [PATCH 4/7] soc/tegra: pmc: Pass struct tegra_pmc * where possible
Quoted 10 lines · Thierry Reding
From: Thierry Reding <[email protected]>
Instead of using the global pmc variable, pass around a pointer where possible. Also, replace most occurrences of pr_*() functions by their equivalent dev_*() functions, reusing the
pmc->devpointer.It's not possible to get completely rid of the global variable because some of the public API that this driver exposes still relies on it.
Signed-off-by Thierry Reding <[email protected]>
Cheers
Jon
Signature · 1 line
nvpublic
PATCH 5/7 soc/tegra: pmc: Make alignment consistent
In reply to Thierry RedingFrom: Thierry Reding <[email protected]>
Some recently added code used weird alignment and indentation. Fix these occurrences to make them consistent with the rest of the code.
--- drivers/soc/tegra/pmc.c | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-)
drivers/soc/tegra/pmc.c +18 -11
@@ -1502,8 +1502,8 @@ static int tegra_io_pad_pinctrl_get_groups_count(struct pinctrl_dev *pctl_dev)return pmc->soc->num_io_pads; } -static const char *tegra_io_pad_pinctrl_get_group_name ( -struct pinctrl_dev *pctl,unsigned int group) +static const char *tegra_io_pad_pinctrl_get_group_name (struct pinctrl_dev *pctl, +unsigned int group) {struct tegra_pmc *pmc =pinctrl_dev_get_drvdata (pctl);
@@ -1519,6 +1519,7 @@ static int tegra_io_pad_pinctrl_get_group_pins(struct pinctrl_dev *pctl_dev, *pins = &pmc->soc->io_pads[group].id; *num_pins =1 ; +return 0 ; }
@@ -1548,14 +1549,18 @@ static int tegra_io_pad_pinconf_get(struct pinctrl_dev *pctl_dev, ret =tegra_io_pad_get_voltage (pmc, pad->id);if (ret <0 )return ret; + arg = ret;break ; +case PIN_CONFIG_LOW_POWER_MODE : ret =tegra_io_pad_is_powered (pmc, pad->id);if (ret <0 )return ret; + arg = !ret;break ; +default :return -EINVAL ; }
@@ -1622,7 +1627,7 @@ static struct pinctrl_desc tegra_pmc_pctl_desc = {static int tegra_pmc_pinctrl_init (struct tegra_pmc *pmc) { -int err =0 ; +int err;if (!pmc->soc->num_pin_descs)return 0 ;
@@ -1635,14 +1640,16 @@ static int tegra_pmc_pinctrl_init(struct tegra_pmc *pmc) pmc);if (IS_ERR (pmc->pctl_dev)) { err =PTR_ERR (pmc->pctl_dev); -dev_err (pmc->dev,"unable to register pinctrl, %d\n" , err); +dev_err (pmc->dev,"failed to register pin controller: %d\n" , + err); +return err; } -return err; +return 0 ; }static ssize_t reset_reason_show (struct device *dev, -struct device_attribute *attr,char *buf) +struct device_attribute *attr,char *buf) {u32 value, rst_src;
@@ -1656,7 +1663,7 @@ static ssize_t reset_reason_show(struct device *dev,static DEVICE_ATTR_RO (reset_reason);static ssize_t reset_level_show (struct device *dev, -struct device_attribute *attr,char *buf) +struct device_attribute *attr,char *buf) {u32 value, rst_lvl;
@@ -1678,16 +1685,16 @@ static void tegra_pmc_reset_sysfs_init(struct tegra_pmc *pmc) err =device_create_file (dev, &dev_attr_reset_reason);if (err <0 )dev_warn (dev, -"failed to create attr \"reset_reason\": %d\n" , - err); +"failed to create attr \"reset_reason\": %d\n" , + err); }if (pmc->soc->reset_levels) { err =device_create_file (dev, &dev_attr_reset_level);if (err <0 )dev_warn (dev, -"failed to create attr \"reset_level\": %d\n" , - err); +"failed to create attr \"reset_level\": %d\n" , + err); } }
Signature · 1 line
2.19.1
Re: [PATCH 5/7] soc/tegra: pmc: Make alignment consistent
Quoted 102 lines · Thierry Reding
From: Thierry Reding <[email protected]>
Some recently added code used weird alignment and indentation. Fix these occurrences to make them consistent with the rest of the code.
Signed-off-by Thierry Reding <[email protected]>--- drivers/soc/tegra/pmc.c | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-)drivers/soc/tegra/pmc.c +16
-9@@ -1502,8 +1502,8 @@ static int tegra_io_pad_pinctrl_get_groups_count(struct pinctrl_dev *pctl_dev)return pmc->soc->num_io_pads; } -static const char *tegra_io_pad_pinctrl_get_group_name ( -struct pinctrl_dev *pctl,unsigned int group) +static const char *tegra_io_pad_pinctrl_get_group_name (struct pinctrl_dev *pctl, +unsigned int group) {struct tegra_pmc *pmc =pinctrl_dev_get_drvdata (pctl);@@ -1519,6 +1519,7 @@ static int tegra_io_pad_pinctrl_get_group_pins(struct pinctrl_dev *pctl_dev, *pins = &pmc->soc->io_pads[group].id; *num_pins =1 ; +return 0 ; }@@ -1548,14 +1549,18 @@ static int tegra_io_pad_pinconf_get(struct pinctrl_dev *pctl_dev, ret =tegra_io_pad_get_voltage (pmc, pad->id);if (ret <0 )return ret; + arg = ret;break ; +case PIN_CONFIG_LOW_POWER_MODE : ret =tegra_io_pad_is_powered (pmc, pad->id);if (ret <0 )return ret; + arg = !ret;break ; +default :return -EINVAL ; }@@ -1622,7 +1627,7 @@ static struct pinctrl_desc tegra_pmc_pctl_desc = {static int tegra_pmc_pinctrl_init (struct tegra_pmc *pmc) { -int err =0 ; +int err;if (!pmc->soc->num_pin_descs)return 0 ;@@ -1635,14 +1640,16 @@ static int tegra_pmc_pinctrl_init(struct tegra_pmc *pmc) pmc);if (IS_ERR (pmc->pctl_dev)) { err =PTR_ERR (pmc->pctl_dev); -dev_err (pmc->dev,"unable to register pinctrl, %d\n" , err); +dev_err (pmc->dev,"failed to register pin controller: %d\n" , + err); +return err; } -return err; +return 0 ; }static ssize_t reset_reason_show (struct device *dev, -struct device_attribute *attr,char *buf) +struct device_attribute *attr,char *buf) {u32 value, rst_src;@@ -1656,7 +1663,7 @@ static ssize_t reset_reason_show(struct device *dev,static DEVICE_ATTR_RO (reset_reason);static ssize_t reset_level_show (struct device *dev, -struct device_attribute *attr,char *buf) +struct device_attribute *attr,char *buf) {u32 value, rst_lvl;@@ -1678,16 +1685,16 @@ static void tegra_pmc_reset_sysfs_init(struct tegra_pmc *pmc) err =device_create_file (dev, &dev_attr_reset_reason);if (err <0 )dev_warn (dev, -"failed to create attr \"reset_reason\": %d\n" , - err); +"failed to create attr \"reset_reason\": %d\n" , + err); }if (pmc->soc->reset_levels) {
drivers/soc/tegra/pmc.c static void tegra_pmc_reset_sysfs_init(struct tegra_pmc *pmc) · line 1700
Quoted 10 lines
drivers/soc/tegra/pmc.c +2
-2err =device_create_file (dev, &dev_attr_reset_level);if (err <0 )dev_warn (dev, -"failed to create attr \"reset_level\": %d\n" , - err); +"failed to create attr \"reset_level\": %d\n" , + err); } }
Cheers
Jon
Signature · 1 line
nvpublic
PATCH 6/7 soc/tegra: pmc: Explicitly initialize all fields
In reply to Thierry RedingFrom: Thierry Reding <[email protected]>
It's not strictly necessary to initialize the fields in struct tegra_pmc_soc if they are 0/false. However, we already initialize them explicitly even if unnecessary, so keep doing that for consistency.
--- drivers/soc/tegra/pmc.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
drivers/soc/tegra/pmc.c +9 -1
@@ -2069,6 +2069,8 @@ static const struct tegra_pmc_soc tegra20_pmc_soc = { .cpu_powergates = NULL, .has_tsense_reset = false, .has_gpu_clamps = false, + .needs_mbist_war = false, + .has_impl_33v_pwr = false, .num_io_pads = 0, .io_pads = NULL, .num_pin_descs = 0,
@@ -2113,6 +2115,7 @@ static const struct tegra_pmc_soc tegra30_pmc_soc = { .cpu_powergates = tegra30_cpu_powergates, .has_tsense_reset = true, .has_gpu_clamps = false, + .needs_mbist_war = false, .has_impl_33v_pwr = false, .num_io_pads = 0, .io_pads = NULL,
@@ -2162,6 +2165,7 @@ static const struct tegra_pmc_soc tegra114_pmc_soc = { .cpu_powergates = tegra114_cpu_powergates, .has_tsense_reset = true, .has_gpu_clamps = false, + .needs_mbist_war = false, .has_impl_33v_pwr = false, .num_io_pads = 0, .io_pads = NULL,
@@ -2271,6 +2275,7 @@ static const struct tegra_pmc_soc tegra124_pmc_soc = { .cpu_powergates = tegra124_cpu_powergates, .has_tsense_reset = true, .has_gpu_clamps = true, + .needs_mbist_war = false, .has_impl_33v_pwr = false, .num_io_pads = ARRAY_SIZE(tegra124_io_pads), .io_pads = tegra124_io_pads,
@@ -2375,8 +2380,8 @@ static const struct tegra_pmc_soc tegra210_pmc_soc = { .cpu_powergates = tegra210_cpu_powergates, .has_tsense_reset = true, .has_gpu_clamps = true, - .has_impl_33v_pwr = false, .needs_mbist_war = true, + .has_impl_33v_pwr = false, .num_io_pads = ARRAY_SIZE(tegra210_io_pads), .io_pads = tegra210_io_pads, .num_pin_descs = ARRAY_SIZE(tegra210_pin_descs),
@@ -2499,6 +2504,7 @@ static const struct tegra_pmc_soc tegra186_pmc_soc = { .cpu_powergates = NULL, .has_tsense_reset = false, .has_gpu_clamps = false, + .needs_mbist_war = false, .has_impl_33v_pwr = true, .num_io_pads = ARRAY_SIZE(tegra186_io_pads), .io_pads = tegra186_io_pads,
@@ -2577,6 +2583,8 @@ static const struct tegra_pmc_soc tegra194_pmc_soc = { .cpu_powergates = NULL, .has_tsense_reset = false, .has_gpu_clamps = false, + .needs_mbist_war = false, + .has_impl_33v_pwr = false, .num_io_pads = ARRAY_SIZE(tegra194_io_pads), .io_pads = tegra194_io_pads, .regs = &tegra186_pmc_regs,
Signature · 1 line
2.19.1
Re: [PATCH 6/7] soc/tegra: pmc: Explicitly initialize all fields
Quoted 68 lines · Thierry Reding
From: Thierry Reding <[email protected]>
It's not strictly necessary to initialize the fields in struct
tegra_pmc_socif they are 0/false. However, we already initialize them explicitly even if unnecessary, so keep doing that for consistency.Signed-off-by Thierry Reding <[email protected]>--- drivers/soc/tegra/pmc.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)drivers/soc/tegra/pmc.c +7
-1@@ -2069,6 +2069,8 @@ static const struct tegra_pmc_soc tegra20_pmc_soc = { .cpu_powergates = NULL, .has_tsense_reset = false, .has_gpu_clamps = false, + .needs_mbist_war = false, + .has_impl_33v_pwr = false, .num_io_pads = 0, .io_pads = NULL, .num_pin_descs = 0,@@ -2113,6 +2115,7 @@ static const struct tegra_pmc_soc tegra30_pmc_soc = { .cpu_powergates = tegra30_cpu_powergates, .has_tsense_reset = true, .has_gpu_clamps = false, + .needs_mbist_war = false, .has_impl_33v_pwr = false, .num_io_pads = 0, .io_pads = NULL,@@ -2162,6 +2165,7 @@ static const struct tegra_pmc_soc tegra114_pmc_soc = { .cpu_powergates = tegra114_cpu_powergates, .has_tsense_reset = true, .has_gpu_clamps = false, + .needs_mbist_war = false, .has_impl_33v_pwr = false, .num_io_pads = 0, .io_pads = NULL,@@ -2271,6 +2275,7 @@ static const struct tegra_pmc_soc tegra124_pmc_soc = { .cpu_powergates = tegra124_cpu_powergates, .has_tsense_reset = true, .has_gpu_clamps = true, + .needs_mbist_war = false, .has_impl_33v_pwr = false, .num_io_pads = ARRAY_SIZE(tegra124_io_pads), .io_pads = tegra124_io_pads,@@ -2375,8 +2380,8 @@ static const struct tegra_pmc_soc tegra210_pmc_soc = { .cpu_powergates = tegra210_cpu_powergates, .has_tsense_reset = true, .has_gpu_clamps = true, - .has_impl_33v_pwr = false, .needs_mbist_war = true, + .has_impl_33v_pwr = false, .num_io_pads = ARRAY_SIZE(tegra210_io_pads), .io_pads = tegra210_io_pads, .num_pin_descs = ARRAY_SIZE(tegra210_pin_descs),@@ -2499,6 +2504,7 @@ static const struct tegra_pmc_soc tegra186_pmc_soc = { .cpu_powergates = NULL, .has_tsense_reset = false, .has_gpu_clamps = false, + .needs_mbist_war = false, .has_impl_33v_pwr = true, .num_io_pads = ARRAY_SIZE(tegra186_io_pads), .io_pads = tegra186_io_pads,
drivers/soc/tegra/pmc.c static const struct tegra_pmc_soc tegra194_pmc_soc = { · line 2590
Quoted 8 lines
drivers/soc/tegra/pmc.c +2
-0@@ -2577,6 +2583,8 @@ static const struct tegra_pmc_soc tegra194_pmc_soc = { .cpu_powergates = NULL, .has_tsense_reset = false, .has_gpu_clamps = false, + .needs_mbist_war = false, + .has_impl_33v_pwr = false, .num_io_pads = ARRAY_SIZE(tegra194_io_pads), .io_pads = tegra194_io_pads, .regs = &tegra186_pmc_regs,
Cheers
Jon
Signature · 1 line
nvpublic
PATCH 7/7 soc/tegra: pmc: Support systems where PMC is marked secure
In reply to Thierry RedingFrom: Mikko Perttunen <[email protected]>
On Tegra210 systems with new enough boot software, direct register accesses to PMC register space from the non-secure world are not allowed. Instead a monitor call may be used to read and write PMC registers.
Add code to detect such a system by attempting to write a scratch register and detecting if the write happened or not. If not, we switch to doing all register accesses through the monitor call.
--- drivers/soc/tegra/pmc.c | 100 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 97 insertions(+), 3 deletions(-)
drivers/soc/tegra/pmc.c +97 -3
@@ -20,6 +20,7 @@#define pr_fmt (fmt) "tegra-pmc: " fmt +#include <linux/arm-smccc.h> #include <linux/clk.h> #include <linux/clk/tegra.h> #include <linux/debugfs.h>
@@ -145,6 +146,11 @@#define WAKE_AOWAKE_CTRL 0x4f4#define WAKE_AOWAKE_CTRL_INTR_POLARITY BIT(0) +/* for secure PMC */ +#define TEGRA_SMC_PMC 0xc2fffe00 +#define TEGRA_SMC_PMC_READ 0xaa +#define TEGRA_SMC_PMC_WRITE 0xbb +struct tegra_powergate {struct generic_pm_domain genpd;struct tegra_pmc *pmc;
@@ -216,6 +222,7 @@ struct tegra_pmc_soc {bool has_gpu_clamps;bool needs_mbist_war;bool has_impl_33v_pwr; +bool maybe_tz_only;const struct tegra_io_pad_soc *io_pads;unsigned int num_io_pads;
@@ -278,6 +285,7 @@ static const char * const tegra30_reset_sources[] = {* @scratch: pointer to I/O remapped region for scratch registers * @clk: pointer to pclk clock * @soc: pointer to SoC data structure +* @tz_only: flag specifying if the PMC can only be accessed via TrustZone * @debugfs: pointer to debugfs entry * @rate: currently configured rate of pclk * @suspend_mode: lowest suspend mode available
@@ -308,6 +316,7 @@ struct tegra_pmc {struct dentry *debugfs;const struct tegra_pmc_soc *soc; +bool tz_only;unsigned long rate;
@@ -346,13 +355,62 @@ to_powergate(struct generic_pm_domain *domain)static u32 tegra_pmc_readl (struct tegra_pmc *pmc,unsigned long offset) { +struct arm_smccc_res res; + +if (pmc->tz_only) { +arm_smccc_smc (TEGRA_SMC_PMC ,TEGRA_SMC_PMC_READ , offset,0 ,0 , +0 ,0 ,0 , &res); +if (res.a0) { +if (pmc->dev) +dev_warn (pmc->dev,"%s(): SMC failed: %lu\n" , + __func__, res.a0); +else +pr_warn ("%s(): SMC failed: %lu\n" , __func__, + res.a0); + } + +return res.a1; + } +return readl (pmc->base + offset); }static void tegra_pmc_writel (struct tegra_pmc *pmc,u32 value,unsigned long offset) { -writel (value, pmc->base + offset); +struct arm_smccc_res res; + +if (pmc->tz_only) { +arm_smccc_smc (TEGRA_SMC_PMC ,TEGRA_SMC_PMC_WRITE , offset, + value,0 ,0 ,0 ,0 , &res); +if (res.a0) { +if (pmc->dev) +dev_warn (pmc->dev,"%s(): SMC failed: %lu\n" , + __func__, res.a0); +else +pr_warn ("%s(): SMC failed: %lu\n" , __func__, + res.a0); + } + }else { +writel (value, pmc->base + offset); + } +} + +static u32 tegra_pmc_scratch_readl (struct tegra_pmc *pmc,unsigned long offset) +{ +if (pmc->tz_only) +return tegra_pmc_readl (pmc, offset); + +return readl (pmc->scratch + offset); +} + +static void tegra_pmc_scratch_writel (struct tegra_pmc *pmc,u32 value, +unsigned long offset) +{ +if (pmc->tz_only) +tegra_pmc_writel (pmc, value, offset); +else +writel (value, pmc->scratch + offset); }/*
@@ -776,7 +834,7 @@ static int tegra_pmc_restart_notify(struct notifier_block *this,const char *cmd = data;u32 value; - value =readl (pmc->scratch + pmc->soc->regs->scratch0); + value =tegra_pmc_scratch_readl (pmc, pmc->soc->regs->scratch0); value &= ~PMC_SCRATCH0_MODE_MASK ;if (cmd) {
@@ -790,7 +848,7 @@ static int tegra_pmc_restart_notify(struct notifier_block *this, value |=PMC_SCRATCH0_MODE_RCM ; } -writel (value, pmc->scratch + pmc->soc->regs->scratch0); +tegra_pmc_scratch_writel (pmc, value, pmc->soc->regs->scratch0);/* reset everything but PMC_SCRATCH0 and PMC_RST_STATUS */ value =tegra_pmc_readl (pmc,PMC_CNTRL );
@@ -2071,6 +2129,7 @@ static const struct tegra_pmc_soc tegra20_pmc_soc = { .has_gpu_clamps = false, .needs_mbist_war = false, .has_impl_33v_pwr = false, + .maybe_tz_only = false, .num_io_pads = 0, .io_pads = NULL, .num_pin_descs = 0,
@@ -2117,6 +2176,7 @@ static const struct tegra_pmc_soc tegra30_pmc_soc = { .has_gpu_clamps = false, .needs_mbist_war = false, .has_impl_33v_pwr = false, + .maybe_tz_only = false, .num_io_pads = 0, .io_pads = NULL, .num_pin_descs = 0,
@@ -2167,6 +2227,7 @@ static const struct tegra_pmc_soc tegra114_pmc_soc = { .has_gpu_clamps = false, .needs_mbist_war = false, .has_impl_33v_pwr = false, + .maybe_tz_only = false, .num_io_pads = 0, .io_pads = NULL, .num_pin_descs = 0,
@@ -2277,6 +2338,7 @@ static const struct tegra_pmc_soc tegra124_pmc_soc = { .has_gpu_clamps = true, .needs_mbist_war = false, .has_impl_33v_pwr = false, + .maybe_tz_only = false, .num_io_pads = ARRAY_SIZE(tegra124_io_pads), .io_pads = tegra124_io_pads, .num_pin_descs = ARRAY_SIZE(tegra124_pin_descs),
@@ -2382,6 +2444,7 @@ static const struct tegra_pmc_soc tegra210_pmc_soc = { .has_gpu_clamps = true, .needs_mbist_war = true, .has_impl_33v_pwr = false, + .maybe_tz_only = true, .num_io_pads = ARRAY_SIZE(tegra210_io_pads), .io_pads = tegra210_io_pads, .num_pin_descs = ARRAY_SIZE(tegra210_pin_descs),
@@ -2506,6 +2569,7 @@ static const struct tegra_pmc_soc tegra186_pmc_soc = { .has_gpu_clamps = false, .needs_mbist_war = false, .has_impl_33v_pwr = true, + .maybe_tz_only = false, .num_io_pads = ARRAY_SIZE(tegra186_io_pads), .io_pads = tegra186_io_pads, .num_pin_descs = ARRAY_SIZE(tegra186_pin_descs),
@@ -2585,6 +2649,7 @@ static const struct tegra_pmc_soc tegra194_pmc_soc = { .has_gpu_clamps = false, .needs_mbist_war = false, .has_impl_33v_pwr = false, + .maybe_tz_only = false, .num_io_pads = ARRAY_SIZE(tegra194_io_pads), .io_pads = tegra194_io_pads, .regs = &tegra186_pmc_regs,
@@ -2619,6 +2684,32 @@ static struct platform_driver tegra_pmc_driver = { };builtin_platform_driver (tegra_pmc_driver); +static bool __init tegra_pmc_detect_tz_only (struct tegra_pmc *pmc) +{ +u32 value, saved; + + saved =readl (pmc->base + pmc->soc->regs->scratch0); + value = saved ^0xffffffff ; + +if (value ==0xffffffff ) + value =0xdeadbeef ; + +/* write pattern and read it back */ +writel (value, pmc->base + pmc->soc->regs->scratch0); + value =readl (pmc->base + pmc->soc->regs->scratch0); + +/* if we read all-zeroes, access is restricted to TZ only */ +if (value ==0 ) { +pr_info ("access to PMC is restricted to TZ\n" ); +return true; + } + +/* restore original value */ +writel (saved, pmc->base + pmc->soc->regs->scratch0); + +return false; +} +/* * Early initialization to allow access to registers in the very early boot * process.
@@ -2681,6 +2772,9 @@ static int __init tegra_pmc_early_init(void)if (np) { pmc->soc = match->data; +if (pmc->soc->maybe_tz_only) + pmc->tz_only =tegra_pmc_detect_tz_only (pmc); +tegra_powergate_init (pmc, np);/*
Signature · 1 line
2.19.1
Re: [PATCH 7/7] soc/tegra: pmc: Support systems where PMC is marked secure
Quoted 238 lines · Thierry Reding
From: Mikko Perttunen <[email protected]>
On Tegra210 systems with new enough boot software, direct register accesses to PMC register space from the non-secure world are not allowed. Instead a monitor call may be used to read and write PMC registers.
Add code to detect such a system by attempting to write a scratch register and detecting if the write happened or not. If not, we switch to doing all register accesses through the monitor call.
Signed-off-by Mikko Perttunen <[email protected]>Signed-off-by Thierry Reding <[email protected]>--- drivers/soc/tegra/pmc.c | 100 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 97 insertions(+), 3 deletions(-)drivers/soc/tegra/pmc.c +94
-3@@ -20,6 +20,7 @@#define pr_fmt (fmt) "tegra-pmc: " fmt +#include <linux/arm-smccc.h> #include <linux/clk.h> #include <linux/clk/tegra.h> #include <linux/debugfs.h> @@ -145,6 +146,11 @@#define WAKE_AOWAKE_CTRL 0x4f4#define WAKE_AOWAKE_CTRL_INTR_POLARITY BIT(0) +/* for secure PMC */ +#define TEGRA_SMC_PMC 0xc2fffe00 +#define TEGRA_SMC_PMC_READ 0xaa +#define TEGRA_SMC_PMC_WRITE 0xbb +struct tegra_powergate {struct generic_pm_domain genpd;struct tegra_pmc *pmc;@@ -216,6 +222,7 @@ struct tegra_pmc_soc {bool has_gpu_clamps;bool needs_mbist_war;bool has_impl_33v_pwr; +bool maybe_tz_only;const struct tegra_io_pad_soc *io_pads;unsigned int num_io_pads;@@ -278,6 +285,7 @@ static const char * const tegra30_reset_sources[] = {* @scratch: pointer to I/O remapped region for scratch registers * @clk: pointer to pclk clock * @soc: pointer to SoC data structure +* @tz_only: flag specifying if the PMC can only be accessed via TrustZone * @debugfs: pointer to debugfs entry * @rate: currently configured rate of pclk * @suspend_mode: lowest suspend mode available @@ -308,6 +316,7 @@ struct tegra_pmc {struct dentry *debugfs;const struct tegra_pmc_soc *soc; +bool tz_only;unsigned long rate;@@ -346,13 +355,62 @@ to_powergate(struct generic_pm_domain *domain)static u32 tegra_pmc_readl (struct tegra_pmc *pmc,unsigned long offset) { +struct arm_smccc_res res; + +if (pmc->tz_only) { +arm_smccc_smc (TEGRA_SMC_PMC ,TEGRA_SMC_PMC_READ , offset,0 ,0 , +0 ,0 ,0 , &res); +if (res.a0) { +if (pmc->dev) +dev_warn (pmc->dev,"%s(): SMC failed: %lu\n" , + __func__, res.a0); +else +pr_warn ("%s(): SMC failed: %lu\n" , __func__, + res.a0); + } + +return res.a1; + } +return readl (pmc->base + offset); }static void tegra_pmc_writel (struct tegra_pmc *pmc,u32 value,unsigned long offset) { -writel (value, pmc->base + offset); +struct arm_smccc_res res; + +if (pmc->tz_only) { +arm_smccc_smc (TEGRA_SMC_PMC ,TEGRA_SMC_PMC_WRITE , offset, + value,0 ,0 ,0 ,0 , &res); +if (res.a0) { +if (pmc->dev) +dev_warn (pmc->dev,"%s(): SMC failed: %lu\n" , + __func__, res.a0); +else +pr_warn ("%s(): SMC failed: %lu\n" , __func__, + res.a0); + } + }else { +writel (value, pmc->base + offset); + } +} + +static u32 tegra_pmc_scratch_readl (struct tegra_pmc *pmc,unsigned long offset) +{ +if (pmc->tz_only) +return tegra_pmc_readl (pmc, offset); + +return readl (pmc->scratch + offset); +} + +static void tegra_pmc_scratch_writel (struct tegra_pmc *pmc,u32 value, +unsigned long offset) +{ +if (pmc->tz_only) +tegra_pmc_writel (pmc, value, offset); +else +writel (value, pmc->scratch + offset); }/* @@ -776,7 +834,7 @@ static int tegra_pmc_restart_notify(struct notifier_block *this,const char *cmd = data;u32 value; - value =readl (pmc->scratch + pmc->soc->regs->scratch0); + value =tegra_pmc_scratch_readl (pmc, pmc->soc->regs->scratch0); value &= ~PMC_SCRATCH0_MODE_MASK ;if (cmd) {@@ -790,7 +848,7 @@ static int tegra_pmc_restart_notify(struct notifier_block *this, value |=PMC_SCRATCH0_MODE_RCM ; } -writel (value, pmc->scratch + pmc->soc->regs->scratch0); +tegra_pmc_scratch_writel (pmc, value, pmc->soc->regs->scratch0);/* reset everything but PMC_SCRATCH0 and PMC_RST_STATUS */ value =tegra_pmc_readl (pmc,PMC_CNTRL );@@ -2071,6 +2129,7 @@ static const struct tegra_pmc_soc tegra20_pmc_soc = { .has_gpu_clamps = false, .needs_mbist_war = false, .has_impl_33v_pwr = false, + .maybe_tz_only = false, .num_io_pads = 0, .io_pads = NULL, .num_pin_descs = 0,@@ -2117,6 +2176,7 @@ static const struct tegra_pmc_soc tegra30_pmc_soc = { .has_gpu_clamps = false, .needs_mbist_war = false, .has_impl_33v_pwr = false, + .maybe_tz_only = false, .num_io_pads = 0, .io_pads = NULL, .num_pin_descs = 0,@@ -2167,6 +2227,7 @@ static const struct tegra_pmc_soc tegra114_pmc_soc = { .has_gpu_clamps = false, .needs_mbist_war = false, .has_impl_33v_pwr = false, + .maybe_tz_only = false, .num_io_pads = 0, .io_pads = NULL, .num_pin_descs = 0,@@ -2277,6 +2338,7 @@ static const struct tegra_pmc_soc tegra124_pmc_soc = { .has_gpu_clamps = true, .needs_mbist_war = false, .has_impl_33v_pwr = false, + .maybe_tz_only = false, .num_io_pads = ARRAY_SIZE(tegra124_io_pads), .io_pads = tegra124_io_pads, .num_pin_descs = ARRAY_SIZE(tegra124_pin_descs),@@ -2382,6 +2444,7 @@ static const struct tegra_pmc_soc tegra210_pmc_soc = { .has_gpu_clamps = true, .needs_mbist_war = true, .has_impl_33v_pwr = false, + .maybe_tz_only = true, .num_io_pads = ARRAY_SIZE(tegra210_io_pads), .io_pads = tegra210_io_pads, .num_pin_descs = ARRAY_SIZE(tegra210_pin_descs),@@ -2506,6 +2569,7 @@ static const struct tegra_pmc_soc tegra186_pmc_soc = { .has_gpu_clamps = false, .needs_mbist_war = false, .has_impl_33v_pwr = true, + .maybe_tz_only = false, .num_io_pads = ARRAY_SIZE(tegra186_io_pads), .io_pads = tegra186_io_pads, .num_pin_descs = ARRAY_SIZE(tegra186_pin_descs),@@ -2585,6 +2649,7 @@ static const struct tegra_pmc_soc tegra194_pmc_soc = { .has_gpu_clamps = false, .needs_mbist_war = false, .has_impl_33v_pwr = false, + .maybe_tz_only = false, .num_io_pads = ARRAY_SIZE(tegra194_io_pads), .io_pads = tegra194_io_pads, .regs = &tegra186_pmc_regs,@@ -2619,6 +2684,32 @@ static struct platform_driver tegra_pmc_driver = { };builtin_platform_driver (tegra_pmc_driver); +static bool __init tegra_pmc_detect_tz_only (struct tegra_pmc *pmc) +{ +u32 value, saved; + + saved =readl (pmc->base + pmc->soc->regs->scratch0); + value = saved ^0xffffffff ; + +if (value ==0xffffffff ) + value =0xdeadbeef ; + +/* write pattern and read it back */ +writel (value, pmc->base + pmc->soc->regs->scratch0); + value =readl (pmc->base + pmc->soc->regs->scratch0); + +/* if we read all-zeroes, access is restricted to TZ only */ +if (value ==0 ) { +pr_info ("access to PMC is restricted to TZ\n" ); +return true; + } + +/* restore original value */ +writel (saved, pmc->base + pmc->soc->regs->scratch0); + +return false; +} +/* * Early initialization to allow access to registers in the very early boot * process.
drivers/soc/tegra/pmc.c static int __init tegra_pmc_early_init(void) · line 2780
Quoted 9 lines
drivers/soc/tegra/pmc.c +3
-0@@ -2681,6 +2772,9 @@ static int __init tegra_pmc_early_init(void)if (np) { pmc->soc = match->data; +if (pmc->soc->maybe_tz_only) + pmc->tz_only =tegra_pmc_detect_tz_only (pmc); +tegra_powergate_init (pmc, np);/*
Cheers
Jon
Signature · 1 line
nvpublic
Quoted 35 lines · Thierry Reding
From: Thierry Reding <[email protected]>
This will make it easier to insert new includes in the right place in subsequent patches.
Signed-off-by Thierry Reding <[email protected]>--- drivers/soc/tegra/pmc.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)drivers/soc/tegra/pmc.c +3
-3@@ -20,7 +20,6 @@#define pr_fmt (fmt) "tegra-pmc: " fmt -#include <linux/kernel.h> #include <linux/clk.h> #include <linux/clk/tegra.h> #include <linux/debugfs.h> @@ -30,16 +29,17 @@#include <linux/init.h> #include <linux/io.h> #include <linux/iopoll.h> -#include <linux/irq.h> #include <linux/irqdomain.h> -#include <linux/of.h> +#include <linux/irq.h> +#include <linux/kernel.h> #include <linux/of_address.h> #include <linux/of_clk.h> +#include <linux/of.h>
drivers/soc/tegra/pmc.c line 45
Quoted 10 lines
drivers/soc/tegra/pmc.c +2
-2#include <linux/of_irq.h> #include <linux/of_platform.h> -#include <linux/pinctrl/pinctrl.h> -#include <linux/pinctrl/pinconf.h> #include <linux/pinctrl/pinconf-generic.h> +#include <linux/pinctrl/pinconf.h> +#include <linux/pinctrl/pinctrl.h> #include <linux/platform_device.h> #include <linux/pm_domain.h> #include <linux/reboot.h>
Cheers
Jon
Signature · 1 line
nvpublic