Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a21c3f17 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'tegra-for-5.1-soc' of... 

Merge tag 'tegra-for-5.1-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into arm/drivers

soc/tegra: Changes for v5.1-rc1

This contains a couple of miscellaneous fixes for minor issues and a
largish rework of the PMC driver to make it work on systems where the
PMC has been locked down and can only be accessed from secure firmware.

* tag 'tegra-for-5.1-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux

:
  soc/tegra: pmc: Support systems where PMC is marked secure
  soc/tegra: pmc: Explicitly initialize all fields
  soc/tegra: pmc: Make alignment consistent
  soc/tegra: pmc: Pass struct tegra_pmc * where possible
  soc/tegra: pmc: Make tegra_powergate_is_powered() a local function
  soc/tegra: pmc: Add missing kerneldoc
  soc/tegra: pmc: Sort includes alphabetically
  soc/tegra: pmc: Use TEGRA186_ prefix for GPIO names
  soc/tegra: fuse: Fix typo in tegra210_init_speedo_data
  soc/tegra: fuse: Fix illegal free of IO base address

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents f73e22d6 e247deae

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

+9 −3
Original line number Diff line number Diff line
@@ -137,13 +137,17 @@ static int tegra_fuse_probe(struct platform_device *pdev) 
	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	fuse->phys = res->start;

	fuse->base = devm_ioremap_resource(&pdev->dev, res);

	if (IS_ERR(fuse->base))

		return PTR_ERR(fuse->base);

	if (IS_ERR(fuse->base)) {

		err = PTR_ERR(fuse->base);

		fuse->base = base;

		return err;

	}



	fuse->clk = devm_clk_get(&pdev->dev, "fuse");

	if (IS_ERR(fuse->clk)) {

		dev_err(&pdev->dev, "failed to get FUSE clock: %ld",

			PTR_ERR(fuse->clk));

		fuse->base = base;

		return PTR_ERR(fuse->clk);

	}
@@ -152,9 +156,11 @@ static int tegra_fuse_probe(struct platform_device *pdev) 


	if (fuse->soc->probe) {

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

		if (err < 0)

		if (err < 0) {

			fuse->base = base;

			return err;

		}

	}



	if (tegra_fuse_create_sysfs(&pdev->dev, fuse->soc->info->size,

				    fuse->soc->info))

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

+1 −1
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ void __init tegra210_init_speedo_data(struct tegra_sku_info *sku_info) 


	soc_speedo[0] = tegra_fuse_read_early(FUSE_SOC_SPEEDO_0);

	soc_speedo[1] = tegra_fuse_read_early(FUSE_SOC_SPEEDO_1);

	soc_speedo[2] = tegra_fuse_read_early(FUSE_CPU_SPEEDO_2);

	soc_speedo[2] = tegra_fuse_read_early(FUSE_SOC_SPEEDO_2);



	cpu_iddq = tegra_fuse_read_early(FUSE_CPU_IDDQ) * 4;

	soc_iddq = tegra_fuse_read_early(FUSE_SOC_IDDQ) * 4;

drivers/soc/tegra/pmc.c

+288 −136

File changed.

Preview size limit exceeded, changes collapsed.

include/soc/tegra/pmc.h

+0 −6
Original line number Diff line number Diff line
@@ -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;