Move the remaining headers under plat-omap/include/mach to plat-omap/include/plat. Also search and replace the files using these headers to include using the right path. This was done with: #!/bin/bash mach_dir_old="arch/arm/plat-omap/include/mach" plat_dir_new="arch/arm/plat-omap/include/plat" headers=$(cd $mach_dir_old && ls *.h) omap_dirs="arch/arm/*omap*/ \ drivers/video/omap \ sound/soc/omap" other_files="drivers/leds/leds-ams-delta.c \ drivers/mfd/menelaus.c \ drivers/mfd/twl4030-core.c \ drivers/mtd/nand/ams-delta.c" for header in $headers; do old="#include <mach\/$header" new="#include <plat\/$header" for dir in $omap_dirs; do find $dir -type f -name \*.[chS] | \ xargs sed -i "s/$old/$new/" done find drivers/ -type f -name \*omap*.[chS] | \ xargs sed -i "s/$old/$new/" for file in $other_files; do sed -i "s/$old/$new/" $file done done for header in $(ls $mach_dir_old/*.h); do git mv $header $plat_dir_new/ done Signed-off-by: Tony Lindgren <tony@atomide.com>
		
			
				
	
	
		
			151 lines
		
	
	
	
		
			3.9 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			151 lines
		
	
	
	
		
			3.9 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
/*
 | 
						|
 * omap2evm.c  --  SoC audio machine driver for omap2evm board
 | 
						|
 *
 | 
						|
 * Author: Arun KS <arunks@mistralsolutions.com>
 | 
						|
 *
 | 
						|
 * Based on sound/soc/omap/overo.c by Steve Sakoman
 | 
						|
 *
 | 
						|
 * 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.
 | 
						|
 *
 | 
						|
 * You should have received a copy of the GNU General Public License
 | 
						|
 * along with this program; if not, write to the Free Software
 | 
						|
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
 | 
						|
 * 02110-1301 USA
 | 
						|
 *
 | 
						|
 */
 | 
						|
 | 
						|
#include <linux/clk.h>
 | 
						|
#include <linux/platform_device.h>
 | 
						|
#include <sound/core.h>
 | 
						|
#include <sound/pcm.h>
 | 
						|
#include <sound/soc.h>
 | 
						|
#include <sound/soc-dapm.h>
 | 
						|
 | 
						|
#include <asm/mach-types.h>
 | 
						|
#include <mach/hardware.h>
 | 
						|
#include <mach/gpio.h>
 | 
						|
#include <plat/mcbsp.h>
 | 
						|
 | 
						|
#include "omap-mcbsp.h"
 | 
						|
#include "omap-pcm.h"
 | 
						|
#include "../codecs/twl4030.h"
 | 
						|
 | 
						|
static int omap2evm_hw_params(struct snd_pcm_substream *substream,
 | 
						|
	struct snd_pcm_hw_params *params,
 | 
						|
	struct snd_soc_dai *dai)
 | 
						|
{
 | 
						|
	struct snd_soc_pcm_runtime *rtd = substream->private_data;
 | 
						|
	struct snd_soc_dai *codec_dai = rtd->dai->codec_dai;
 | 
						|
	struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai;
 | 
						|
	int ret;
 | 
						|
 | 
						|
	/* Set codec DAI configuration */
 | 
						|
	ret = snd_soc_dai_set_fmt(codec_dai,
 | 
						|
				  SND_SOC_DAIFMT_I2S |
 | 
						|
				  SND_SOC_DAIFMT_NB_NF |
 | 
						|
				  SND_SOC_DAIFMT_CBM_CFM);
 | 
						|
	if (ret < 0) {
 | 
						|
		printk(KERN_ERR "can't set codec DAI configuration\n");
 | 
						|
		return ret;
 | 
						|
	}
 | 
						|
 | 
						|
	/* Set cpu DAI configuration */
 | 
						|
	ret = snd_soc_dai_set_fmt(cpu_dai,
 | 
						|
				  SND_SOC_DAIFMT_I2S |
 | 
						|
				  SND_SOC_DAIFMT_NB_NF |
 | 
						|
				  SND_SOC_DAIFMT_CBM_CFM);
 | 
						|
	if (ret < 0) {
 | 
						|
		printk(KERN_ERR "can't set cpu DAI configuration\n");
 | 
						|
		return ret;
 | 
						|
	}
 | 
						|
 | 
						|
	/* Set the codec system clock for DAC and ADC */
 | 
						|
	ret = snd_soc_dai_set_sysclk(codec_dai, 0, 26000000,
 | 
						|
					    SND_SOC_CLOCK_IN);
 | 
						|
	if (ret < 0) {
 | 
						|
		printk(KERN_ERR "can't set codec system clock\n");
 | 
						|
		return ret;
 | 
						|
	}
 | 
						|
 | 
						|
	return 0;
 | 
						|
}
 | 
						|
 | 
						|
