Re: [PATCH 2/2] ASoC: fix pxa-ssp compiling issue under mach-mmp

Re: [PATCH 2/2] ASoC: fix pxa-ssp compiling issue under mach-mmp

[Haojian Zhuang]

On Tue, May 22, 2012 at 2:58 PM, Qiao Zhou <zhouqiao@marvell.com> wrote:
> pxa-ssp.c uses API like cpu_is_pxa3xx(), cpu_is_pxa2xx(), which is
> defined under arch-pxa architecture, so to compile it under mach-mmp
> just add CONFIG_ARCH_PXA macro to separate it.
>
> Signed-off-by: Qiao Zhou <zhouqiao@marvell.com>
> ---
>  sound/soc/pxa/pxa-ssp.c |   25 ++++++++++++++++++-------
>  1 files changed, 18 insertions(+), 7 deletions(-)
>
Acked-by: Haojian Zhuang <haojian.zhuang@gmail.com>

Mark,
Do you mind that both of these two patches could apply into asoc git tree?

Regards
Haojian

Re: [PATCH 2/2] ASoC: fix pxa-ssp compiling issue under mach-mmp

[Mark Brown]

[-- Attachment #1.1: Type: text/plain, Size: 645 bytes --]

On Tue, May 22, 2012 at 02:58:26PM +0800, Qiao Zhou wrote:

> +#if defined(CONFIG_ARCH_PXA)
>  	if (cpu_is_pxa25x() && ssp->type == PXA25x_SSP) {
>  		sscr0 &= ~0x0000ff00;
>  		sscr0 |= ((div - 2)/2) << 8; /* 2..512 */
>  	} else {
> +#endif
>  		sscr0 &= ~0x000fff00;
>  		sscr0 |= (div - 1) << 8;     /* 1..4096 */
> +#if defined(CONFIG_ARCH_PXA)
>  	}
> +#endif

This is pretty large and fiddly, especially code like the above.  Would
it not be simpler to just define always false versions of these when on
MMP, either in this driver or in the arch headers (where it'd help other
drivers too)?  Right now it doesn't make the code look nice.

[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

[-- Attachment #2: Type: text/plain, Size: 0 bytes --]

Re: [PATCH 2/2] ASoC: fix pxa-ssp compiling issue under mach-mmp

[Mark Brown]

[-- Attachment #1.1: Type: text/plain, Size: 526 bytes --]

On Thu, May 31, 2012 at 01:48:33PM +0800, Qiao Zhou wrote:
> pxa-ssp.c uses API like cpu_is_pxa3xx(), cpu_is_pxa2xx(), which is
> defined under arch-pxa architecture, and drivers under mach-mmp
> can't find it. so just use ssp->type to replace that API.

Still not applying against

   git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git for-3.5

for some reason - what did you generate the patch against?

> Change-Id: I0a0671802189f61ff90d984ca577a41627f869fa

Shouldn't have this in mainline submissions...

[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

[-- Attachment #2: Type: text/plain, Size: 0 bytes --]