Commit 5dd7bf59 authored by Jochen Friedrich's avatar Jochen Friedrich Committed by Samuel Ortiz

ARM: sa11x0: Implement autoloading of codec and codec pdata for mcp bus.

Signed-off-by: default avatarJochen Friedrich <jochen@scram.de>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent c9531227
...@@ -202,6 +202,7 @@ static struct irda_platform_data assabet_irda_data = { ...@@ -202,6 +202,7 @@ static struct irda_platform_data assabet_irda_data = {
static struct mcp_plat_data assabet_mcp_data = { static struct mcp_plat_data assabet_mcp_data = {
.mccr0 = MCCR0_ADM, .mccr0 = MCCR0_ADM,
.sclk_rate = 11981000, .sclk_rate = 11981000,
.codec = "ucb1x00",
}; };
static void __init assabet_init(void) static void __init assabet_init(void)
......
...@@ -124,6 +124,7 @@ static void __init cerf_map_io(void) ...@@ -124,6 +124,7 @@ static void __init cerf_map_io(void)
static struct mcp_plat_data cerf_mcp_data = { static struct mcp_plat_data cerf_mcp_data = {
.mccr0 = MCCR0_ADM, .mccr0 = MCCR0_ADM,
.sclk_rate = 11981000, .sclk_rate = 11981000,
.codec = "ucb1x00",
}; };
static void __init cerf_init(void) static void __init cerf_init(void)
......
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include <linux/timer.h> #include <linux/timer.h>
#include <linux/gpio.h> #include <linux/gpio.h>
#include <linux/pda_power.h> #include <linux/pda_power.h>
#include <linux/mfd/ucb1x00.h>
#include <mach/hardware.h> #include <mach/hardware.h>
#include <asm/mach-types.h> #include <asm/mach-types.h>
...@@ -85,10 +86,15 @@ static struct scoop_pcmcia_config collie_pcmcia_config = { ...@@ -85,10 +86,15 @@ static struct scoop_pcmcia_config collie_pcmcia_config = {
.num_devs = 1, .num_devs = 1,
}; };
static struct ucb1x00_plat_data collie_ucb1x00_data = {
.gpio_base = COLLIE_TC35143_GPIO_BASE,
};
static struct mcp_plat_data collie_mcp_data = { static struct mcp_plat_data collie_mcp_data = {
.mccr0 = MCCR0_ADM | MCCR0_ExtClk, .mccr0 = MCCR0_ADM | MCCR0_ExtClk,
.sclk_rate = 9216000, .sclk_rate = 9216000,
.gpio_base = COLLIE_TC35143_GPIO_BASE, .codec = "ucb1x00",
.codec_pdata = &collie_ucb1x00_data,
}; };
/* /*
......
...@@ -17,6 +17,8 @@ struct mcp_plat_data { ...@@ -17,6 +17,8 @@ struct mcp_plat_data {
u32 mccr1; u32 mccr1;
unsigned int sclk_rate; unsigned int sclk_rate;
int gpio_base; int gpio_base;
const char *codec;
void *codec_pdata;
}; };
#endif #endif
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
static struct mcp_plat_data lart_mcp_data = { static struct mcp_plat_data lart_mcp_data = {
.mccr0 = MCCR0_ADM, .mccr0 = MCCR0_ADM,
.sclk_rate = 11981000, .sclk_rate = 11981000,
.codec = "ucb1x00",
}; };
static void __init lart_init(void) static void __init lart_init(void)
......
...@@ -55,6 +55,7 @@ static struct resource shannon_flash_resource = { ...@@ -55,6 +55,7 @@ static struct resource shannon_flash_resource = {
static struct mcp_plat_data shannon_mcp_data = { static struct mcp_plat_data shannon_mcp_data = {
.mccr0 = MCCR0_ADM, .mccr0 = MCCR0_ADM,
.sclk_rate = 11981000, .sclk_rate = 11981000,
.codec = "ucb1x00",
}; };
static void __init shannon_init(void) static void __init shannon_init(void)
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
#include <linux/mtd/partitions.h> #include <linux/mtd/partitions.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/gpio.h> #include <linux/gpio.h>
#include <linux/mfd/ucb1x00.h>
#include <asm/irq.h> #include <asm/irq.h>
#include <mach/hardware.h> #include <mach/hardware.h>
...@@ -187,10 +188,15 @@ static struct resource simpad_flash_resources [] = { ...@@ -187,10 +188,15 @@ static struct resource simpad_flash_resources [] = {
} }
}; };
static struct ucb1x00_plat_data simpad_ucb1x00_data = {
.gpio_base = SIMPAD_UCB1X00_GPIO_BASE,
};
static struct mcp_plat_data simpad_mcp_data = { static struct mcp_plat_data simpad_mcp_data = {
.mccr0 = MCCR0_ADM, .mccr0 = MCCR0_ADM,
.sclk_rate = 11981000, .sclk_rate = 11981000,
.gpio_base = SIMPAD_UCB1X00_GPIO_BASE, .codec = "ucb1300",
.codec_pdata = &simpad_ucb1x00_data,
}; };
......
...@@ -26,9 +26,35 @@ ...@@ -26,9 +26,35 @@
#define to_mcp(d) container_of(d, struct mcp, attached_device) #define to_mcp(d) container_of(d, struct mcp, attached_device)
#define to_mcp_driver(d) container_of(d, struct mcp_driver, drv) #define to_mcp_driver(d) container_of(d, struct mcp_driver, drv)
static const struct mcp_device_id *mcp_match_id(const struct mcp_device_id *id,
const char *codec)
{
while (id->name[0]) {
if (strcmp(codec, id->name) == 0)
return id;
id++;
}
return NULL;
}
const struct mcp_device_id *mcp_get_device_id(const struct mcp *mcp)
{
const struct mcp_driver *driver =
to_mcp_driver(mcp->attached_device.driver);
return mcp_match_id(driver->id_table, mcp->codec);
}
EXPORT_SYMBOL(mcp_get_device_id);
static int mcp_bus_match(struct device *dev, struct device_driver *drv) static int mcp_bus_match(struct device *dev, struct device_driver *drv)
{ {
return 1; const struct mcp *mcp = to_mcp(dev);
const struct mcp_driver *driver = to_mcp_driver(drv);
if (driver->id_table)
return !!mcp_match_id(driver->id_table, mcp->codec);
return 0;
} }
static int mcp_bus_probe(struct device *dev) static int mcp_bus_probe(struct device *dev)
...@@ -74,9 +100,18 @@ static int mcp_bus_resume(struct device *dev) ...@@ -74,9 +100,18 @@ static int mcp_bus_resume(struct device *dev)
return ret; return ret;
} }
static int mcp_bus_uevent(struct device *dev, struct kobj_uevent_env *env)
{
struct mcp *mcp = to_mcp(dev);
add_uevent_var(env, "MODALIAS=%s%s", MCP_MODULE_PREFIX, mcp->codec);
return 0;
}
static struct bus_type mcp_bus_type = { static struct bus_type mcp_bus_type = {
.name = "mcp", .name = "mcp",
.match = mcp_bus_match, .match = mcp_bus_match,
.uevent = mcp_bus_uevent,
.probe = mcp_bus_probe, .probe = mcp_bus_probe,
.remove = mcp_bus_remove, .remove = mcp_bus_remove,
.suspend = mcp_bus_suspend, .suspend = mcp_bus_suspend,
...@@ -212,9 +247,14 @@ struct mcp *mcp_host_alloc(struct device *parent, size_t size) ...@@ -212,9 +247,14 @@ struct mcp *mcp_host_alloc(struct device *parent, size_t size)
} }
EXPORT_SYMBOL(mcp_host_alloc); EXPORT_SYMBOL(mcp_host_alloc);
int mcp_host_register(struct mcp *mcp) int mcp_host_register(struct mcp *mcp, void *pdata)
{ {
if (!mcp->codec)
return -EINVAL;
mcp->attached_device.platform_data = pdata;
dev_set_name(&mcp->attached_device, "mcp0"); dev_set_name(&mcp->attached_device, "mcp0");
request_module("%s%s", MCP_MODULE_PREFIX, mcp->codec);
return device_register(&mcp->attached_device); return device_register(&mcp->attached_device);
} }
EXPORT_SYMBOL(mcp_host_register); EXPORT_SYMBOL(mcp_host_register);
......
...@@ -146,6 +146,9 @@ static int mcp_sa11x0_probe(struct platform_device *pdev) ...@@ -146,6 +146,9 @@ static int mcp_sa11x0_probe(struct platform_device *pdev)
if (!data) if (!data)
return -ENODEV; return -ENODEV;
if (!data->codec)
return -ENODEV;
if (!request_mem_region(0x80060000, 0x60, "sa11x0-mcp")) if (!request_mem_region(0x80060000, 0x60, "sa11x0-mcp"))
return -EBUSY; return -EBUSY;
...@@ -162,7 +165,7 @@ static int mcp_sa11x0_probe(struct platform_device *pdev) ...@@ -162,7 +165,7 @@ static int mcp_sa11x0_probe(struct platform_device *pdev)
mcp->dma_audio_wr = DMA_Ser4MCP0Wr; mcp->dma_audio_wr = DMA_Ser4MCP0Wr;
mcp->dma_telco_rd = DMA_Ser4MCP1Rd; mcp->dma_telco_rd = DMA_Ser4MCP1Rd;
mcp->dma_telco_wr = DMA_Ser4MCP1Wr; mcp->dma_telco_wr = DMA_Ser4MCP1Wr;
mcp->gpio_base = data->gpio_base; mcp->codec = data->codec;
platform_set_drvdata(pdev, mcp); platform_set_drvdata(pdev, mcp);
...@@ -195,7 +198,7 @@ static int mcp_sa11x0_probe(struct platform_device *pdev) ...@@ -195,7 +198,7 @@ static int mcp_sa11x0_probe(struct platform_device *pdev)
mcp->rw_timeout = (64 * 3 * 1000000 + mcp->sclk_rate - 1) / mcp->rw_timeout = (64 * 3 * 1000000 + mcp->sclk_rate - 1) /
mcp->sclk_rate; mcp->sclk_rate;
ret = mcp_host_register(mcp); ret = mcp_host_register(mcp, data->codec_pdata);
if (ret == 0) if (ret == 0)
goto out; goto out;
......
...@@ -36,6 +36,15 @@ static DEFINE_MUTEX(ucb1x00_mutex); ...@@ -36,6 +36,15 @@ static DEFINE_MUTEX(ucb1x00_mutex);
static LIST_HEAD(ucb1x00_drivers); static LIST_HEAD(ucb1x00_drivers);
static LIST_HEAD(ucb1x00_devices); static LIST_HEAD(ucb1x00_devices);
static struct mcp_device_id ucb1x00_id[] = {
{ "ucb1x00", 0 }, /* auto-detection */
{ "ucb1200", UCB_ID_1200 },
{ "ucb1300", UCB_ID_1300 },
{ "tc35143", UCB_ID_TC35143 },
{ }
};
MODULE_DEVICE_TABLE(mcp, ucb1x00_id);
/** /**
* ucb1x00_io_set_dir - set IO direction * ucb1x00_io_set_dir - set IO direction
* @ucb: UCB1x00 structure describing chip * @ucb: UCB1x00 structure describing chip
...@@ -527,17 +536,33 @@ static struct class ucb1x00_class = { ...@@ -527,17 +536,33 @@ static struct class ucb1x00_class = {
static int ucb1x00_probe(struct mcp *mcp) static int ucb1x00_probe(struct mcp *mcp)
{ {
const struct mcp_device_id *mid;
struct ucb1x00 *ucb; struct ucb1x00 *ucb;
struct ucb1x00_driver *drv; struct ucb1x00_driver *drv;
struct ucb1x00_plat_data *pdata;
unsigned int id; unsigned int id;
int ret = -ENODEV; int ret = -ENODEV;
int temp; int temp;
mcp_enable(mcp); mcp_enable(mcp);
id = mcp_reg_read(mcp, UCB_ID); id = mcp_reg_read(mcp, UCB_ID);
mid = mcp_get_device_id(mcp);
if (id != UCB_ID_1200 && id != UCB_ID_1300 && id != UCB_ID_TC35143) { if (mid && mid->driver_data) {
printk(KERN_WARNING "UCB1x00 ID not found: %04x\n", id); if (id != mid->driver_data) {
printk(KERN_WARNING "%s wrong ID %04x found: %04x\n",
mid->name, (unsigned int) mid->driver_data, id);
goto err_disable;
}
} else {
mid = &ucb1x00_id[1];
while (mid->driver_data) {
if (id == mid->driver_data)
break;
mid++;
}
printk(KERN_WARNING "%s ID not found: %04x\n",
ucb1x00_id[0].name, id);
goto err_disable; goto err_disable;
} }
...@@ -546,28 +571,28 @@ static int ucb1x00_probe(struct mcp *mcp) ...@@ -546,28 +571,28 @@ static int ucb1x00_probe(struct mcp *mcp)
if (!ucb) if (!ucb)
goto err_disable; goto err_disable;
pdata = mcp->attached_device.platform_data;
ucb->dev.class = &ucb1x00_class; ucb->dev.class = &ucb1x00_class;
ucb->dev.parent = &mcp->attached_device; ucb->dev.parent = &mcp->attached_device;
dev_set_name(&ucb->dev, "ucb1x00"); dev_set_name(&ucb->dev, mid->name);
spin_lock_init(&ucb->lock); spin_lock_init(&ucb->lock);
spin_lock_init(&ucb->io_lock); spin_lock_init(&ucb->io_lock);
sema_init(&ucb->adc_sem, 1); sema_init(&ucb->adc_sem, 1);
ucb->id = id; ucb->id = mid;
ucb->mcp = mcp; ucb->mcp = mcp;
ucb->irq = ucb1x00_detect_irq(ucb); ucb->irq = ucb1x00_detect_irq(ucb);
if (ucb->irq == NO_IRQ) { if (ucb->irq == NO_IRQ) {
printk(KERN_ERR "UCB1x00: IRQ probe failed\n"); printk(KERN_ERR "%s: IRQ probe failed\n", mid->name);
ret = -ENODEV; ret = -ENODEV;
goto err_free; goto err_free;
} }
ucb->gpio.base = -1; ucb->gpio.base = -1;
if (mcp->gpio_base != 0) { if (pdata && (pdata->gpio_base >= 0)) {
ucb->gpio.label = dev_name(&ucb->dev); ucb->gpio.label = dev_name(&ucb->dev);
ucb->gpio.base = mcp->gpio_base; ucb->gpio.base = pdata->gpio_base;
ucb->gpio.ngpio = 10; ucb->gpio.ngpio = 10;
ucb->gpio.set = ucb1x00_gpio_set; ucb->gpio.set = ucb1x00_gpio_set;
ucb->gpio.get = ucb1x00_gpio_get; ucb->gpio.get = ucb1x00_gpio_get;
...@@ -580,10 +605,10 @@ static int ucb1x00_probe(struct mcp *mcp) ...@@ -580,10 +605,10 @@ static int ucb1x00_probe(struct mcp *mcp)
dev_info(&ucb->dev, "gpio_base not set so no gpiolib support"); dev_info(&ucb->dev, "gpio_base not set so no gpiolib support");
ret = request_irq(ucb->irq, ucb1x00_irq, IRQF_TRIGGER_RISING, ret = request_irq(ucb->irq, ucb1x00_irq, IRQF_TRIGGER_RISING,
"UCB1x00", ucb); mid->name, ucb);
if (ret) { if (ret) {
printk(KERN_ERR "ucb1x00: unable to grab irq%d: %d\n", printk(KERN_ERR "%s: unable to grab irq%d: %d\n",
ucb->irq, ret); mid->name, ucb->irq, ret);
goto err_gpio; goto err_gpio;
} }
...@@ -705,6 +730,7 @@ static struct mcp_driver ucb1x00_driver = { ...@@ -705,6 +730,7 @@ static struct mcp_driver ucb1x00_driver = {
.remove = ucb1x00_remove, .remove = ucb1x00_remove,
.suspend = ucb1x00_suspend, .suspend = ucb1x00_suspend,
.resume = ucb1x00_resume, .resume = ucb1x00_resume,
.id_table = ucb1x00_id,
}; };
static int __init ucb1x00_init(void) static int __init ucb1x00_init(void)
......
...@@ -382,7 +382,7 @@ static int ucb1x00_ts_add(struct ucb1x00_dev *dev) ...@@ -382,7 +382,7 @@ static int ucb1x00_ts_add(struct ucb1x00_dev *dev)
ts->adcsync = adcsync ? UCB_SYNC : UCB_NOSYNC; ts->adcsync = adcsync ? UCB_SYNC : UCB_NOSYNC;
idev->name = "Touchscreen panel"; idev->name = "Touchscreen panel";
idev->id.product = ts->ucb->id; idev->id.product = ts->ucb->id->driver_data;
idev->open = ucb1x00_ts_open; idev->open = ucb1x00_ts_open;
idev->close = ucb1x00_ts_close; idev->close = ucb1x00_ts_close;
......
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
#ifndef MCP_H #ifndef MCP_H
#define MCP_H #define MCP_H
#include <linux/mod_devicetable.h>
#include <mach/dma.h> #include <mach/dma.h>
struct mcp_ops; struct mcp_ops;
...@@ -26,7 +27,7 @@ struct mcp { ...@@ -26,7 +27,7 @@ struct mcp {
dma_device_t dma_telco_rd; dma_device_t dma_telco_rd;
dma_device_t dma_telco_wr; dma_device_t dma_telco_wr;
struct device attached_device; struct device attached_device;
int gpio_base; const char *codec;
}; };
struct mcp_ops { struct mcp_ops {
...@@ -44,10 +45,11 @@ void mcp_reg_write(struct mcp *, unsigned int, unsigned int); ...@@ -44,10 +45,11 @@ void mcp_reg_write(struct mcp *, unsigned int, unsigned int);
unsigned int mcp_reg_read(struct mcp *, unsigned int); unsigned int mcp_reg_read(struct mcp *, unsigned int);
void mcp_enable(struct mcp *); void mcp_enable(struct mcp *);
void mcp_disable(struct mcp *); void mcp_disable(struct mcp *);
const struct mcp_device_id *mcp_get_device_id(const struct mcp *mcp);
#define mcp_get_sclk_rate(mcp) ((mcp)->sclk_rate) #define mcp_get_sclk_rate(mcp) ((mcp)->sclk_rate)
struct mcp *mcp_host_alloc(struct device *, size_t); struct mcp *mcp_host_alloc(struct device *, size_t);
int mcp_host_register(struct mcp *); int mcp_host_register(struct mcp *, void *);
void mcp_host_unregister(struct mcp *); void mcp_host_unregister(struct mcp *);
struct mcp_driver { struct mcp_driver {
...@@ -56,6 +58,7 @@ struct mcp_driver { ...@@ -56,6 +58,7 @@ struct mcp_driver {
void (*remove)(struct mcp *); void (*remove)(struct mcp *);
int (*suspend)(struct mcp *, pm_message_t); int (*suspend)(struct mcp *, pm_message_t);
int (*resume)(struct mcp *); int (*resume)(struct mcp *);
const struct mcp_device_id *id_table;
}; };
int mcp_driver_register(struct mcp_driver *); int mcp_driver_register(struct mcp_driver *);
......
...@@ -104,6 +104,9 @@ ...@@ -104,6 +104,9 @@
#define UCB_MODE_DYN_VFLAG_ENA (1 << 12) #define UCB_MODE_DYN_VFLAG_ENA (1 << 12)
#define UCB_MODE_AUD_OFF_CAN (1 << 13) #define UCB_MODE_AUD_OFF_CAN (1 << 13)
struct ucb1x00_plat_data {
int gpio_base;
};
struct ucb1x00_irq { struct ucb1x00_irq {
void *devid; void *devid;
...@@ -116,7 +119,7 @@ struct ucb1x00 { ...@@ -116,7 +119,7 @@ struct ucb1x00 {
unsigned int irq; unsigned int irq;
struct semaphore adc_sem; struct semaphore adc_sem;
spinlock_t io_lock; spinlock_t io_lock;
u16 id; const struct mcp_device_id *id;
u16 io_dir; u16 io_dir;
u16 io_out; u16 io_out;
u16 adc_cr; u16 adc_cr;
......
...@@ -436,6 +436,17 @@ struct spi_device_id { ...@@ -436,6 +436,17 @@ struct spi_device_id {
__attribute__((aligned(sizeof(kernel_ulong_t)))); __attribute__((aligned(sizeof(kernel_ulong_t))));
}; };
/* mcp */
#define MCP_NAME_SIZE 20
#define MCP_MODULE_PREFIX "mcp:"
struct mcp_device_id {
char name[MCP_NAME_SIZE];
kernel_ulong_t driver_data /* Data private to the driver */
__attribute__((aligned(sizeof(kernel_ulong_t))));
};
/* dmi */ /* dmi */
enum dmi_field { enum dmi_field {
DMI_NONE, DMI_NONE,
......
...@@ -774,6 +774,15 @@ static int do_spi_entry(const char *filename, struct spi_device_id *id, ...@@ -774,6 +774,15 @@ static int do_spi_entry(const char *filename, struct spi_device_id *id,
return 1; return 1;
} }
/* Looks like: mcp:S */
static int do_mcp_entry(const char *filename, struct mcp_device_id *id,
char *alias)
{
sprintf(alias, MCP_MODULE_PREFIX "%s", id->name);
return 1;
}
static const struct dmifield { static const struct dmifield {
const char *prefix; const char *prefix;
int field; int field;
...@@ -1027,6 +1036,10 @@ void handle_moddevtable(struct module *mod, struct elf_info *info, ...@@ -1027,6 +1036,10 @@ void handle_moddevtable(struct module *mod, struct elf_info *info,
do_table(symval, sym->st_size, do_table(symval, sym->st_size,
sizeof(struct spi_device_id), "spi", sizeof(struct spi_device_id), "spi",
do_spi_entry, mod); do_spi_entry, mod);
else if (sym_is(symname, "__mod_mcp_device_table"))
do_table(symval, sym->st_size,
sizeof(struct mcp_device_id), "mcp",
do_mcp_entry, mod);
else if (sym_is(symname, "__mod_dmi_device_table")) else if (sym_is(symname, "__mod_dmi_device_table"))
do_table(symval, sym->st_size, do_table(symval, sym->st_size,
sizeof(struct dmi_system_id), "dmi", sizeof(struct dmi_system_id), "dmi",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment