From 5a8fe7e6538b6f76d9bc057e5fd59f79a7d59964 Mon Sep 17 00:00:00 2001 From: Bhuvanchandra DV Date: Mon, 20 Feb 2017 23:15:02 +0530 Subject: apalis-tk1: use soc uid instead Instead of providing revision, SKU and PID information via soc_id pass SoC's unique ID. Signed-off-by: Bhuvanchandra DV Acked-by: Marcel Ziswiler --- arch/arm/mach-tegra/common.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/arch/arm/mach-tegra/common.c b/arch/arm/mach-tegra/common.c index 23ae029a3ec2..c9c3858f5ae9 100644 --- a/arch/arm/mach-tegra/common.c +++ b/arch/arm/mach-tegra/common.c @@ -2342,19 +2342,10 @@ static const char * __init tegra_get_family(void) return kasprintf(GFP_KERNEL, "Tegra%d", cid); } -static const char * __init tegra_get_soc_id(void) -{ - int package_id = tegra_package_id(); - - return kasprintf(GFP_KERNEL, "REV=%s:SKU=0x%x:PID=0x%x", - tegra_revision_name[tegra_revision], - tegra_get_sku_id(), package_id); -} - static void __init tegra_soc_info_populate(struct soc_device_attribute *soc_dev_attr, const char *machine) { - soc_dev_attr->soc_id = tegra_get_soc_id(); + soc_dev_attr->soc_id = kasprintf(GFP_KERNEL, "%llx", tegra_chip_uid()); soc_dev_attr->machine = machine; soc_dev_attr->family = tegra_get_family(); soc_dev_attr->revision = tegra_get_revision(); -- cgit v1.2.3