Commit 0cf5a171 authored by Subhransu S. Prusty's avatar Subhransu S. Prusty Committed by Mark Brown
Browse files

ASoC: Intel: Skylake: Report Platform ID info from NHLT 



This patch create entry in sysfs file system to report the
platform_id = "pci-id-oem_id-oem_table_id-oem_revision"
for board identification.

Signed-off-by: default avatarSubhransu S. Prusty <subhransu.s.prusty@intel.com>
Signed-off-by: default avatarSodhi, VunnyX <vunnyx.sodhi@intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent ba210346

sound/soc/intel/skylake/skl-nhlt.c

+39 −3
Original line number Diff line number Diff line
@@ -189,9 +189,9 @@ int skl_get_dmic_geo(struct skl *skl) 
	return dmic_geo;

}



static void skl_nhlt_trim_space(struct skl *skl)

static void skl_nhlt_trim_space(char *trim)

{

	char *s = skl->tplg_name;

	char *s = trim;

	int cnt;

	int i;
@@ -218,7 +218,43 @@ int skl_nhlt_update_topology_bin(struct skl *skl) 
		skl->pci_id, nhlt->header.oem_id, nhlt->header.oem_table_id,

		nhlt->header.oem_revision, "-tplg.bin");



	skl_nhlt_trim_space(skl);

	skl_nhlt_trim_space(skl->tplg_name);



	return 0;

}



static ssize_t skl_nhlt_platform_id_show(struct device *dev,

			struct device_attribute *attr, char *buf)

{

	struct pci_dev *pci = to_pci_dev(dev);

	struct hdac_ext_bus *ebus = pci_get_drvdata(pci);

	struct skl *skl = ebus_to_skl(ebus);

	struct nhlt_acpi_table *nhlt = (struct nhlt_acpi_table *)skl->nhlt;

	char platform_id[32];



	sprintf(platform_id, "%x-%.6s-%.8s-%d", skl->pci_id,

			nhlt->header.oem_id, nhlt->header.oem_table_id,

			nhlt->header.oem_revision);



	skl_nhlt_trim_space(platform_id);

	return sprintf(buf, "%s\n", platform_id);

}



static DEVICE_ATTR(platform_id, 0444, skl_nhlt_platform_id_show, NULL);



int skl_nhlt_create_sysfs(struct skl *skl)

{

	struct device *dev = &skl->pci->dev;



	if (sysfs_create_file(&dev->kobj, &dev_attr_platform_id.attr))

		dev_warn(dev, "Error creating sysfs entry\n");



	return 0;

}



void skl_nhlt_remove_sysfs(struct skl *skl)

{

	struct device *dev = &skl->pci->dev;



	sysfs_remove_file(&dev->kobj, &dev_attr_platform_id.attr);

}

sound/soc/intel/skylake/skl.c

+5 −0
Original line number Diff line number Diff line
@@ -732,6 +732,10 @@ static int skl_probe(struct pci_dev *pci, 
		goto out_display_power_off;

	}



	err = skl_nhlt_create_sysfs(skl);

	if (err < 0)

		goto out_nhlt_free;



	skl_nhlt_update_topology_bin(skl);



	pci_set_drvdata(skl->pci, ebus);
@@ -852,6 +856,7 @@ static void skl_remove(struct pci_dev *pci) 
	skl_free_dsp(skl);

	skl_machine_device_unregister(skl);

	skl_dmic_device_unregister(skl);

	skl_nhlt_remove_sysfs(skl);

	skl_nhlt_free(skl->nhlt);

	skl_free(ebus);

	dev_set_drvdata(&pci->dev, NULL);

sound/soc/intel/skylake/skl.h

+2 −0
Original line number Diff line number Diff line
@@ -130,5 +130,7 @@ int skl_resume_dsp(struct skl *skl); 
void skl_cleanup_resources(struct skl *skl);

const struct skl_dsp_ops *skl_get_dsp_ops(int pci_id);

void skl_update_d0i3c(struct device *dev, bool enable);

int skl_nhlt_create_sysfs(struct skl *skl);

void skl_nhlt_remove_sysfs(struct skl *skl);



#endif /* __SOUND_SOC_SKL_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE