Commit 498b5651 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'tegra-for-4.17-soc-2' of... 

Merge tag 'tegra-for-4.17-soc-2' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/drivers

Pull "soc/tegra: Changes for v4.17-rc1" from Thierry Reding:

This contains more Tegra194 support as well as an implementation for the
MBIST workaround needed to avoid some memory-related issues on Tegra210.

* tag 'tegra-for-4.17-soc-2' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  soc/tegra: pmc: Use the new reset APIs to manage reset controllers
  soc/tegra: pmc: Pass PMC to tegra_powergate_power_up()
  soc/tegra: pmc: MBIST work around for Tegra210
  soc/tegra: pmc: Add Tegra194 compatibility string
  soc/tegra: Add Tegra194 SoC configuration option
parents d0994465 4c817ccf

drivers/soc/tegra/Kconfig

+10 −0
Original line number Diff line number Diff line
@@ -104,6 +104,16 @@ config ARCH_TEGRA_186_SOC 
	  multi-format support, ISP for image capture processing and BPMP for

	  power management.



config ARCH_TEGRA_194_SOC

	bool "NVIDIA Tegra194 SoC"

	select MAILBOX

	select TEGRA_BPMP

	select TEGRA_HSP_MBOX

	select TEGRA_IVC

	select SOC_TEGRA_PMC

	help

	  Enable support for the NVIDIA Tegra194 SoC.



endif

endif

drivers/soc/tegra/pmc.c

+28 −70
Original line number Diff line number Diff line
@@ -127,8 +127,7 @@ struct tegra_powergate { 
	unsigned int id;

	struct clk **clks;

	unsigned int num_clks;

	struct reset_control **resets;

	unsigned int num_resets;

	struct reset_control *reset;

};



struct tegra_io_pad_soc {
@@ -153,6 +152,7 @@ struct tegra_pmc_soc { 


	bool has_tsense_reset;

	bool has_gpu_clamps;

	bool needs_mbist_war;



	const struct tegra_io_pad_soc *io_pads;

	unsigned int num_io_pads;
@@ -368,31 +368,8 @@ out: 
	return err;

}



static int tegra_powergate_reset_assert(struct tegra_powergate *pg)

int __weak tegra210_clk_handle_mbist_war(unsigned int id)

{

	unsigned int i;

	int err;



	for (i = 0; i < pg->num_resets; i++) {

		err = reset_control_assert(pg->resets[i]);

		if (err)

			return err;

	}



	return 0;

}



static int tegra_powergate_reset_deassert(struct tegra_powergate *pg)

{

	unsigned int i;

	int err;



	for (i = 0; i < pg->num_resets; i++) {

		err = reset_control_deassert(pg->resets[i]);

		if (err)

			return err;

	}



	return 0;

}
@@ -401,7 +378,7 @@ static int tegra_powergate_power_up(struct tegra_powergate *pg, 
{

	int err;



	err = tegra_powergate_reset_assert(pg);

	err = reset_control_assert(pg->reset);

	if (err)

		return err;
@@ -425,12 +402,17 @@ static int tegra_powergate_power_up(struct tegra_powergate *pg, 


	usleep_range(10, 20);



	err = tegra_powergate_reset_deassert(pg);

	err = reset_control_deassert(pg->reset);

	if (err)

		goto powergate_off;



	usleep_range(10, 20);



	if (pg->pmc->soc->needs_mbist_war)

		err = tegra210_clk_handle_mbist_war(pg->id);

	if (err)

		goto disable_clks;



	if (disable_clocks)

		tegra_powergate_disable_clocks(pg);
@@ -456,7 +438,7 @@ static int tegra_powergate_power_down(struct tegra_powergate *pg) 


	usleep_range(10, 20);



	err = tegra_powergate_reset_assert(pg);

	err = reset_control_assert(pg->reset);

	if (err)

		goto disable_clks;
@@ -475,7 +457,7 @@ static int tegra_powergate_power_down(struct tegra_powergate *pg) 
assert_resets:

	tegra_powergate_enable_clocks(pg);

	usleep_range(10, 20);

	tegra_powergate_reset_deassert(pg);

	reset_control_deassert(pg->reset);

	usleep_range(10, 20);



disable_clks:
@@ -586,8 +568,8 @@ int tegra_powergate_sequence_power_up(unsigned int id, struct clk *clk, 
	pg.id = id;

	pg.clks = &clk;

	pg.num_clks = 1;

	pg.resets = &rst;

	pg.num_resets = 1;

	pg.reset = rst;

	pg.pmc = pmc;



	err = tegra_powergate_power_up(&pg, false);

	if (err)
@@ -775,45 +757,22 @@ err: 
static int tegra_powergate_of_get_resets(struct tegra_powergate *pg,

					 struct device_node *np, bool off)

{

	struct reset_control *rst;

	unsigned int i, count;

	int err;



	count = of_count_phandle_with_args(np, "resets", "#reset-cells");

	if (count == 0)

		return -ENODEV;



	pg->resets = kcalloc(count, sizeof(rst), GFP_KERNEL);

	if (!pg->resets)

		return -ENOMEM;



	for (i = 0; i < count; i++) {

		pg->resets[i] = of_reset_control_get_by_index(np, i);

		if (IS_ERR(pg->resets[i])) {

			err = PTR_ERR(pg->resets[i]);

			goto error;

	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);

		return err;

	}



	if (off)

			err = reset_control_assert(pg->resets[i]);

		err = reset_control_assert(pg->reset);

	else

			err = reset_control_deassert(pg->resets[i]);



		if (err) {

			reset_control_put(pg->resets[i]);

			goto error;

		}

	}



	pg->num_resets = count;



	return 0;



error:

	while (i--)

		reset_control_put(pg->resets[i]);

		err = reset_control_deassert(pg->reset);



	kfree(pg->resets);

	if (err)

		reset_control_put(pg->reset);



	return err;

}
@@ -905,10 +864,7 @@ remove_genpd: 
	pm_genpd_remove(&pg->genpd);



remove_resets:

	while (pg->num_resets--)

		reset_control_put(pg->resets[pg->num_resets]);



	kfree(pg->resets);

	reset_control_put(pg->reset);



remove_clks:

	while (pg->num_clks--)
@@ -1815,6 +1771,7 @@ static const struct tegra_pmc_soc tegra210_pmc_soc = { 
	.cpu_powergates = tegra210_cpu_powergates,

	.has_tsense_reset = true,

	.has_gpu_clamps = true,

	.needs_mbist_war = true,

	.num_io_pads = ARRAY_SIZE(tegra210_io_pads),

	.io_pads = tegra210_io_pads,

	.regs = &tegra20_pmc_regs,
@@ -1920,6 +1877,7 @@ static const struct tegra_pmc_soc tegra186_pmc_soc = { 
};



static const struct of_device_id tegra_pmc_match[] = {

	{ .compatible = "nvidia,tegra194-pmc", .data = &tegra186_pmc_soc },

	{ .compatible = "nvidia,tegra186-pmc", .data = &tegra186_pmc_soc },

	{ .compatible = "nvidia,tegra210-pmc", .data = &tegra210_pmc_soc },

	{ .compatible = "nvidia,tegra132-pmc", .data = &tegra124_pmc_soc },

CRA Git | Maintained and supported by SUSTech CRA and CCSE