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

Merge tag 'tegra-for-5.8-soc-v2' of... 

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

soc/tegra: Changes for v5.8-rc1

Enables Tegra210, Tegra186 and Tegra194 to be woken from suspend by the
PMIC and exports a bit more information about SoCs via sysfs.

* tag 'tegra-for-5.8-soc-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  soc/tegra: pmc: Enable PMIC wake event on Tegra210
  soc: tegra: Fix tegra_pmc_get_suspend_mode definition
  soc/tegra: pmc: Enable PMIC wake event on Tegra194
  soc/tegra: pmc: Select GENERIC_PINCONF
  soc/tegra: fuse: Update the SoC revision attribute to display a name
  soc/tegra: fuse: Trivial clean-up of tegra_init_revision()
  soc/tegra: fuse: Add custom SoC attributes
  soc/tegra: pmc: Enable PMIC wake event on Tegra186

Link: https://lore.kernel.org/r/20200522142846.2376224-2-thierry.reding@gmail.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 9ffc30a6 df701a76

drivers/soc/tegra/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -133,6 +133,7 @@ config SOC_TEGRA_FLOWCTRL 


config SOC_TEGRA_PMC

	bool

	select GENERIC_PINCONF



config SOC_TEGRA_POWERGATE_BPMP

	def_bool y

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

+56 −1
Original line number Diff line number Diff line
@@ -300,6 +300,59 @@ static void tegra_enable_fuse_clk(void __iomem *base) 
	writel(reg, base + 0x14);

}



static ssize_t major_show(struct device *dev, struct device_attribute *attr,

			     char *buf)

{

	return sprintf(buf, "%d\n", tegra_get_major_rev());

}



static DEVICE_ATTR_RO(major);



static ssize_t minor_show(struct device *dev, struct device_attribute *attr,

			     char *buf)

{

	return sprintf(buf, "%d\n", tegra_get_minor_rev());

}



static DEVICE_ATTR_RO(minor);



static struct attribute *tegra_soc_attr[] = {

	&dev_attr_major.attr,

	&dev_attr_minor.attr,

	NULL,

};



const struct attribute_group tegra_soc_attr_group = {

	.attrs = tegra_soc_attr,

};



#ifdef CONFIG_ARCH_TEGRA_194_SOC

static ssize_t platform_show(struct device *dev, struct device_attribute *attr,

			     char *buf)

{

	/*

	 * Displays the value in the 'pre_si_platform' field of the HIDREV

	 * register for Tegra194 devices. A value of 0 indicates that the

	 * platform type is silicon and all other non-zero values indicate

	 * the type of simulation platform is being used.

	 */

	return sprintf(buf, "%d\n", (tegra_read_chipid() >> 20) & 0xf);

}



static DEVICE_ATTR_RO(platform);



static struct attribute *tegra194_soc_attr[] = {

	&dev_attr_major.attr,

	&dev_attr_minor.attr,

	&dev_attr_platform.attr,

	NULL,

};



const struct attribute_group tegra194_soc_attr_group = {

	.attrs = tegra194_soc_attr,

};

#endif



struct device * __init tegra_soc_device_register(void)

{

	struct soc_device_attribute *attr;
@@ -310,8 +363,10 @@ struct device * __init tegra_soc_device_register(void) 
		return NULL;



	attr->family = kasprintf(GFP_KERNEL, "Tegra");

	attr->revision = kasprintf(GFP_KERNEL, "%d", tegra_sku_info.revision);

	attr->revision = kasprintf(GFP_KERNEL, "%s",

		tegra_revision_name[tegra_sku_info.revision]);

	attr->soc_id = kasprintf(GFP_KERNEL, "%u", tegra_get_chip_id());

	attr->custom_attr_group = fuse->soc->soc_attr_group;



	dev = soc_device_register(attr);

	if (IS_ERR(dev)) {

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

+1 −0
Original line number Diff line number Diff line
@@ -164,4 +164,5 @@ const struct tegra_fuse_soc tegra20_fuse_soc = { 
	.speedo_init = tegra20_init_speedo_data,

	.probe = tegra20_fuse_probe,

	.info = &tegra20_fuse_info,

	.soc_attr_group = &tegra_soc_attr_group,

};

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

+6 −0
Original line number Diff line number Diff line
@@ -111,6 +111,7 @@ const struct tegra_fuse_soc tegra30_fuse_soc = { 
	.init = tegra30_fuse_init,

	.speedo_init = tegra30_init_speedo_data,

	.info = &tegra30_fuse_info,

	.soc_attr_group = &tegra_soc_attr_group,

};

#endif
@@ -125,6 +126,7 @@ const struct tegra_fuse_soc tegra114_fuse_soc = { 
	.init = tegra30_fuse_init,

	.speedo_init = tegra114_init_speedo_data,

	.info = &tegra114_fuse_info,

	.soc_attr_group = &tegra_soc_attr_group,

};

#endif
@@ -205,6 +207,7 @@ const struct tegra_fuse_soc tegra124_fuse_soc = { 
	.info = &tegra124_fuse_info,

	.lookups = tegra124_fuse_lookups,

	.num_lookups = ARRAY_SIZE(tegra124_fuse_lookups),

	.soc_attr_group = &tegra_soc_attr_group,

};

#endif
@@ -290,6 +293,7 @@ const struct tegra_fuse_soc tegra210_fuse_soc = { 
	.info = &tegra210_fuse_info,

	.lookups = tegra210_fuse_lookups,

	.num_lookups = ARRAY_SIZE(tegra210_fuse_lookups),

	.soc_attr_group = &tegra_soc_attr_group,

};

#endif
@@ -319,6 +323,7 @@ const struct tegra_fuse_soc tegra186_fuse_soc = { 
	.info = &tegra186_fuse_info,

	.lookups = tegra186_fuse_lookups,

	.num_lookups = ARRAY_SIZE(tegra186_fuse_lookups),

	.soc_attr_group = &tegra_soc_attr_group,

};

#endif
@@ -348,5 +353,6 @@ const struct tegra_fuse_soc tegra194_fuse_soc = { 
	.info = &tegra194_fuse_info,

	.lookups = tegra194_fuse_lookups,

	.num_lookups = ARRAY_SIZE(tegra194_fuse_lookups),

	.soc_attr_group = &tegra194_soc_attr_group,

};

#endif

drivers/soc/tegra/fuse/fuse.h

+8 −0
Original line number Diff line number Diff line
@@ -32,6 +32,8 @@ struct tegra_fuse_soc { 


	const struct nvmem_cell_lookup *lookups;

	unsigned int num_lookups;



	const struct attribute_group *soc_attr_group;

};



struct tegra_fuse {
@@ -64,6 +66,11 @@ void tegra_init_apbmisc(void); 
bool __init tegra_fuse_read_spare(unsigned int spare);

u32 __init tegra_fuse_read_early(unsigned int offset);



u8 tegra_get_major_rev(void);

u8 tegra_get_minor_rev(void);



extern const struct attribute_group tegra_soc_attr_group;



#ifdef CONFIG_ARCH_TEGRA_2x_SOC

void tegra20_init_speedo_data(struct tegra_sku_info *sku_info);

#endif
@@ -110,6 +117,7 @@ extern const struct tegra_fuse_soc tegra186_fuse_soc; 


#ifdef CONFIG_ARCH_TEGRA_194_SOC

extern const struct tegra_fuse_soc tegra194_fuse_soc;

extern const struct attribute_group tegra194_soc_attr_group;

#endif



#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE