mirror of
https://github.com/torvalds/linux.git
synced 2024-12-22 10:56:40 +00:00
b8edf848e9
Here are more patches in the progression towards multiplatform, sparse irq conversions in particular. Tegra has a handful of cleanups and general groundwork, but is not quite there yet on full enablement. Platforms that are enabled through this branch are VT8500 and Zynq. note that i.MX was converted in one of the earlier cleanup branches as well (before we started a separate topic for multiplatform). And both new platforms for this merge window, sunxi and bcm, were merged with multiplatform support enabled. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABAgAGBQJQySb/AAoJEIwa5zzehBx3Wo4P/0GrpUhB/qwuhgy43MA2I1Dv tnyuFvsfW9uRExcw2IwT39GFls98QUM9TwQxPqOTHVf+u0LkYMZ9aDeWJOdj3RvG H70Ypj4gZDrzZAFr2TUf8NnYGHd6G2EcMn3261Hjfd7YrswCjsMPvgRns7VOyHCa deif3KcLu3+HzxvuzqlVlTuSAagCQbfqqnTQduMRdJPHT3X3sXwl7ABW+qfOoeYC rjqIbjdh5dB1d/f7igtgBbXjSTnVz/Mr1+wk4rp9Xr1Wv0IXvIaSKjK2Df8ZuNAk aQ6mMy/oDVxlDSrYv0F7lB40/rsZcPqz8+fgYJ2FnvCpIM7z7NeTWD2kQJ2UaQ/s VunShloRxF8It6104EVWZDfEA9NvVBcCALSze0NukqiHZRZYGUzxRNQDrncaksC9 Lm+Z16cUWogsZq7VDCgXYQJeakPQfBDnsx7siMvAbOgvtpSClxuwhdC/czJiix7h BcpA+l5xSviUhHvzHhDt9iJxHjbUmo1xLDvaZSgj2OjAj257JcwaNBCk5BjZTCwe xZmQu1FjwaGtjLiG6QY0WJRsq1hiFRIb/MaWar/WpfqADFqARoambGFUjOl+P4Mu DIM5Z0AS04H+pLuP1QOz/yXxOPEP6Ri36to6XrgzfL/XGet5LW2P59xXxhcWC/OL /3IAcQrsAqh4aGMOstW1 =UJlh -----END PGP SIGNATURE----- Merge tag 'multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Pull ARM SoC multiplatform conversion patches from Olof Johansson: "Here are more patches in the progression towards multiplatform, sparse irq conversions in particular. Tegra has a handful of cleanups and general groundwork, but is not quite there yet on full enablement. Platforms that are enabled through this branch are VT8500 and Zynq. Note that i.MX was converted in one of the earlier cleanup branches as well (before we started a separate topic for multiplatform). And both new platforms for this merge window, sunxi and bcm, were merged with multiplatform support enabled." Fix up conflicts mostly as per Olof. * tag 'multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (29 commits) ARM: zynq: Remove all unused mach headers ARM: zynq: add support for ARCH_MULTIPLATFORM ARM: zynq: make use of debug_ll_io_init() ARM: zynq: remove TTC early mapping ARM: tegra: move debug-macro.S to include/debug ARM: tegra: don't include iomap.h from debug-macro.S ARM: tegra: decouple uncompress.h and debug-macro.S ARM: tegra: simplify DEBUG_LL UART selection options ARM: tegra: select SPARSE_IRQ ARM: tegra: enhance timer.c to get IO address from device tree ARM: tegra: enhance timer.c to get IRQ info from device tree ARM: timer: fix checkpatch warnings ARM: tegra: add TWD to device tree ARM: tegra: define DT bindings for and instantiate RTC ARM: tegra: define DT bindings for and instantiate timer clocksource/mtu-nomadik: use apb_pclk clk: ux500: Register mtu apb_pclocks ARM: plat-nomadik: convert platforms to SPARSE_IRQ mfd/db8500-prcmu: use the irq_domain_add_simple() mfd/ab8500-core: use irq_domain_add_simple() ...
178 lines
4.4 KiB
C
178 lines
4.4 KiB
C
/*
|
|
* Copyright (C) ST-Ericsson SA 2010
|
|
*
|
|
* License terms: GNU General Public License (GPL), version 2
|
|
*/
|
|
|
|
#include <linux/platform_device.h>
|
|
#include <linux/init.h>
|
|
#include <linux/gpio.h>
|
|
#include <linux/platform_data/pinctrl-nomadik.h>
|
|
#include <linux/platform_data/dma-ste-dma40.h>
|
|
|
|
#include <mach/devices.h>
|
|
#include <mach/hardware.h>
|
|
#include <mach/irqs.h>
|
|
#include <mach/msp.h>
|
|
|
|
#include "ste-dma40-db8500.h"
|
|
#include "board-mop500.h"
|
|
#include "devices-db8500.h"
|
|
#include "pins-db8500.h"
|
|
|
|
static struct stedma40_chan_cfg msp0_dma_rx = {
|
|
.high_priority = true,
|
|
.dir = STEDMA40_PERIPH_TO_MEM,
|
|
|
|
.src_dev_type = DB8500_DMA_DEV31_MSP0_RX_SLIM0_CH0_RX,
|
|
.dst_dev_type = STEDMA40_DEV_DST_MEMORY,
|
|
|
|
.src_info.psize = STEDMA40_PSIZE_LOG_4,
|
|
.dst_info.psize = STEDMA40_PSIZE_LOG_4,
|
|
|
|
/* data_width is set during configuration */
|
|
};
|
|
|
|
static struct stedma40_chan_cfg msp0_dma_tx = {
|
|
.high_priority = true,
|
|
.dir = STEDMA40_MEM_TO_PERIPH,
|
|
|
|
.src_dev_type = STEDMA40_DEV_DST_MEMORY,
|
|
.dst_dev_type = DB8500_DMA_DEV31_MSP0_TX_SLIM0_CH0_TX,
|
|
|
|
.src_info.psize = STEDMA40_PSIZE_LOG_4,
|
|
.dst_info.psize = STEDMA40_PSIZE_LOG_4,
|
|
|
|
/* data_width is set during configuration */
|
|
};
|
|
|
|
struct msp_i2s_platform_data msp0_platform_data = {
|
|
.id = MSP_I2S_0,
|
|
.msp_i2s_dma_rx = &msp0_dma_rx,
|
|
.msp_i2s_dma_tx = &msp0_dma_tx,
|
|
};
|
|
|
|
static struct stedma40_chan_cfg msp1_dma_rx = {
|
|
.high_priority = true,
|
|
.dir = STEDMA40_PERIPH_TO_MEM,
|
|
|
|
.src_dev_type = DB8500_DMA_DEV30_MSP3_RX,
|
|
.dst_dev_type = STEDMA40_DEV_DST_MEMORY,
|
|
|
|
.src_info.psize = STEDMA40_PSIZE_LOG_4,
|
|
.dst_info.psize = STEDMA40_PSIZE_LOG_4,
|
|
|
|
/* data_width is set during configuration */
|
|
};
|
|
|
|
static struct stedma40_chan_cfg msp1_dma_tx = {
|
|
.high_priority = true,
|
|
.dir = STEDMA40_MEM_TO_PERIPH,
|
|
|
|
.src_dev_type = STEDMA40_DEV_DST_MEMORY,
|
|
.dst_dev_type = DB8500_DMA_DEV30_MSP1_TX,
|
|
|
|
.src_info.psize = STEDMA40_PSIZE_LOG_4,
|
|
.dst_info.psize = STEDMA40_PSIZE_LOG_4,
|
|
|
|
/* data_width is set during configuration */
|
|
};
|
|
|
|
struct msp_i2s_platform_data msp1_platform_data = {
|
|
.id = MSP_I2S_1,
|
|
.msp_i2s_dma_rx = NULL,
|
|
.msp_i2s_dma_tx = &msp1_dma_tx,
|
|
};
|
|
|
|
static struct stedma40_chan_cfg msp2_dma_rx = {
|
|
.high_priority = true,
|
|
.dir = STEDMA40_PERIPH_TO_MEM,
|
|
|
|
.src_dev_type = DB8500_DMA_DEV14_MSP2_RX,
|
|
.dst_dev_type = STEDMA40_DEV_DST_MEMORY,
|
|
|
|
/* MSP2 DMA doesn't work with PSIZE == 4 on DB8500v2 */
|
|
.src_info.psize = STEDMA40_PSIZE_LOG_1,
|
|
.dst_info.psize = STEDMA40_PSIZE_LOG_1,
|
|
|
|
/* data_width is set during configuration */
|
|
};
|
|
|
|
static struct stedma40_chan_cfg msp2_dma_tx = {
|
|
.high_priority = true,
|
|
.dir = STEDMA40_MEM_TO_PERIPH,
|
|
|
|
.src_dev_type = STEDMA40_DEV_DST_MEMORY,
|
|
.dst_dev_type = DB8500_DMA_DEV14_MSP2_TX,
|
|
|
|
.src_info.psize = STEDMA40_PSIZE_LOG_4,
|
|
.dst_info.psize = STEDMA40_PSIZE_LOG_4,
|
|
|
|
.use_fixed_channel = true,
|
|
.phy_channel = 1,
|
|
|
|
/* data_width is set during configuration */
|
|
};
|
|
|
|
static struct platform_device *db8500_add_msp_i2s(struct device *parent,
|
|
int id,
|
|
resource_size_t base, int irq,
|
|
struct msp_i2s_platform_data *pdata)
|
|
{
|
|
struct platform_device *pdev;
|
|
struct resource res[] = {
|
|
DEFINE_RES_MEM(base, SZ_4K),
|
|
DEFINE_RES_IRQ(irq),
|
|
};
|
|
|
|
pr_info("Register platform-device 'ux500-msp-i2s', id %d, irq %d\n",
|
|
id, irq);
|
|
pdev = platform_device_register_resndata(parent, "ux500-msp-i2s", id,
|
|
res, ARRAY_SIZE(res),
|
|
pdata, sizeof(*pdata));
|
|
if (!pdev) {
|
|
pr_err("Failed to register platform-device 'ux500-msp-i2s.%d'!\n",
|
|
id);
|
|
return NULL;
|
|
}
|
|
|
|
return pdev;
|
|
}
|
|
|
|
/* Platform device for ASoC MOP500 machine */
|
|
static struct platform_device snd_soc_mop500 = {
|
|
.name = "snd-soc-mop500",
|
|
.id = 0,
|
|
.dev = {
|
|
.platform_data = NULL,
|
|
},
|
|
};
|
|
|
|
struct msp_i2s_platform_data msp2_platform_data = {
|
|
.id = MSP_I2S_2,
|
|
.msp_i2s_dma_rx = &msp2_dma_rx,
|
|
.msp_i2s_dma_tx = &msp2_dma_tx,
|
|
};
|
|
|
|
struct msp_i2s_platform_data msp3_platform_data = {
|
|
.id = MSP_I2S_3,
|
|
.msp_i2s_dma_rx = &msp1_dma_rx,
|
|
.msp_i2s_dma_tx = NULL,
|
|
};
|
|
|
|
void mop500_audio_init(struct device *parent)
|
|
{
|
|
pr_info("%s: Register platform-device 'snd-soc-mop500'.\n", __func__);
|
|
platform_device_register(&snd_soc_mop500);
|
|
|
|
pr_info("Initialize MSP I2S-devices.\n");
|
|
db8500_add_msp_i2s(parent, 0, U8500_MSP0_BASE, IRQ_DB8500_MSP0,
|
|
&msp0_platform_data);
|
|
db8500_add_msp_i2s(parent, 1, U8500_MSP1_BASE, IRQ_DB8500_MSP1,
|
|
&msp1_platform_data);
|
|
db8500_add_msp_i2s(parent, 2, U8500_MSP2_BASE, IRQ_DB8500_MSP2,
|
|
&msp2_platform_data);
|
|
db8500_add_msp_i2s(parent, 3, U8500_MSP3_BASE, IRQ_DB8500_MSP1,
|
|
&msp3_platform_data);
|
|
}
|