Commit 923ba460 authored by Stephen Boyd's avatar Stephen Boyd
Browse files

Merge tag 'for-5.15-clk' of... 

Merge tag 'for-5.15-clk' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into clk-nvidia

Pull a Tegra clk driver cleanup from Thierry Reding:

The FUSE driver has been updated to take manual control of the FUSE
clock over suspend/resume cycles, so the CLK_IS_CRITICAL flag can now be
dropped.

* tag 'for-5.15-clk' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  clk: tegra: Remove CLK_IS_CRITICAL flag from fuse clock
  soc/tegra: fuse: Enable fuse clock on suspend for Tegra124
  soc/tegra: fuse: Add runtime PM support
  soc/tegra: fuse: Clear fuse->clk on driver probe failure
  soc/tegra: pmc: Prevent racing with cpuilde driver
  soc/tegra: bpmp: Remove unused including <linux/version.h>
parents e73f0f0e faa8605f

arch/arm/mach-tegra/pm.c

+1 −1
Original line number Diff line number Diff line
@@ -403,7 +403,7 @@ static const struct platform_suspend_ops tegra_suspend_ops = { 
	.enter		= tegra_suspend_enter,

};



void __init tegra_init_suspend(void)

void tegra_pm_init_suspend(void)

{

	enum tegra_suspend_mode mode = tegra_pmc_get_suspend_mode();

arch/arm/mach-tegra/pm.h

+0 −6
Original line number Diff line number Diff line
@@ -25,10 +25,4 @@ void tegra30_sleep_core_init(void); 


extern void (*tegra_tear_down_cpu)(void);



#ifdef CONFIG_PM_SLEEP

void tegra_init_suspend(void);

#else

static inline void tegra_init_suspend(void) {}

#endif



#endif /* _MACH_TEGRA_PM_H_ */

arch/arm/mach-tegra/tegra.c

+0 −2
Original line number Diff line number Diff line
@@ -84,8 +84,6 @@ static void __init tegra_dt_init(void) 


static void __init tegra_dt_init_late(void)

{

	tegra_init_suspend();



	if (IS_ENABLED(CONFIG_ARCH_TEGRA_2x_SOC) &&

	    of_machine_is_compatible("compal,paz00"))

		tegra_paz00_wifikill_init();

drivers/clk/tegra/clk-tegra-periph.c

+1 −5
Original line number Diff line number Diff line
@@ -777,11 +777,7 @@ static struct tegra_periph_init_data gate_clks[] = { 
	GATE("ahbdma", "hclk", 33, 0, tegra_clk_ahbdma, 0),

	GATE("apbdma", "pclk", 34, 0, tegra_clk_apbdma, 0),

	GATE("kbc", "clk_32k", 36, TEGRA_PERIPH_ON_APB | TEGRA_PERIPH_NO_RESET, tegra_clk_kbc, 0),

	/*

	 * Critical for RAM re-repair operation, which must occur on resume

	 * from LP1 system suspend and as part of CCPLEX cluster switching.

	 */

	GATE("fuse", "clk_m", 39, TEGRA_PERIPH_ON_APB, tegra_clk_fuse, CLK_IS_CRITICAL),

	GATE("fuse", "clk_m", 39, TEGRA_PERIPH_ON_APB, tegra_clk_fuse, 0),

	GATE("fuse_burn", "clk_m", 39, TEGRA_PERIPH_ON_APB, tegra_clk_fuse_burn, 0),

	GATE("kfuse", "clk_m", 40, TEGRA_PERIPH_ON_APB, tegra_clk_kfuse, 0),

	GATE("apbif", "clk_m", 107, TEGRA_PERIPH_ON_APB, tegra_clk_apbif, 0),

drivers/soc/tegra/fuse/fuse-tegra.c

+60 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#include <linux/of.h>

#include <linux/of_address.h>

#include <linux/platform_device.h>

#include <linux/pm_runtime.h>

#include <linux/slab.h>

#include <linux/sys_soc.h>
@@ -210,6 +211,8 @@ static int tegra_fuse_probe(struct platform_device *pdev) 
	platform_set_drvdata(pdev, fuse);

	fuse->dev = &pdev->dev;



	pm_runtime_enable(&pdev->dev);



	if (fuse->soc->probe) {

		err = fuse->soc->probe(fuse);

		if (err < 0)
@@ -246,14 +249,71 @@ static int tegra_fuse_probe(struct platform_device *pdev) 
	return 0;



restore:

	fuse->clk = NULL;

	fuse->base = base;

	pm_runtime_disable(&pdev->dev);

	return err;

}



static int __maybe_unused tegra_fuse_runtime_resume(struct device *dev)

{

	int err;



	err = clk_prepare_enable(fuse->clk);

	if (err < 0) {

		dev_err(dev, "failed to enable FUSE clock: %d\n", err);

		return err;

	}



	return 0;

}



static int __maybe_unused tegra_fuse_runtime_suspend(struct device *dev)

{

	clk_disable_unprepare(fuse->clk);



	return 0;

}



static int __maybe_unused tegra_fuse_suspend(struct device *dev)

{

	int ret;



	/*

	 * Critical for RAM re-repair operation, which must occur on resume

	 * from LP1 system suspend and as part of CCPLEX cluster switching.

	 */

	if (fuse->soc->clk_suspend_on)

		ret = pm_runtime_resume_and_get(dev);

	else

		ret = pm_runtime_force_suspend(dev);



	return ret;

}



static int __maybe_unused tegra_fuse_resume(struct device *dev)

{

	int ret = 0;



	if (fuse->soc->clk_suspend_on)

		pm_runtime_put(dev);

	else

		ret = pm_runtime_force_resume(dev);



	return ret;

}



static const struct dev_pm_ops tegra_fuse_pm = {

	SET_RUNTIME_PM_OPS(tegra_fuse_runtime_suspend, tegra_fuse_runtime_resume,

			   NULL)

	SET_SYSTEM_SLEEP_PM_OPS(tegra_fuse_suspend, tegra_fuse_resume)

};



static struct platform_driver tegra_fuse_driver = {

	.driver = {

		.name = "tegra-fuse",

		.of_match_table = tegra_fuse_match,

		.pm = &tegra_fuse_pm,

		.suppress_bind_attrs = true,

	},

	.probe = tegra_fuse_probe,