Merge tag 'drivers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC driver specific changes from Arnd Bergmann: "These changes are all driver specific and cross over between arm-soc contents and some other subsystem, in these cases cpufreq, crypto, dma, pinctrl, mailbox and usb, and the subsystem owners agreed to have these changes merged through arm-soc. As we proceed to untangle the dependencies between platform code and driver code, the amount of changes in this category is fortunately shrinking, for 3.11 we have 16 branches here and 101 non-merge changesets, the majority of which are for the stedma40 dma engine driver used in the ux500 platform. Cleaning up that code touches multiple subsystems, but gets rid of the dependency in the end. The mailbox code moved out from mach-omap2 to drivers/mailbox is an intermediate step and is still omap specific at the moment. Patches exist to generalize the subsystem and add other drivers with the same API, but those did not make it for 3.11." * tag 'drivers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (101 commits) crypto: ux500: use dmaengine_submit API crypto: ux500: use dmaengine_prep_slave_sg API crypto: ux500: use dmaengine_device_control API crypto: ux500/crypt: add missing __iomem qualifiers crypto: ux500/hash: add missing static qualifiers crypto: ux500/hash: use readl on iomem addresses dmaengine: ste_dma40: Declare memcpy config as static ARM: ux500: Remove mop500_snowball_ethernet_clock_enable() ARM: ux500: Correct the EN_3v3 regulator's on/off GPIO ARM: ux500: Provide a AB8500 GPIO Device Tree node gpio: rcar: fix gpio_rcar_of_table gpio-rcar: Remove #ifdef CONFIG_OF around OF-specific sections gpio-rcar: Reference core gpio documentation in the DT bindings clk: exynos5250: Add enum entries for divider clock of i2s1 and i2s2 ARM: dts: Update Samsung I2S documentation ARM: dts: add clock provider information for i2s controllers in Exynos5250 ARM: dts: add Exynos audio subsystem clock controller node clk: samsung: register audio subsystem clocks using common clock framework ARM: dts: use #include for all device trees for Samsung pinctrl: s3c24xx: use correct header for chained_irq functions ...
This commit is contained in:
Linus Torvalds
@@ -19,10 +19,6 @@ obj-$(CONFIG_ARCH_OMAP16XX) += ocpi.o
|
||||
# Power Management
|
||||
obj-$(CONFIG_PM) += pm.o sleep.o
|
||||
|
||||
# DSP
|
||||
obj-$(CONFIG_OMAP_MBOX_FWK) += mailbox_mach.o
|
||||
mailbox_mach-objs := mailbox.o
|
||||
|
||||
i2c-omap-$(CONFIG_I2C_OMAP) := i2c.o
|
||||
obj-y += $(i2c-omap-m) $(i2c-omap-y)
|
||||
|
||||
|
||||
@@ -1,199 +0,0 @@
|
||||
/*
|
||||
* Mailbox reservation modules for OMAP1
|
||||
*
|
||||
* Copyright (C) 2006-2009 Nokia Corporation
|
||||
* Written by: Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
|
||||
*
|
||||
* This file is subject to the terms and conditions of the GNU General Public
|
||||
* License. See the file "COPYING" in the main directory of this archive
|
||||
* for more details.
|
||||
*/
|
||||
|
||||
#include <linux/module.h>
|
||||
#include <linux/interrupt.h>
|
||||
#include <linux/platform_device.h>
|
||||
#include <linux/io.h>
|
||||
#include <plat/mailbox.h>
|
||||
|
||||
#define MAILBOX_ARM2DSP1 0x00
|
||||
#define MAILBOX_ARM2DSP1b 0x04
|
||||
#define MAILBOX_DSP2ARM1 0x08
|
||||
#define MAILBOX_DSP2ARM1b 0x0c
|
||||
#define MAILBOX_DSP2ARM2 0x10
|
||||
#define MAILBOX_DSP2ARM2b 0x14
|
||||
#define MAILBOX_ARM2DSP1_Flag 0x18
|
||||
#define MAILBOX_DSP2ARM1_Flag 0x1c
|
||||
#define MAILBOX_DSP2ARM2_Flag 0x20
|
||||
|
||||
static void __iomem *mbox_base;
|
||||
|
||||
struct omap_mbox1_fifo {
|
||||
unsigned long cmd;
|
||||
unsigned long data;
|
||||
unsigned long flag;
|
||||
};
|
||||
|
||||
struct omap_mbox1_priv {
|
||||
struct omap_mbox1_fifo tx_fifo;
|
||||
struct omap_mbox1_fifo rx_fifo;
|
||||
};
|
||||
|
||||
static inline int mbox_read_reg(size_t ofs)
|
||||
{
|
||||
return __raw_readw(mbox_base + ofs);
|
||||
}
|
||||
|
||||
static inline void mbox_write_reg(u32 val, size_t ofs)
|
||||
{
|
||||
__raw_writew(val, mbox_base + ofs);
|
||||
}
|
||||
|
||||
/* msg */
|
||||
static mbox_msg_t omap1_mbox_fifo_read(struct omap_mbox *mbox)
|
||||
{
|
||||
struct omap_mbox1_fifo *fifo =
|
||||
&((struct omap_mbox1_priv *)mbox->priv)->rx_fifo;
|
||||
mbox_msg_t msg;
|
||||
|
||||
msg = mbox_read_reg(fifo->data);
|
||||
msg |= ((mbox_msg_t) mbox_read_reg(fifo->cmd)) << 16;
|
||||
|
||||
return msg;
|
||||
}
|
||||
|
||||
static void
|
||||
omap1_mbox_fifo_write(struct omap_mbox *mbox, mbox_msg_t msg)
|
||||
{
|
||||
struct omap_mbox1_fifo *fifo =
|
||||
&((struct omap_mbox1_priv *)mbox->priv)->tx_fifo;
|
||||
|
||||
mbox_write_reg(msg & 0xffff, fifo->data);
|
||||
mbox_write_reg(msg >> 16, fifo->cmd);
|
||||
}
|
||||
|
||||
static int omap1_mbox_fifo_empty(struct omap_mbox *mbox)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int omap1_mbox_fifo_full(struct omap_mbox *mbox)
|
||||
{
|
||||
struct omap_mbox1_fifo *fifo =
|
||||
&((struct omap_mbox1_priv *)mbox->priv)->rx_fifo;
|
||||
|
||||
return mbox_read_reg(fifo->flag);
|
||||
}
|
||||
|
||||
/* irq */
|
||||
static void
|
||||
omap1_mbox_enable_irq(struct omap_mbox *mbox, omap_mbox_type_t irq)
|
||||
{
|
||||
if (irq == IRQ_RX)
|
||||
enable_irq(mbox->irq);
|
||||
}
|
||||
|
||||
static void
|
||||
omap1_mbox_disable_irq(struct omap_mbox *mbox, omap_mbox_type_t irq)
|
||||
{
|
||||
if (irq == IRQ_RX)
|
||||
disable_irq(mbox->irq);
|
||||
}
|
||||
|
||||
static int
|
||||
omap1_mbox_is_irq(struct omap_mbox *mbox, omap_mbox_type_t irq)
|
||||
{
|
||||
if (irq == IRQ_TX)
|
||||
return 0;
|
||||
return 1;
|
||||
}
|
||||
|
||||
static struct omap_mbox_ops omap1_mbox_ops = {
|
||||
.type = OMAP_MBOX_TYPE1,
|
||||
.fifo_read = omap1_mbox_fifo_read,
|
||||
.fifo_write = omap1_mbox_fifo_write,
|
||||
.fifo_empty = omap1_mbox_fifo_empty,
|
||||
.fifo_full = omap1_mbox_fifo_full,
|
||||
.enable_irq = omap1_mbox_enable_irq,
|
||||
.disable_irq = omap1_mbox_disable_irq,
|
||||
.is_irq = omap1_mbox_is_irq,
|
||||
};
|
||||
|
||||
/* FIXME: the following struct should be created automatically by the user id */
|
||||
|
||||
/* DSP */
|
||||
static struct omap_mbox1_priv omap1_mbox_dsp_priv = {
|
||||
.tx_fifo = {
|
||||
.cmd = MAILBOX_ARM2DSP1b,
|
||||
.data = MAILBOX_ARM2DSP1,
|
||||
.flag = MAILBOX_ARM2DSP1_Flag,
|
||||
},
|
||||
.rx_fifo = {
|
||||
.cmd = MAILBOX_DSP2ARM1b,
|
||||
.data = MAILBOX_DSP2ARM1,
|
||||
.flag = MAILBOX_DSP2ARM1_Flag,
|
||||
},
|
||||
};
|
||||
|
||||
static struct omap_mbox mbox_dsp_info = {
|
||||
.name = "dsp",
|
||||
.ops = &omap1_mbox_ops,
|
||||
.priv = &omap1_mbox_dsp_priv,
|
||||
};
|
||||
|
||||
static struct omap_mbox *omap1_mboxes[] = { &mbox_dsp_info, NULL };
|
||||
|
||||
static int omap1_mbox_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct resource *mem;
|
||||
int ret;
|
||||
struct omap_mbox **list;
|
||||
|
||||
list = omap1_mboxes;
|
||||
list[0]->irq = platform_get_irq_byname(pdev, "dsp");
|
||||
|
||||
mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
||||
mbox_base = ioremap(mem->start, resource_size(mem));
|
||||
if (!mbox_base)
|
||||
return -ENOMEM;
|
||||
|
||||
ret = omap_mbox_register(&pdev->dev, list);
|
||||
if (ret) {
|
||||
iounmap(mbox_base);
|
||||
return ret;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int omap1_mbox_remove(struct platform_device *pdev)
|
||||
{
|
||||
omap_mbox_unregister();
|
||||
iounmap(mbox_base);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static struct platform_driver omap1_mbox_driver = {
|
||||
.probe = omap1_mbox_probe,
|
||||
.remove = omap1_mbox_remove,
|
||||
.driver = {
|
||||
.name = "omap-mailbox",
|
||||
},
|
||||
};
|
||||
|
||||
static int __init omap1_mbox_init(void)
|
||||
{
|
||||
return platform_driver_register(&omap1_mbox_driver);
|
||||
}
|
||||
|
||||
static void __exit omap1_mbox_exit(void)
|
||||
{
|
||||
platform_driver_unregister(&omap1_mbox_driver);
|
||||
}
|
||||
|
||||
module_init(omap1_mbox_init);
|
||||
module_exit(omap1_mbox_exit);
|
||||
|
||||
MODULE_LICENSE("GPL v2");
|
||||
MODULE_DESCRIPTION("omap mailbox: omap1 architecture specific functions");
|
||||
MODULE_AUTHOR("Hiroshi DOYU <Hiroshi.DOYU@nokia.com>");
|
||||
MODULE_ALIAS("platform:omap1-mailbox");
|
||||
مرجع در شماره جدید
Block a user