ASoC: Intel: create common folder and move common files in
Restructure the sound/soc/intel/ directory: create common folder, and move sst common files here. Signed-off-by: Jie Yang <yang.jie@intel.com> Acked-by: Jarkko Nikula <jarkko.nikula@linux.intel.com> Tested-by: Jarkko Nikula <jarkko.nikula@linux.intel.com> Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
		
					parent
					
						
							
								2c0ed63492
							
						
					
				
			
			
				commit
				
					
						2106241a68
					
				
			
		
					 14 changed files with 14 additions and 12 deletions
				
			
		|  | @ -1,6 +1,5 @@ | |||
| # Core support
 | ||||
| snd-soc-sst-dsp-objs := sst-dsp.o sst-firmware.o | ||||
| snd-soc-sst-acpi-objs := sst-acpi.o | ||||
| obj-$(CONFIG_SND_SOC_INTEL_SST) += common/ | ||||
| 
 | ||||
| snd-soc-sst-mfld-platform-objs := sst-mfld-platform-pcm.o \
 | ||||
| 	sst-mfld-platform-compress.o sst-atom-controls.o | ||||
|  | @ -9,9 +8,6 @@ snd-soc-mfld-machine-objs := mfld_machine.o | |||
| obj-$(CONFIG_SND_SST_MFLD_PLATFORM) += snd-soc-sst-mfld-platform.o | ||||
| obj-$(CONFIG_SND_MFLD_MACHINE) += snd-soc-mfld-machine.o | ||||
| 
 | ||||
| obj-$(CONFIG_SND_SOC_INTEL_SST) += snd-soc-sst-dsp.o | ||||
| obj-$(CONFIG_SND_SOC_INTEL_SST_ACPI) += snd-soc-sst-acpi.o | ||||
| 
 | ||||
| # Platform Support
 | ||||
| snd-soc-sst-haswell-pcm-objs := \
 | ||||
| 	sst-haswell-ipc.o sst-haswell-pcm.o sst-haswell-dsp.o | ||||
|  |  | |||
							
								
								
									
										6
									
								
								sound/soc/intel/common/Makefile
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										6
									
								
								sound/soc/intel/common/Makefile
									
										
									
									
									
										Normal file
									
								
							|  | @ -0,0 +1,6 @@ | |||
| snd-soc-sst-dsp-objs := sst-dsp.o sst-firmware.o | ||||
| snd-soc-sst-acpi-objs := sst-acpi.o | ||||
| 
 | ||||
| obj-$(CONFIG_SND_SOC_INTEL_SST) += snd-soc-sst-dsp.o | ||||
| obj-$(CONFIG_SND_SOC_INTEL_SST_ACPI) += snd-soc-sst-acpi.o | ||||
| 
 | ||||
|  | @ -32,7 +32,7 @@ | |||
| #include <asm/platform_sst_audio.h> | ||||
| #include "../sst-mfld-platform.h" | ||||
| #include "sst.h" | ||||
| #include "../sst-dsp.h" | ||||
| #include "../common/sst-dsp.h" | ||||
| 
 | ||||
| MODULE_AUTHOR("Vinod Koul <vinod.koul@intel.com>"); | ||||
| MODULE_AUTHOR("Harsha Priya <priya.harsha@intel.com>"); | ||||
|  |  | |||
|  | @ -39,7 +39,7 @@ | |||
| #include <acpi/actypes.h> | ||||
| #include <acpi/acpi_bus.h> | ||||
| #include "../sst-mfld-platform.h" | ||||
| #include "../sst-dsp.h" | ||||
| #include "../common/sst-dsp.h" | ||||
| #include "sst.h" | ||||
| 
 | ||||
| struct sst_machines { | ||||
|  |  | |||
|  | @ -32,7 +32,7 @@ | |||
| #include <asm/platform_sst_audio.h> | ||||
| #include "../sst-mfld-platform.h" | ||||
| #include "sst.h" | ||||
| #include "../sst-dsp.h" | ||||
| #include "../common/sst-dsp.h" | ||||
| 
 | ||||
| 
 | ||||
| 
 | ||||
|  |  | |||
|  | @ -32,7 +32,7 @@ | |||
| #include <asm/platform_sst_audio.h> | ||||
| #include "../sst-mfld-platform.h" | ||||
| #include "sst.h" | ||||
| #include "../sst-dsp.h" | ||||
| #include "../common/sst-dsp.h" | ||||
| 
 | ||||
| struct sst_block *sst_create_block(struct intel_sst_drv *ctx, | ||||
| 					u32 msg_id, u32 drv_id) | ||||
|  |  | |||
|  | @ -37,7 +37,7 @@ | |||
| #include <asm/platform_sst_audio.h> | ||||
| #include "../sst-mfld-platform.h" | ||||
| #include "sst.h" | ||||
| #include "../sst-dsp.h" | ||||
| #include "../common/sst-dsp.h" | ||||
| 
 | ||||
| void memcpy32_toio(void __iomem *dst, const void *src, int count) | ||||
| { | ||||
|  |  | |||
|  | @ -34,7 +34,7 @@ | |||
| #include <asm/platform_sst_audio.h> | ||||
| #include "../sst-mfld-platform.h" | ||||
| #include "sst.h" | ||||
| #include "../sst-dsp.h" | ||||
| #include "../common/sst-dsp.h" | ||||
| 
 | ||||
| int sst_shim_write(void __iomem *addr, int offset, int value) | ||||
| { | ||||
|  |  | |||
|  | @ -31,7 +31,7 @@ | |||
| #include <asm/platform_sst_audio.h> | ||||
| #include "../sst-mfld-platform.h" | ||||
| #include "sst.h" | ||||
| #include "../sst-dsp.h" | ||||
| #include "../common/sst-dsp.h" | ||||
| 
 | ||||
| int sst_alloc_stream_mrfld(struct intel_sst_drv *sst_drv_ctx, void *params) | ||||
| { | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 Jie Yang
				Jie Yang