[RFC 00/11]O MAP/ASoC: Move and merge McBSP driver under ASoC

[RFC 00/11]O MAP/ASoC: Move and merge McBSP driver under ASoC

[Peter Ujfalusi]

Hello,

The aim of this series is to move the plat-omap/mcbsp.c driver out to
sound/soc/omap/
By doing this we can combine the two levels of McBSP driver stack into a single
one.
Formally we had omap-mcbsp.[1-X] drivers (plat-omap/mcbsp.c), and
omap-mcbsp-dai.[0-(X-1) drivers (sound/soc/omap/omap-mcbsp.c).
We had global, shared structures, variables, pointers. The API between the two
driver was a set of exported function calls where one of the parameter was the
McBSP port id.

With this series we will have one driver for McBSP (omap-mcbsp.[1-X]) which is
basically the ASoC dai driver. All exported/shared global structures are gone
since we can use driver data for all ports in this way.

With the code in one place we can do further clean up in the McBSP driver, and
adding new features will be much easier in the future. Also the DT support for
McBSP will be significantly easier if we have one set of driver.

McBSP is only used by audio, there are no known other users of the OMAP McBSP
(well, Nokia n700 has the WLAN connected through McBSP but we do not have
driver for that anyway).

The series was created against Takashi's topic/asoc branch. I have tested it on
Beagle xM, and compile tested it for OMAP1, OMAP2, and OMAP4 as well.

I'm going to do more work on the cleanup, and the plan is to merge the two files
into one (mcbsp.c -> omap-mcbsp.c) eventually.

Comments, testers are welcome...

CC-ing Samuel as well since he is the original author of the plat-omap/mcbsp.c
driver.

Regards,
Peter
---
Peter Ujfalusi (11):
  ARM: OMAP: mcbsp: Convert core driver to proper platform driver
  OMAP: mcbsp: Move core driver under sound/soc/omap
  ASoC: OMAP: McBSP: Consolidate plat/mcbsp.h content
  ASoC: core - Add API call to register dai kcontrols.
  ASoC: omap-mcbsp: Create a single driver for McBSP
  ARM: OMAP: Do not register omap-mcbsp-dai device
  ASoC: OMAP: mcbsp.h: Clean up bit definitions
  ASoC: OMAP McBSP: Remove redundant accessors
  ASoC: omap-mcbsp: Cleanup of module probe/remove code
  ASoC: omap-mcbsp: Merge the omap_mcbsp_data into omap_mcbsp structure
  ASoC: omap-mcbsp: Simplify DMA configuration

 arch/arm/mach-omap1/devices.c                  |    9 -
 arch/arm/mach-omap1/mcbsp.c                    |   14 +-
 arch/arm/mach-omap2/devices.c                  |   22 --
 arch/arm/mach-omap2/mcbsp.c                    |    8 +-
 arch/arm/plat-omap/Kconfig                     |    8 -
 arch/arm/plat-omap/Makefile                    |    2 -
 arch/arm/plat-omap/include/plat/mcbsp.h        |  321 ----------------
 include/sound/soc.h                            |    2 +
 sound/soc/omap/Kconfig                         |    4 +
 sound/soc/omap/Makefile                        |    1 +
 sound/soc/omap/am3517evm.c                     |    2 +-
 sound/soc/omap/ams-delta.c                     |    2 +-
 sound/soc/omap/igep0020.c                      |    2 +-
 {arch/arm/plat-omap => sound/soc/omap}/mcbsp.c |  463 ++++--------------------
 sound/soc/omap/mcbsp.h                         |  337 +++++++++++++++++
 sound/soc/omap/n810.c                          |    2 +-
 sound/soc/omap/omap-mcbsp.c                    |  287 ++++++++-------
 sound/soc/omap/omap-mcbsp.h                    |    2 +-
 sound/soc/omap/omap-pcm.h                      |    2 +
 sound/soc/omap/omap3beagle.c                   |    2 +-
 sound/soc/omap/omap3evm.c                      |    2 +-
 sound/soc/omap/omap3pandora.c                  |    4 +-
 sound/soc/omap/osk5912.c                       |    2 +-
 sound/soc/omap/overo.c                         |    2 +-
 sound/soc/omap/rx51.c                          |    4 +-
 sound/soc/omap/sdp3430.c                       |    4 +-
 sound/soc/omap/zoom2.c                         |    4 +-
 sound/soc/soc-core.c                           |   31 ++
 28 files changed, 631 insertions(+), 914 deletions(-)
 rename {arch/arm/plat-omap => sound/soc/omap}/mcbsp.c (69%)
 create mode 100644 sound/soc/omap/mcbsp.h

-- 
1.7.8.4

[RFC 04/11] ASoC: core - Add API call to register dai kcontrols.

[Liam Girdwood]

On Wed, 2012-02-15 at 17:37 +0200, Peter Ujfalusi wrote:
> Allow dai drivers to register kcontrols.
> 
> Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
> ---
>  include/sound/soc.h  |    2 ++
>  sound/soc/soc-core.c |   31 +++++++++++++++++++++++++++++++
>  2 files changed, 33 insertions(+), 0 deletions(-)

This feature has already been applied.

Regards

Liam

[RFC 04/11] ASoC: core - Add API call to register dai kcontrols.

[Ujfalusi, Peter]

On Wed, Feb 15, 2012 at 5:46 PM, Liam Girdwood <lrg@ti.com> wrote:
> On Wed, 2012-02-15 at 17:37 +0200, Peter Ujfalusi wrote:
>> Allow dai drivers to register kcontrols.
>>
>> Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
>> ---
>> ?include/sound/soc.h ?| ? ?2 ++
>> ?sound/soc/soc-core.c | ? 31 +++++++++++++++++++++++++++++++
>> ?2 files changed, 33 insertions(+), 0 deletions(-)
>
> This feature has already been applied.

Oh, I'll take a look and use the existing feature.

Thanks,
P?ter

[RFC 00/11]O MAP/ASoC: Move and merge McBSP driver under ASoC

[Ujfalusi, Peter]

Hi,

CC-ing Janusz, since he is the only one I know who have, and use OMAP1
with audio...
Janusz: if your time allows would you be able to test this series on
OMAP1 (it compiles...)?

Thanks,
P?ter


On Wed, Feb 15, 2012 at 5:37 PM, Peter Ujfalusi <peter.ujfalusi@ti.com> wrote:
> Hello,
>
> The aim of this series is to move the plat-omap/mcbsp.c driver out to
> sound/soc/omap/
> By doing this we can combine the two levels of McBSP driver stack into a single
> one.
> Formally we had omap-mcbsp.[1-X] drivers (plat-omap/mcbsp.c), and
> omap-mcbsp-dai.[0-(X-1) drivers (sound/soc/omap/omap-mcbsp.c).
> We had global, shared structures, variables, pointers. The API between the two
> driver was a set of exported function calls where one of the parameter was the
> McBSP port id.
>
> With this series we will have one driver for McBSP (omap-mcbsp.[1-X]) which is
> basically the ASoC dai driver. All exported/shared global structures are gone
> since we can use driver data for all ports in this way.
>
> With the code in one place we can do further clean up in the McBSP driver, and
> adding new features will be much easier in the future. Also the DT support for
> McBSP will be significantly easier if we have one set of driver.
>
> McBSP is only used by audio, there are no known other users of the OMAP McBSP
> (well, Nokia n700 has the WLAN connected through McBSP but we do not have
> driver for that anyway).
>
> The series was created against Takashi's topic/asoc branch. I have tested it on
> Beagle xM, and compile tested it for OMAP1, OMAP2, and OMAP4 as well.
>
> I'm going to do more work on the cleanup, and the plan is to merge the two files
> into one (mcbsp.c -> omap-mcbsp.c) eventually.
>
> Comments, testers are welcome...
>
> CC-ing Samuel as well since he is the original author of the plat-omap/mcbsp.c
> driver.
>
> Regards,
> Peter
> ---
> Peter Ujfalusi (11):
> ?ARM: OMAP: mcbsp: Convert core driver to proper platform driver
> ?OMAP: mcbsp: Move core driver under sound/soc/omap
> ?ASoC: OMAP: McBSP: Consolidate plat/mcbsp.h content
> ?ASoC: core - Add API call to register dai kcontrols.
> ?ASoC: omap-mcbsp: Create a single driver for McBSP
> ?ARM: OMAP: Do not register omap-mcbsp-dai device
> ?ASoC: OMAP: mcbsp.h: Clean up bit definitions
> ?ASoC: OMAP McBSP: Remove redundant accessors
> ?ASoC: omap-mcbsp: Cleanup of module probe/remove code
> ?ASoC: omap-mcbsp: Merge the omap_mcbsp_data into omap_mcbsp structure
> ?ASoC: omap-mcbsp: Simplify DMA configuration
>
> ?arch/arm/mach-omap1/devices.c ? ? ? ? ? ? ? ? ?| ? ?9 -
> ?arch/arm/mach-omap1/mcbsp.c ? ? ? ? ? ? ? ? ? ?| ? 14 +-
> ?arch/arm/mach-omap2/devices.c ? ? ? ? ? ? ? ? ?| ? 22 --
> ?arch/arm/mach-omap2/mcbsp.c ? ? ? ? ? ? ? ? ? ?| ? ?8 +-
> ?arch/arm/plat-omap/Kconfig ? ? ? ? ? ? ? ? ? ? | ? ?8 -
> ?arch/arm/plat-omap/Makefile ? ? ? ? ? ? ? ? ? ?| ? ?2 -
> ?arch/arm/plat-omap/include/plat/mcbsp.h ? ? ? ?| ?321 ----------------
> ?include/sound/soc.h ? ? ? ? ? ? ? ? ? ? ? ? ? ?| ? ?2 +
> ?sound/soc/omap/Kconfig ? ? ? ? ? ? ? ? ? ? ? ? | ? ?4 +
> ?sound/soc/omap/Makefile ? ? ? ? ? ? ? ? ? ? ? ?| ? ?1 +
> ?sound/soc/omap/am3517evm.c ? ? ? ? ? ? ? ? ? ? | ? ?2 +-
> ?sound/soc/omap/ams-delta.c ? ? ? ? ? ? ? ? ? ? | ? ?2 +-
> ?sound/soc/omap/igep0020.c ? ? ? ? ? ? ? ? ? ? ?| ? ?2 +-
> ?{arch/arm/plat-omap => sound/soc/omap}/mcbsp.c | ?463 ++++--------------------
> ?sound/soc/omap/mcbsp.h ? ? ? ? ? ? ? ? ? ? ? ? | ?337 +++++++++++++++++
> ?sound/soc/omap/n810.c ? ? ? ? ? ? ? ? ? ? ? ? ?| ? ?2 +-
> ?sound/soc/omap/omap-mcbsp.c ? ? ? ? ? ? ? ? ? ?| ?287 ++++++++-------
> ?sound/soc/omap/omap-mcbsp.h ? ? ? ? ? ? ? ? ? ?| ? ?2 +-
> ?sound/soc/omap/omap-pcm.h ? ? ? ? ? ? ? ? ? ? ?| ? ?2 +
> ?sound/soc/omap/omap3beagle.c ? ? ? ? ? ? ? ? ? | ? ?2 +-
> ?sound/soc/omap/omap3evm.c ? ? ? ? ? ? ? ? ? ? ?| ? ?2 +-
> ?sound/soc/omap/omap3pandora.c ? ? ? ? ? ? ? ? ?| ? ?4 +-
> ?sound/soc/omap/osk5912.c ? ? ? ? ? ? ? ? ? ? ? | ? ?2 +-
> ?sound/soc/omap/overo.c ? ? ? ? ? ? ? ? ? ? ? ? | ? ?2 +-
> ?sound/soc/omap/rx51.c ? ? ? ? ? ? ? ? ? ? ? ? ?| ? ?4 +-
> ?sound/soc/omap/sdp3430.c ? ? ? ? ? ? ? ? ? ? ? | ? ?4 +-
> ?sound/soc/omap/zoom2.c ? ? ? ? ? ? ? ? ? ? ? ? | ? ?4 +-
> ?sound/soc/soc-core.c ? ? ? ? ? ? ? ? ? ? ? ? ? | ? 31 ++
> ?28 files changed, 631 insertions(+), 914 deletions(-)
> ?rename {arch/arm/plat-omap => sound/soc/omap}/mcbsp.c (69%)
> ?create mode 100644 sound/soc/omap/mcbsp.h
>
> --
> 1.7.8.4
>

[RFC 00/11]O MAP/ASoC: Move and merge McBSP driver under ASoC

[Mark Brown]

On Wed, Feb 15, 2012 at 05:37:49PM +0200, Peter Ujfalusi wrote:
> Hello,
> 
> The aim of this series is to move the plat-omap/mcbsp.c driver out to
> sound/soc/omap/
> By doing this we can combine the two levels of McBSP driver stack into a single
> one.

This all looks OK to me.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20120215/b7b57b5c/attachment.sig>

[RFC 00/11]O MAP/ASoC: Move and merge McBSP driver under ASoC

[Jarkko Nikula]

On 02/15/2012 05:56 PM, Ujfalusi, Peter wrote:
> Hi,
> 
> CC-ing Janusz, since he is the only one I know who have, and use OMAP1
> with audio...
> Janusz: if your time allows would you be able to test this series on
> OMAP1 (it compiles...)?
> 
Yeah, it would be shame to break omap1, especially considering how much
Janusz has put his personal effort on it.

>> McBSP is only used by audio, there are no known other users of the OMAP McBSP
>> (well, Nokia n700 has the WLAN connected through McBSP but we do not have
>> driver for that anyway).
>>
And since the clock stop mode is not supported in newer omaps there very
unlikely won't be.

>> The series was created against Takashi's topic/asoc branch. I have tested it on
>> Beagle xM, and compile tested it for OMAP1, OMAP2, and OMAP4 as well.
>>
>> I'm going to do more work on the cleanup, and the plan is to merge the two files
>> into one (mcbsp.c -> omap-mcbsp.c) eventually.
>>
>> Comments, testers are welcome...

Unfortunately I won't be able to give any test this week but at quick
look the set looks good to me.

-- 
Jarkko

[RFC 00/11]O MAP/ASoC: Move and merge McBSP driver under ASoC

[Janusz Krzysztofik]

On Wednesday 15 of February 2012 17:56:15 Ujfalusi, Peter wrote:
> Hi,
> 
> CC-ing Janusz, since he is the only one I know who have, and use OMAP1
> with audio...
> Janusz: if your time allows would you be able to test this series on
> OMAP1 (it compiles...)?

for OMAP1:

Tested-by: Janusz Krzysztofik <jkrzyszt@tis.icnet.pl>

Thanks,
Janusz

[RFC 01/11] ARM: OMAP: mcbsp: Convert core driver to proper platform driver

[Tony Lindgren]

* Peter Ujfalusi <peter.ujfalusi@ti.com> [120215 07:06]:
> Convert the plat-omap/mcbsp.c driver to be proper platform driver.
> Remove the omap_mcbsp_init function call which was called from
> mach-omap1/2/mcbsp.c to register the platform driver for the just
> created platform device in the same function.
> 
> Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>

Acked-by: Tony Lindgren <tony@atomide.com>

[RFC 02/11] OMAP: mcbsp: Move core driver under sound/soc/omap

[Tony Lindgren]

* Peter Ujfalusi <peter.ujfalusi@ti.com> [120215 07:07]:
> 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>

Thanks for doing this! These may cause some minor merge
conflicts with the planned header clean-up, but those should
be trivial to deal with.

Acked-by: Tony Lindgren <tony@atomide.com>