From: Peter Ujfalusi <peter.ujfalusi@ti.com>
To: Tony Lindgren <tony@atomide.com>, Liam Girdwood <lrg@ti.com>,
Mark Brown <broonie@opensource.wolfsonmicro.com>,
Jarkko Nikula <jarkko.nikula@bitmer.com>
Cc: linux-omap@vger.kernel.org, alsa-devel@alsa-project.org,
linux-arm-kernel@lists.infradead.org,
Samuel Ortiz <sameo@linux.intel.com>
Subject: [RFC 02/11] OMAP: mcbsp: Move core driver under sound/soc/omap
Date: Wed, 15 Feb 2012 17:37:51 +0200 [thread overview]
Message-ID: <1329320280-1621-3-git-send-email-peter.ujfalusi@ti.com> (raw)
In-Reply-To: <1329320280-1621-1-git-send-email-peter.ujfalusi@ti.com>
In order to consolidate the McBSP driver move it out from
arch/arm/plat-omap directory under sound/soc/omap/
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
arch/arm/plat-omap/Kconfig | 8 --------
arch/arm/plat-omap/Makefile | 2 --
sound/soc/omap/Kconfig | 4 ++++
sound/soc/omap/Makefile | 1 +
{arch/arm/plat-omap => sound/soc/omap}/mcbsp.c | 4 +++-
5 files changed, 8 insertions(+), 11 deletions(-)
rename {arch/arm/plat-omap => sound/soc/omap}/mcbsp.c (99%)
diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig
index aa59f42..8f81503 100644
--- a/arch/arm/plat-omap/Kconfig
+++ b/arch/arm/plat-omap/Kconfig
@@ -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
diff --git a/arch/arm/plat-omap/Makefile b/arch/arm/plat-omap/Makefile
index 9a58461..c0fe275 100644
--- a/arch/arm/plat-omap/Makefile
+++ b/arch/arm/plat-omap/Makefile
@@ -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
diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig
index 47b23fe..27a3a29 100644
--- a/sound/soc/omap/Kconfig
+++ b/sound/soc/omap/Kconfig
@@ -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
diff --git a/sound/soc/omap/Makefile b/sound/soc/omap/Makefile
index 123ac18..9f8fbd5 100644
--- a/sound/soc/omap/Makefile
+++ b/sound/soc/omap/Makefile
@@ -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
diff --git a/arch/arm/plat-omap/mcbsp.c b/sound/soc/omap/mcbsp.c
similarity index 99%
rename from arch/arm/plat-omap/mcbsp.c
rename to sound/soc/omap/mcbsp.c
index 3c704f3..36d83b0 100644
--- a/arch/arm/plat-omap/mcbsp.c
+++ b/sound/soc/omap/mcbsp.c
@@ -1,9 +1,11 @@
/*
- * 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
--
1.7.8.4
next prev parent reply other threads:[~2012-02-15 15:38 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-15 15:37 [RFC 00/11]O MAP/ASoC: Move and merge McBSP driver under ASoC Peter Ujfalusi
2012-02-15 15:37 ` [RFC 01/11] ARM: OMAP: mcbsp: Convert core driver to proper platform driver Peter Ujfalusi
2012-02-20 17:20 ` Tony Lindgren
2012-02-15 15:37 ` Peter Ujfalusi [this message]
2012-02-20 17:21 ` [RFC 02/11] OMAP: mcbsp: Move core driver under sound/soc/omap Tony Lindgren
2012-02-15 15:37 ` [RFC 03/11] ASoC: OMAP: McBSP: Consolidate plat/mcbsp.h content Peter Ujfalusi
2012-02-15 15:37 ` [RFC 04/11] ASoC: core - Add API call to register dai kcontrols Peter Ujfalusi
2012-02-15 15:46 ` Liam Girdwood
2012-02-15 15:52 ` Ujfalusi, Peter
2012-02-15 15:37 ` [RFC 05/11] ASoC: omap-mcbsp: Create a single driver for McBSP Peter Ujfalusi
2012-02-15 15:37 ` [RFC 06/11] ARM: OMAP: Do not register omap-mcbsp-dai device Peter Ujfalusi
2012-02-15 15:37 ` [RFC 07/11] ASoC: OMAP: mcbsp.h: Clean up bit definitions Peter Ujfalusi
2012-02-15 15:37 ` [RFC 08/11] ASoC: OMAP McBSP: Remove redundant accessors Peter Ujfalusi
2012-02-15 15:37 ` [RFC 09/11] ASoC: omap-mcbsp: Cleanup of module probe/remove code Peter Ujfalusi
2012-02-15 15:37 ` [RFC 10/11] ASoC: omap-mcbsp: Merge the omap_mcbsp_data into omap_mcbsp structure Peter Ujfalusi
2012-02-15 15:38 ` [RFC 11/11] ASoC: omap-mcbsp: Simplify DMA configuration Peter Ujfalusi
2012-02-15 15:56 ` [RFC 00/11]O MAP/ASoC: Move and merge McBSP driver under ASoC Ujfalusi, Peter
2012-02-15 19:06 ` Jarkko Nikula
2012-02-20 10:15 ` Janusz Krzysztofik
2012-02-15 16:08 ` Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1329320280-1621-3-git-send-email-peter.ujfalusi@ti.com \
--to=peter.ujfalusi@ti.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=jarkko.nikula@bitmer.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-omap@vger.kernel.org \
--cc=lrg@ti.com \
--cc=sameo@linux.intel.com \
--cc=tony@atomide.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).