mirror of
https://github.com/torvalds/linux.git
synced 2024-11-02 02:01:29 +00:00
e7916740bb
Commit 3cf32bba8c ("OMAP: McBSP: Convert
McBSP to platform device model") breaks compilation with non-multi-OMAP1
configs:
CC arch/arm/mach-omap1/mcbsp.o
arch/arm/mach-omap1/mcbsp.c: In function 'omap1_mcbsp_init':
arch/arm/mach-omap1/mcbsp.c:384: warning: dereferencing 'void *' pointer
arch/arm/mach-omap1/mcbsp.c:387: error: invalid use of void expression
arch/arm/mach-omap1/mcbsp.c:390: warning: dereferencing 'void *' pointer
arch/arm/mach-omap1/mcbsp.c:393: error: invalid use of void expression
Fix by avoiding NULL dereferences.
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Cc: Kishon Vijay Abraham I <kishon@ti.com>
Cc: Tony Lindgren <tony@atomide.com>
Acked-by: Jarkko Nikula <jhnikula@gmail.com>
[tony@atomide.com: updated description not to remove unnecessary branch name]
Signed-off-by: Tony Lindgren <tony@atomide.com>
411 lines
8.0 KiB
C
411 lines
8.0 KiB
C
/*
|
|
* linux/arch/arm/mach-omap1/mcbsp.c
|
|
*
|
|
* Copyright (C) 2008 Instituto Nokia de Tecnologia
|
|
* Contact: Eduardo Valentin <eduardo.valentin@indt.org.br>
|
|
*
|
|
* 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
|
|
* published by the Free Software Foundation.
|
|
*
|
|
* Multichannel mode not supported.
|
|
*/
|
|
#include <linux/ioport.h>
|
|
#include <linux/module.h>
|
|
#include <linux/init.h>
|
|
#include <linux/clk.h>
|
|
#include <linux/err.h>
|
|
#include <linux/io.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/slab.h>
|
|
|
|
#include <mach/irqs.h>
|
|
#include <plat/dma.h>
|
|
#include <plat/mux.h>
|
|
#include <plat/cpu.h>
|
|
#include <plat/mcbsp.h>
|
|
|
|
#define DPS_RSTCT2_PER_EN (1 << 0)
|
|
#define DSP_RSTCT2_WD_PER_EN (1 << 1)
|
|
|
|
static int dsp_use;
|
|
static struct clk *api_clk;
|
|
static struct clk *dsp_clk;
|
|
|
|
static void omap1_mcbsp_request(unsigned int id)
|
|
{
|
|
/*
|
|
* On 1510, 1610 and 1710, McBSP1 and McBSP3
|
|
* are DSP public peripherals.
|
|
*/
|
|
if (id == OMAP_MCBSP1 || id == OMAP_MCBSP3) {
|
|
if (dsp_use++ == 0) {
|
|
api_clk = clk_get(NULL, "api_ck");
|
|
dsp_clk = clk_get(NULL, "dsp_ck");
|
|
if (!IS_ERR(api_clk) && !IS_ERR(dsp_clk)) {
|
|
clk_enable(api_clk);
|
|
clk_enable(dsp_clk);
|
|
|
|
/*
|
|
* DSP external peripheral reset
|
|
* FIXME: This should be moved to dsp code
|
|
*/
|
|
__raw_writew(__raw_readw(DSP_RSTCT2) | DPS_RSTCT2_PER_EN |
|
|
DSP_RSTCT2_WD_PER_EN, DSP_RSTCT2);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
static void omap1_mcbsp_free(unsigned int id)
|
|
{
|
|
if (id == OMAP_MCBSP1 || id == OMAP_MCBSP3) {
|
|
if (--dsp_use == 0) {
|
|
if (!IS_ERR(api_clk)) {
|
|
clk_disable(api_clk);
|
|
clk_put(api_clk);
|
|
}
|
|
if (!IS_ERR(dsp_clk)) {
|
|
clk_disable(dsp_clk);
|
|
clk_put(dsp_clk);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
static struct omap_mcbsp_ops omap1_mcbsp_ops = {
|
|
.request = omap1_mcbsp_request,
|
|
.free = omap1_mcbsp_free,
|
|
};
|
|
|
|
#if defined(CONFIG_ARCH_OMAP730) || defined(CONFIG_ARCH_OMAP850)
|
|
struct resource omap7xx_mcbsp_res[][6] = {
|
|
{
|
|
{
|
|
.start = OMAP7XX_MCBSP1_BASE,
|
|
.end = OMAP7XX_MCBSP1_BASE + SZ_256,
|
|
.flags = IORESOURCE_MEM,
|
|
},
|
|
{
|
|
.name = "rx",
|
|
.start = INT_7XX_McBSP1RX,
|
|
.flags = IORESOURCE_IRQ,
|
|
},
|
|
{
|
|
.name = "tx",
|
|
.start = INT_7XX_McBSP1TX,
|
|
.flags = IORESOURCE_IRQ,
|
|
},
|
|
{
|
|
.name = "rx",
|
|
.start = OMAP_DMA_MCBSP1_RX,
|
|
.flags = IORESOURCE_DMA,
|
|
},
|
|
{
|
|
.name = "tx",
|
|
.start = OMAP_DMA_MCBSP1_TX,
|
|
.flags = IORESOURCE_DMA,
|
|
},
|
|
},
|
|
{
|
|
{
|
|
.start = OMAP7XX_MCBSP2_BASE,
|
|
.end = OMAP7XX_MCBSP2_BASE + SZ_256,
|
|
.flags = IORESOURCE_MEM,
|
|
},
|
|
{
|
|
.name = "rx",
|
|
.start = INT_7XX_McBSP2RX,
|
|
.flags = IORESOURCE_IRQ,
|
|
},
|
|
{
|
|
.name = "tx",
|
|
.start = INT_7XX_McBSP2TX,
|
|
.flags = IORESOURCE_IRQ,
|
|
},
|
|
{
|
|
.name = "rx",
|
|
.start = OMAP_DMA_MCBSP3_RX,
|
|
.flags = IORESOURCE_DMA,
|
|
},
|
|
{
|
|
.name = "tx",
|
|
.start = OMAP_DMA_MCBSP3_TX,
|
|
.flags = IORESOURCE_DMA,
|
|
},
|
|
},
|
|
};
|
|
|
|
#define omap7xx_mcbsp_res_0 omap7xx_mcbsp_res[0]
|
|
|
|
static struct omap_mcbsp_platform_data omap7xx_mcbsp_pdata[] = {
|
|
{
|
|
.ops = &omap1_mcbsp_ops,
|
|
},
|
|
{
|
|
.ops = &omap1_mcbsp_ops,
|
|
},
|
|
};
|
|
#define OMAP7XX_MCBSP_RES_SZ ARRAY_SIZE(omap7xx_mcbsp_res[1])
|
|
#define OMAP7XX_MCBSP_COUNT ARRAY_SIZE(omap7xx_mcbsp_res)
|
|
#else
|
|
#define omap7xx_mcbsp_res_0 NULL
|
|
#define omap7xx_mcbsp_pdata NULL
|
|
#define OMAP7XX_MCBSP_RES_SZ 0
|
|
#define OMAP7XX_MCBSP_COUNT 0
|
|
#endif
|
|
|
|
#ifdef CONFIG_ARCH_OMAP15XX
|
|
struct resource omap15xx_mcbsp_res[][6] = {
|
|
{
|
|
{
|
|
.start = OMAP1510_MCBSP1_BASE,
|
|
.end = OMAP1510_MCBSP1_BASE + SZ_256,
|
|
.flags = IORESOURCE_MEM,
|
|
},
|
|
{
|
|
.name = "rx",
|
|
.start = INT_McBSP1RX,
|
|
.flags = IORESOURCE_IRQ,
|
|
},
|
|
{
|
|
.name = "tx",
|
|
.start = INT_McBSP1TX,
|
|
.flags = IORESOURCE_IRQ,
|
|
},
|
|
{
|
|
.name = "rx",
|
|
.start = OMAP_DMA_MCBSP1_RX,
|
|
.flags = IORESOURCE_DMA,
|
|
},
|
|
{
|
|
.name = "tx",
|
|
.start = OMAP_DMA_MCBSP1_TX,
|
|
.flags = IORESOURCE_DMA,
|
|
},
|
|
},
|
|
{
|
|
{
|
|
.start = OMAP1510_MCBSP2_BASE,
|
|
.end = OMAP1510_MCBSP2_BASE + SZ_256,
|
|
.flags = IORESOURCE_MEM,
|
|
},
|
|
{
|
|
.name = "rx",
|
|
.start = INT_1510_SPI_RX,
|
|
.flags = IORESOURCE_IRQ,
|
|
},
|
|
{
|
|
.name = "tx",
|
|
.start = INT_1510_SPI_TX,
|
|
.flags = IORESOURCE_IRQ,
|
|
},
|
|
{
|
|
.name = "rx",
|
|
.start = OMAP_DMA_MCBSP2_RX,
|
|
.flags = IORESOURCE_DMA,
|
|
},
|
|
{
|
|
.name = "tx",
|
|
.start = OMAP_DMA_MCBSP2_TX,
|
|
.flags = IORESOURCE_DMA,
|
|
},
|
|
},
|
|
{
|
|
{
|
|
.start = OMAP1510_MCBSP3_BASE,
|
|
.end = OMAP1510_MCBSP3_BASE + SZ_256,
|
|
.flags = IORESOURCE_MEM,
|
|
},
|
|
{
|
|
.name = "rx",
|
|
.start = INT_McBSP3RX,
|
|
.flags = IORESOURCE_IRQ,
|
|
},
|
|
{
|
|
.name = "tx",
|
|
.start = INT_McBSP3TX,
|
|
.flags = IORESOURCE_IRQ,
|
|
},
|
|
{
|
|
.name = "rx",
|
|
.start = OMAP_DMA_MCBSP3_RX,
|
|
.flags = IORESOURCE_DMA,
|
|
},
|
|
{
|
|
.name = "tx",
|
|
.start = OMAP_DMA_MCBSP3_TX,
|
|
.flags = IORESOURCE_DMA,
|
|
},
|
|
},
|
|
};
|
|
|
|
#define omap15xx_mcbsp_res_0 omap15xx_mcbsp_res[0]
|
|
|
|
static struct omap_mcbsp_platform_data omap15xx_mcbsp_pdata[] = {
|
|
{
|
|
.ops = &omap1_mcbsp_ops,
|
|
},
|
|
{
|
|
.ops = &omap1_mcbsp_ops,
|
|
},
|
|
{
|
|
.ops = &omap1_mcbsp_ops,
|
|
},
|
|
};
|
|
#define OMAP15XX_MCBSP_RES_SZ ARRAY_SIZE(omap15xx_mcbsp_res[1])
|
|
#define OMAP15XX_MCBSP_COUNT ARRAY_SIZE(omap15xx_mcbsp_res)
|
|
#else
|
|
#define omap15xx_mcbsp_res_0 NULL
|
|
#define omap15xx_mcbsp_pdata NULL
|
|
#define OMAP15XX_MCBSP_RES_SZ 0
|
|
#define OMAP15XX_MCBSP_COUNT 0
|
|
#endif
|
|
|
|
#ifdef CONFIG_ARCH_OMAP16XX
|
|
struct resource omap16xx_mcbsp_res[][6] = {
|
|
{
|
|
{
|
|
.start = OMAP1610_MCBSP1_BASE,
|
|
.end = OMAP1610_MCBSP1_BASE + SZ_256,
|
|
.flags = IORESOURCE_MEM,
|
|
},
|
|
{
|
|
.name = "rx",
|
|
.start = INT_McBSP1RX,
|
|
.flags = IORESOURCE_IRQ,
|
|
},
|
|
{
|
|
.name = "tx",
|
|
.start = INT_McBSP1TX,
|
|
.flags = IORESOURCE_IRQ,
|
|
},
|
|
{
|
|
.name = "rx",
|
|
.start = OMAP_DMA_MCBSP1_RX,
|
|
.flags = IORESOURCE_DMA,
|
|
},
|
|
{
|
|
.name = "tx",
|
|
.start = OMAP_DMA_MCBSP1_TX,
|
|
.flags = IORESOURCE_DMA,
|
|
},
|
|
},
|
|
{
|
|
{
|
|
.start = OMAP1610_MCBSP2_BASE,
|
|
.end = OMAP1610_MCBSP2_BASE + SZ_256,
|
|
.flags = IORESOURCE_MEM,
|
|
},
|
|
{
|
|
.name = "rx",
|
|
.start = INT_1610_McBSP2_RX,
|
|
.flags = IORESOURCE_IRQ,
|
|
},
|
|
{
|
|
.name = "tx",
|
|
.start = INT_1610_McBSP2_TX,
|
|
.flags = IORESOURCE_IRQ,
|
|
},
|
|
{
|
|
.name = "rx",
|
|
.start = OMAP_DMA_MCBSP2_RX,
|
|
.flags = IORESOURCE_DMA,
|
|
},
|
|
{
|
|
.name = "tx",
|
|
.start = OMAP_DMA_MCBSP2_TX,
|
|
.flags = IORESOURCE_DMA,
|
|
},
|
|
},
|
|
{
|
|
{
|
|
.start = OMAP1610_MCBSP3_BASE,
|
|
.end = OMAP1610_MCBSP3_BASE + SZ_256,
|
|
.flags = IORESOURCE_MEM,
|
|
},
|
|
{
|
|
.name = "rx",
|
|
.start = INT_McBSP3RX,
|
|
.flags = IORESOURCE_IRQ,
|
|
},
|
|
{
|
|
.name = "tx",
|
|
.start = INT_McBSP3TX,
|
|
.flags = IORESOURCE_IRQ,
|
|
},
|
|
{
|
|
.name = "rx",
|
|
.start = OMAP_DMA_MCBSP3_RX,
|
|
.flags = IORESOURCE_DMA,
|
|
},
|
|
{
|
|
.name = "tx",
|
|
.start = OMAP_DMA_MCBSP3_TX,
|
|
.flags = IORESOURCE_DMA,
|
|
},
|
|
},
|
|
};
|
|
|
|
#define omap16xx_mcbsp_res_0 omap16xx_mcbsp_res[0]
|
|
|
|
static struct omap_mcbsp_platform_data omap16xx_mcbsp_pdata[] = {
|
|
{
|
|
.ops = &omap1_mcbsp_ops,
|
|
},
|
|
{
|
|
.ops = &omap1_mcbsp_ops,
|
|
},
|
|
{
|
|
.ops = &omap1_mcbsp_ops,
|
|
},
|
|
};
|
|
#define OMAP16XX_MCBSP_RES_SZ ARRAY_SIZE(omap16xx_mcbsp_res[1])
|
|
#define OMAP16XX_MCBSP_COUNT ARRAY_SIZE(omap16xx_mcbsp_res)
|
|
#else
|
|
#define omap16xx_mcbsp_res_0 NULL
|
|
#define omap16xx_mcbsp_pdata NULL
|
|
#define OMAP16XX_MCBSP_RES_SZ 0
|
|
#define OMAP16XX_MCBSP_COUNT 0
|
|
#endif
|
|
|
|
static int __init omap1_mcbsp_init(void)
|
|
{
|
|
if (!cpu_class_is_omap1())
|
|
return -ENODEV;
|
|
|
|
if (cpu_is_omap7xx())
|
|
omap_mcbsp_count = OMAP7XX_MCBSP_COUNT;
|
|
else if (cpu_is_omap15xx())
|
|
omap_mcbsp_count = OMAP15XX_MCBSP_COUNT;
|
|
else if (cpu_is_omap16xx())
|
|
omap_mcbsp_count = OMAP16XX_MCBSP_COUNT;
|
|
|
|
mcbsp_ptr = kzalloc(omap_mcbsp_count * sizeof(struct omap_mcbsp *),
|
|
GFP_KERNEL);
|
|
if (!mcbsp_ptr)
|
|
return -ENOMEM;
|
|
|
|
if (cpu_is_omap7xx())
|
|
omap_mcbsp_register_board_cfg(omap7xx_mcbsp_res_0,
|
|
OMAP7XX_MCBSP_RES_SZ,
|
|
omap7xx_mcbsp_pdata,
|
|
OMAP7XX_MCBSP_COUNT);
|
|
|
|
if (cpu_is_omap15xx())
|
|
omap_mcbsp_register_board_cfg(omap15xx_mcbsp_res_0,
|
|
OMAP15XX_MCBSP_RES_SZ,
|
|
omap15xx_mcbsp_pdata,
|
|
OMAP15XX_MCBSP_COUNT);
|
|
|
|
if (cpu_is_omap16xx())
|
|
omap_mcbsp_register_board_cfg(omap16xx_mcbsp_res_0,
|
|
OMAP16XX_MCBSP_RES_SZ,
|
|
omap16xx_mcbsp_pdata,
|
|
OMAP16XX_MCBSP_COUNT);
|
|
|
|
return omap_mcbsp_init();
|
|
}
|
|
|
|
arch_initcall(omap1_mcbsp_init);
|