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

Commit aba3dd5a authored by Jeeja KP's avatar Jeeja KP Committed by Mark Brown
Browse files

ASoC: Intel: Skylake: Use acpi header for NHLT header 



Instead of defining own acpi header, use the available acpi
header defined in acpi framework.

Signed-off-by: default avatarJeeja KP <jeeja.kp@intel.com>
Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 9f2dd027

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

+0 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
 * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

 *

 */

#include <linux/acpi.h>

#include "skl.h"



/* Unique identification for getting NHLT blobs */

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

+2 −12
Original line number Diff line number Diff line
@@ -20,17 +20,7 @@ 
#ifndef __SKL_NHLT_H__

#define __SKL_NHLT_H__



struct acpi_desc_header {

	u32  signature;

	u32  length;

	u8   revision;

	u8   checksum;

	u8   oem_id[6];

	u64  oem_table_id;

	u32  oem_revision;

	u32  creator_id;

	u32  creator_revision;

} __packed;

#include <linux/acpi.h>



struct wav_fmt {

	u16 fmt_tag;
@@ -98,7 +88,7 @@ struct nhlt_endpoint { 
} __packed;



struct nhlt_acpi_table {

	struct acpi_desc_header header;

	struct acpi_table_header header;

	u8 endpoint_count;

	struct nhlt_endpoint desc[0];

} __packed;