Commit 71e822e9 authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Liam Girdwood
Browse files

OMAP: mcbsp: Move core driver under sound/soc/omap 



In order to consolidate the McBSP driver move it out from
arch/arm/plat-omap directory under sound/soc/omap/

Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
Acked-by: default avatarTony Lindgren <tony@atomide.com>
Tested-by: default avatarGrazvydas Ignotas <notasas@gmail.com>
Tested-by: default avatarJanusz Krzysztofik <jkrzyszt@tis.icnet.pl>
Acked-by: default avatarJarkko Nikula <jarkko.nikula@bitmer.com>
Signed-off-by: default avatarLiam Girdwood <lrg@ti.com>
parent 0210dc4e

arch/arm/plat-omap/Kconfig

+0 −8
Original line number Diff line number Diff line
@@ -110,14 +110,6 @@ config OMAP_MUX_WARNINGS 
	  to change the pin multiplexing setup.	 When there are no warnings

	  printed, it's safe to deselect OMAP_MUX for your product.



config OMAP_MCBSP

	bool "McBSP support"

	depends on ARCH_OMAP

	default y

	help

	  Say Y here if you want support for the OMAP Multichannel

	  Buffered Serial Port.



config OMAP_MBOX_FWK

	tristate "Mailbox framework support"

	depends on ARCH_OMAP

arch/arm/plat-omap/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -17,8 +17,6 @@ obj-$(CONFIG_ARCH_OMAP2) += omap_device.o 
obj-$(CONFIG_ARCH_OMAP3) += omap_device.o

obj-$(CONFIG_ARCH_OMAP4) += omap_device.o



obj-$(CONFIG_OMAP_MCBSP) += mcbsp.o



obj-$(CONFIG_OMAP_DM_TIMER) += dmtimer.o

obj-$(CONFIG_OMAP_DEBUG_DEVICES) += debug-devices.o

obj-$(CONFIG_OMAP_DEBUG_LEDS) += debug-leds.o

sound/soc/omap/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -5,6 +5,10 @@ config SND_OMAP_SOC 
config SND_OMAP_SOC_DMIC

	tristate



config OMAP_MCBSP

	tristate

	depends on ARCH_OMAP



config SND_OMAP_SOC_MCBSP

	tristate

	select OMAP_MCBSP

sound/soc/omap/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ snd-soc-omap-hdmi-objs := omap-hdmi.o 


obj-$(CONFIG_SND_OMAP_SOC) += snd-soc-omap.o

obj-$(CONFIG_SND_OMAP_SOC_DMIC) += snd-soc-omap-dmic.o

obj-$(CONFIG_OMAP_MCBSP) += mcbsp.o

obj-$(CONFIG_SND_OMAP_SOC_MCBSP) += snd-soc-omap-mcbsp.o

obj-$(CONFIG_SND_OMAP_SOC_MCPDM) += snd-soc-omap-mcpdm.o

obj-$(CONFIG_SND_OMAP_SOC_HDMI) += snd-soc-omap-hdmi.o

arch/arm/plat-omap/mcbsp.c→sound/soc/omap/mcbsp.c

+3 −1
Original line number Diff line number Diff line 
/*

 * linux/arch/arm/plat-omap/mcbsp.c

 * sound/soc/omap/mcbsp.c

 *

 * Copyright (C) 2004 Nokia Corporation

 * Author: Samuel Ortiz <samuel.ortiz@nokia.com>

 *

 * Contact: Jarkko Nikula <jarkko.nikula@bitmer.com>

 *          Peter Ujfalusi <peter.ujfalusi@ti.com>

 *

 * 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

CRA Git | Maintained and supported by SUSTech CRA and CCSE