On Wed, Oct 27, 2010 at 8:06 AM, Varadarajan, Charulatha <charu@xxxxxx> wrote:
>> Fix the mailbox detection for OMAP3630 and 2430, also minor
>> cleanup on conditional ifdef's that could affect it.
>>
>> Given that 2430 has an iva too include it, as the same steps
>> for omap3 apply.
>>
>> Signed-off-by: Omar Ramirez Luna <omar.ramirez@xxxxxx>
>> ---
>> Âarch/arm/mach-omap2/mailbox.c | Â 16 ++++++++++------
>> Â1 files changed, 10 insertions(+), 6 deletions(-)
>>
>> diff --git a/arch/arm/mach-omap2/mailbox.c
>> b/arch/arm/mach-omap2/mailbox.c
>> index 61f2149..b8fd120 100644
>> --- a/arch/arm/mach-omap2/mailbox.c
>> +++ b/arch/arm/mach-omap2/mailbox.c
>> @@ -277,7 +277,7 @@ static struct omap_mbox_ops omap2_mbox_ops = {
>>
>> Â/* FIXME: the following structs should be filled
>> automatically by the user id */
>>
>> -#if defined(CONFIG_ARCH_OMAP3430) || defined(CONFIG_ARCH_OMAP2420)
>> +#if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_ARCH_OMAP2)
>> Â/* DSP */
>> Âstatic struct omap_mbox2_priv omap2_mbox_dsp_priv = {
>> Â Â Â .tx_fifo = {
>> @@ -302,7 +302,7 @@ struct omap_mbox mbox_dsp_info = {
>> Â};
>> Â#endif
>>
>> -#if defined(CONFIG_ARCH_OMAP3430)
>> +#if defined(CONFIG_ARCH_OMAP3)
>> Âstruct omap_mbox *omap3_mboxes[] = { &mbox_dsp_info, NULL };
>> Â#endif
>>
>> @@ -390,15 +390,19 @@ static int __devinit
>> omap2_mbox_probe(struct platform_device *pdev)
>>
>> Â Â Â if (false)
>> Â Â Â Â Â Â Â ;
>> -#if defined(CONFIG_ARCH_OMAP3430)
>> - Â Â else if (cpu_is_omap3430()) {
>> +#if defined(CONFIG_ARCH_OMAP3)
>> + Â Â else if (cpu_is_omap34xx()) {
>
> Use cpu_is_* check only. No need to have #if CONFIG_ARCH_* checks.
Some people conditionally compile only for one architecture, like in
consumer devices. There's no point in wasting space for that.
--
Felipe Contreras
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