static struct snd_soc_ops omap2evm_ops = {
 | 
						|
	.hw_params = omap2evm_hw_params,
 | 
						|
};
 | 
						|
 | 
						|
/* Digital audio interface glue - connects codec <--> CPU */
 | 
						|
static struct snd_soc_dai_link omap2evm_dai = {
 | 
						|
	.name = "TWL4030",
 | 
						|
	.stream_name = "TWL4030",
 | 
						|
	.cpu_dai = &omap_mcbsp_dai[0],
 | 
						|
	.codec_dai = &twl4030_dai[TWL4030_DAI_HIFI],
 | 
						|
	.ops = &omap2evm_ops,
 | 
						|
};
 | 
						|
 | 
						|
/* Audio machine driver */
 | 
						|
static struct snd_soc_card snd_soc_omap2evm = {
 | 
						|
	.name = "omap2evm",
 | 
						|
	.platform = &omap_soc_platform,
 | 
						|
	.dai_link = &omap2evm_dai,
 | 
						|
	.num_links = 1,
 | 
						|
};
 | 
						|
 | 
						|
/* Audio subsystem */
 | 
						|
static struct snd_soc_device omap2evm_snd_devdata = {
 | 
						|
	.card = &snd_soc_omap2evm,
 | 
						|
	.codec_dev = &soc_codec_dev_twl4030,
 | 
						|
};
 | 
						|
 | 
						|
static struct platform_device *omap2evm_snd_device;
 | 
						|
 | 
						|
static int __init omap2evm_soc_init(void)
 | 
						|
{
 | 
						|
	int ret;
 | 
						|
 | 
						|
	if (!machine_is_omap2evm()) {
 | 
						|
		pr_debug("Not omap2evm!\n");
 | 
						|
		return -ENODEV;
 | 
						|
	}
 | 
						|
	printk(KERN_INFO "omap2evm SoC init\n");
 | 
						|
 | 
						|
	omap2evm_snd_device = platform_device_alloc("soc-audio", -1);
 | 
						|
	if (!omap2evm_snd_device) {
 | 
						|
		printk(KERN_ERR "Platform device allocation failed\n");
 | 
						|
		return -ENOMEM;
 | 
						|
	}
 | 
						|
 | 
						|
	platform_set_drvdata(omap2evm_snd_device, &omap2evm_snd_devdata);
 | 
						|
	omap2evm_snd_devdata.dev = &omap2evm_snd_device->dev;
 | 
						|
	*(unsigned int *)omap2evm_dai.cpu_dai->private_data = 1; /* McBSP2 */
 | 
						|
 | 
						|
	ret = platform_device_add(omap2evm_snd_device);
 | 
						|
	if (ret)
 | 
						|
		goto err1;
 | 
						|
 | 
						|
	return 0;
 | 
						|
 | 
						|
err1:
 | 
						|
	printk(KERN_ERR "Unable to add platform device\n");
 | 
						|
	platform_device_put(omap2evm_snd_device);
 | 
						|
 | 
						|
	return ret;
 | 
						|
}
 | 
						|
module_init(omap2evm_soc_init);
 | 
						|
 | 
						|
static void __exit omap2evm_soc_exit(void)
 | 
						|
{
 | 
						|
	platform_device_unregister(omap2evm_snd_device);
 | 
						|
}
 | 
						|
module_exit(omap2evm_soc_exit);
 | 
						|
 | 
						|
MODULE_AUTHOR("Arun KS <arunks@mistralsolutions.com>");
 | 
						|
MODULE_DESCRIPTION("ALSA SoC omap2evm");
 | 
						|
MODULE_LICENSE("GPL");
 |