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

Commit 95f09801 authored by Vinod Koul's avatar Vinod Koul Committed by Mark Brown
Browse files

ASoC: Intel: Move apci find machine routines 



This code to find the machine is common for all drivers so move
it to a separate file and header for use in other drivers

Signed-off-by: default avatarVinod Koul <vinod.koul@intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 7ae3cb15

sound/soc/intel/common/Makefile

+1 −2
Original line number Diff line number Diff line 
snd-soc-sst-dsp-objs := sst-dsp.o

snd-soc-sst-acpi-objs := sst-acpi.o

snd-soc-sst-acpi-objs := sst-acpi.o sst-match-acpi.o

snd-soc-sst-ipc-objs := sst-ipc.o



ifneq ($(CONFIG_DW_DMAC_CORE),)
@@ -8,4 +8,3 @@ endif 


obj-$(CONFIG_SND_SOC_INTEL_SST) += snd-soc-sst-dsp.o snd-soc-sst-ipc.o

obj-$(CONFIG_SND_SOC_INTEL_SST_ACPI) += snd-soc-sst-acpi.o

sound/soc/intel/common/sst-acpi.c

+1 −32
Original line number Diff line number Diff line
@@ -21,21 +21,12 @@ 
#include <linux/platform_device.h>



#include "sst-dsp.h"

#include "sst-acpi.h"



#define SST_LPT_DSP_DMA_ADDR_OFFSET	0x0F0000

#define SST_WPT_DSP_DMA_ADDR_OFFSET	0x0FE000

#define SST_LPT_DSP_DMA_SIZE		(1024 - 1)



/* Descriptor for SST ASoC machine driver */

struct sst_acpi_mach {

	/* ACPI ID for the matching machine driver. Audio codec for instance */

	const u8 id[ACPI_ID_LEN];

	/* machine driver name */

	const char *drv_name;

	/* firmware file name */

	const char *fw_filename;

};



/* Descriptor for setting up SST platform data */

struct sst_acpi_desc {

	const char *drv_name;
@@ -88,28 +79,6 @@ static void sst_acpi_fw_cb(const struct firmware *fw, void *context) 
	return;

}



static acpi_status sst_acpi_mach_match(acpi_handle handle, u32 level,

				       void *context, void **ret)

{

	*(bool *)context = true;

	return AE_OK;

}



static struct sst_acpi_mach *sst_acpi_find_machine(

	struct sst_acpi_mach *machines)

{

	struct sst_acpi_mach *mach;

	bool found = false;



	for (mach = machines; mach->id[0]; mach++)

		if (ACPI_SUCCESS(acpi_get_devices(mach->id,

						  sst_acpi_mach_match,

						  &found, NULL)) && found)

			return mach;



	return NULL;

}



static int sst_acpi_probe(struct platform_device *pdev)

{

	const struct acpi_device_id *id;

sound/soc/intel/common/sst-acpi.h

0 → 100644
+28 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2013-15, Intel Corporation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public License version

 * 2 as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 */



#include <linux/acpi.h>



/* acpi match */

struct sst_acpi_mach *sst_acpi_find_machine(struct sst_acpi_mach *machines);



/* Descriptor for SST ASoC machine driver */

struct sst_acpi_mach {

	/* ACPI ID for the matching machine driver. Audio codec for instance */

	const u8 id[ACPI_ID_LEN];

	/* machine driver name */

	const char *drv_name;

	/* firmware file name */

	const char *fw_filename;

};

sound/soc/intel/common/sst-match-acpi.c

0 → 100644
+43 −0
Original line number Diff line number Diff line 
/*

 * sst_match_apci.c - SST (LPE) match for ACPI enumeration.

 *

 * Copyright (c) 2013-15, Intel Corporation.

 *

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms and conditions of the GNU General Public License,

 * version 2, as published by the Free Software Foundation.

 *

 * This program is distributed in the hope it will be useful, but WITHOUT

 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

 * more details.

 */

#include <linux/acpi.h>

#include <linux/device.h>

#include <linux/module.h>

#include <linux/platform_device.h>



#include "sst-acpi.h"



static acpi_status sst_acpi_mach_match(acpi_handle handle, u32 level,

				       void *context, void **ret)

{

	*(bool *)context = true;

	return AE_OK;

}



struct sst_acpi_mach *sst_acpi_find_machine(struct sst_acpi_mach *machines)

{

	struct sst_acpi_mach *mach;

	bool found = false;



	for (mach = machines; mach->id[0]; mach++)

		if (ACPI_SUCCESS(acpi_get_devices(mach->id,

						  sst_acpi_mach_match,

						  &found, NULL)) && found)

			return mach;



	return NULL;

}

EXPORT_SYMBOL_GPL(sst_acpi_find_machine);