Message-ID: <20090528174635.GA29797@sortiz.org>
Date:	Thu, 28 May 2009 19:46:39 +0200
From:	Samuel Ortiz <sameo@...ux.intel.com>
To:	Daniel Ribeiro <drwyrm@...il.com>
Cc:	linux-kernel <linux-kernel@...r.kernel.org>,
	Harald Welte <laforge@...monks.org>,
	Philipp Zabel <philipp.zabel@...il.com>,
	openezx-devel <openezx-devel@...ts.openezx.org>
Subject: Re: [PATCH v3] MFD: PCAP driver

Hi Daniel,

On Wed, May 27, 2009 at 01:42:36AM -0300, Daniel Ribeiro wrote:
> Changelog v2 -> v3
> 
> * Now allows multiple instances, on real life this is something that
> will never happen, but it looks good this way. I opted to keep the
> struct pcap_chip private, and pass only a void pointer to the
> subdevices, they dont need to know about the core internals.
I'd actually prefer the void pointer to be a pcap_chip one.
Otherwise, the patch looks good to me.

Cheers,
Samuel.


> * Moved ADC code back into the core driver. This was needed to avoid
> keeping track of subdevices on the core (like pcf50633 __to_adc() does).
> The ADC subdevice was the only subdevice that was being registered for
> all EZX phones, so moving it to core seems natural and will save some
> bytes.
> 
> * Fixed an issue with the irq demultiplexer acking interrupts that were
> meant for the baseband processor.
> 
> * Added locking to the I/O functions, and no longer allocing/freeing
> memory for each spi_sync call.
> 
> * Fixed the irq_chip cleanup on exit.
> 
> * Added GPL header.
> 
> Please, consider merging this for .31, I have regulator, leds,
> touchscreen, rtc, sound and usb transceiver drivers all waiting for this
> driver to go mainline before i can submit to the respective maintainers.
> 
> --- Patch starts here ---
> 
> The PCAP Asic as present on EZX phones is a multi function device with
> voltage regulators, ADC, touch screen controller, RTC, USB transceiver,
> leds controller, and audio codec.
> 
> It has two SPI ports, typically one is connected to the application
> processor and another to the baseband, this driver provides read/write
> functions to its registers, irq demultiplexer and ADC
> queueing/abstraction.
> 
> This chip is used on a lot of Motorola phones, it was manufactured by TI
> as a custom product with the name PTWL93017, later this design evolved
> into the ATLAS PMIC from Freescale (MC13783).
> 
> Signed-off-by: Daniel Ribeiro <drwyrm@...il.com>
> 
> ---
>  drivers/mfd/Kconfig          |    7 +
>  drivers/mfd/Makefile         |    2 +
>  drivers/mfd/ezx-pcap.c       |  509 ++++++++++++++++++++++++++++++++++++++++++
>  include/linux/mfd/ezx-pcap.h |  254 +++++++++++++++++++++
>  4 files changed, 772 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
> index ee3927a..060ee14 100644
> --- a/drivers/mfd/Kconfig
> +++ b/drivers/mfd/Kconfig
> @@ -241,6 +241,13 @@ config PCF50633_GPIO
>  	 Say yes here if you want to include support GPIO for pins on
>  	 the PCF50633 chip.
>  
> +config EZX_PCAP
> +	bool "PCAP Support"
> +	depends on SPI_MASTER
> +	help
> +	  This enables the PCAP ASIC present on EZX Phones. This is
> +	  needed for MMC, TouchScreen, Sound, USB, etc..
> +
>  endmenu
>  
>  menu "Multimedia Capabilities Port drivers"
> diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
> index 3afb519..b768962 100644
> --- a/drivers/mfd/Makefile
> +++ b/drivers/mfd/Makefile
> @@ -26,6 +26,8 @@ obj-$(CONFIG_TWL4030_CORE)	+= twl4030-core.o twl4030-irq.o
>  
>  obj-$(CONFIG_MFD_CORE)		+= mfd-core.o
>  
> +obj-$(CONFIG_EZX_PCAP)		+= ezx-pcap.o
> +
>  obj-$(CONFIG_MCP)		+= mcp-core.o
>  obj-$(CONFIG_MCP_SA11X0)	+= mcp-sa11x0.o
>  obj-$(CONFIG_MCP_UCB1200)	+= ucb1x00-core.o
> diff --git a/drivers/mfd/ezx-pcap.c b/drivers/mfd/ezx-pcap.c
> new file mode 100644
> index 0000000..3adc70a
> --- /dev/null
> +++ b/drivers/mfd/ezx-pcap.c
> @@ -0,0 +1,509 @@
> +/*
> + * Driver for Motorola PCAP2 as present in EZX phones
> + *
> + * Copyright (C) 2006 Harald Welte <laforge@...nezx.org>
> + * Copyright (C) 2009 Daniel Ribeiro <drwyrm@...il.com>
> + *
> + * 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.
> + *
> + */
> +
> +#include <linux/module.h>
> +#include <linux/kernel.h>
> +#include <linux/platform_device.h>
> +#include <linux/interrupt.h>
> +#include <linux/irq.h>
> +#include <linux/mfd/ezx-pcap.h>
> +#include <linux/spi/spi.h>
> +
> +#define PCAP_ADC_MAXQ		8
> +struct pcap_adc_request {
> +	u8 bank;
> +	u8 ch[2];
> +	u32 flags;
> +	void (*callback)(void *, u16[]);
> +	void *data;
> +};
> +
> +struct pcap_adc_sync_request {
> +	u16 res[2];
> +	struct completion completion;
> +};
> +
> +struct pcap_chip {
> +	struct spi_device *spi;
> +
> +	/* IO */
> +	u32 buf;
> +	struct mutex io_mutex;
> +
> +	/* IRQ */
> +	unsigned int irq_base;
> +	u32 msr;
> +	struct work_struct isr_work;
> +	struct work_struct msr_work;
> +	struct workqueue_struct *workqueue;
> +
> +	/* ADC */
> +	struct pcap_adc_request *adc_queue[PCAP_ADC_MAXQ];
> +	u8 adc_head;
> +	u8 adc_tail;
> +	struct mutex adc_mutex;
> +};
> +
> +/* IO */
> +static int ezx_pcap_putget(struct pcap_chip *pcap, u32 *data)
> +{
> +	struct spi_transfer t;
> +	struct spi_message m;
> +	int status;
> +
> +	memset(&t, 0, sizeof t);
> +	spi_message_init(&m);
> +	t.len = sizeof(u32);
> +	spi_message_add_tail(&t, &m);
> +
> +	pcap->buf = *data;
> +	t.tx_buf = (u8 *) &pcap->buf;
> +	t.rx_buf = (u8 *) &pcap->buf;
> +	status = spi_sync(pcap->spi, &m);
> +
> +	if (status == 0)
> +		*data = pcap->buf;
> +
> +	return status;
> +}
> +
> +int ezx_pcap_write(void *_pcap, u8 reg_num, u32 value)
> +{
> +	struct pcap_chip *pcap = _pcap;
> +	int ret;
> +
> +	mutex_lock(&pcap->io_mutex);
> +	value &= PCAP_REGISTER_VALUE_MASK;
> +	value |= PCAP_REGISTER_WRITE_OP_BIT
> +		| (reg_num << PCAP_REGISTER_ADDRESS_SHIFT);
> +	ret = ezx_pcap_putget(pcap, &value);
> +	mutex_unlock(&pcap->io_mutex);
> +
> +	return ret;
> +}
> +EXPORT_SYMBOL_GPL(ezx_pcap_write);
> +
> +int ezx_pcap_read(void *_pcap, u8 reg_num, u32 *value)
> +{
> +	struct pcap_chip *pcap = _pcap;
> +	int ret;
> +
> +	mutex_lock(&pcap->io_mutex);
> +	*value = PCAP_REGISTER_READ_OP_BIT
> +		| (reg_num << PCAP_REGISTER_ADDRESS_SHIFT);
> +
> +	ret = ezx_pcap_putget(pcap, value);
> +	mutex_unlock(&pcap->io_mutex);
> +
> +	return ret;
> +}
> +EXPORT_SYMBOL_GPL(ezx_pcap_read);
> +
> +/* IRQ */
> +static inline unsigned int irq2pcap(struct pcap_chip *pcap, int irq)
> +{
> +	return 1 << (irq - pcap->irq_base);
> +}
> +
> +int pcap_to_irq(void *_pcap, int irq)
> +{
> +	struct pcap_chip *pcap = _pcap;
> +
> +	return pcap->irq_base + irq;
> +}
> +EXPORT_SYMBOL_GPL(pcap_to_irq);
> +
> +static void pcap_mask_irq(unsigned int irq)
> +{
> +	struct pcap_chip *pcap = get_irq_chip_data(irq);
> +
> +	pcap->msr |= irq2pcap(pcap, irq);
> +	queue_work(pcap->workqueue, &pcap->msr_work);
> +}
> +
> +static void pcap_unmask_irq(unsigned int irq)
> +{
> +	struct pcap_chip *pcap = get_irq_chip_data(irq);
> +
> +	pcap->msr &= ~irq2pcap(pcap, irq);
> +	queue_work(pcap->workqueue, &pcap->msr_work);
> +}
> +
> +static struct irq_chip pcap_irq_chip = {
> +	.name	= "pcap",
> +	.mask	= pcap_mask_irq,
> +	.unmask	= pcap_unmask_irq,
> +};
> +
> +static void pcap_msr_work(struct work_struct *work)
> +{
> +	struct pcap_chip *pcap = container_of(work, struct pcap_chip, msr_work);
> +
> +	ezx_pcap_write(pcap, PCAP_REG_MSR, pcap->msr);
> +}
> +
> +static void pcap_isr_work(struct work_struct *work)
> +{
> +	struct pcap_chip *pcap = container_of(work, struct pcap_chip, isr_work);
> +	struct pcap_platform_data *pdata = pcap->spi->dev.platform_data;
> +	u32 msr, isr, int_sel, service;
> +	int irq;
> +
> +	ezx_pcap_read(pcap, PCAP_REG_MSR, &msr);
> +	ezx_pcap_read(pcap, PCAP_REG_ISR, &isr);
> +
> +	/* We cant service/ack irqs that are assigned to port 2 */
> +	if (!(pdata->config & PCAP_SECOND_PORT)) {
> +		ezx_pcap_read(pcap, PCAP_REG_INT_SEL, &int_sel);
> +		isr &= ~int_sel;
> +	}
> +	ezx_pcap_write(pcap, PCAP_REG_ISR, isr);
> +
> +	local_irq_disable();
> +	service = isr & ~msr;
> +
> +	for (irq = pcap->irq_base; service; service >>= 1, irq++) {
> +		if (service & 1) {
> +			struct irq_desc *desc = irq_to_desc(irq);
> +
> +			if (WARN(!desc, KERN_WARNING
> +					"Invalid PCAP IRQ %d\n", irq))
> +				break;
> +
> +			if (desc->status & IRQ_DISABLED)
> +				note_interrupt(irq, desc, IRQ_NONE);
> +			else
> +				desc->handle_irq(irq, desc);
> +		}
> +	}
> +	local_irq_enable();
> +}
> +
> +static void pcap_irq_handler(unsigned int irq, struct irq_desc *desc)
> +{
> +	struct pcap_chip *pcap = get_irq_data(irq);
> +
> +	desc->chip->ack(irq);
> +	queue_work(pcap->workqueue, &pcap->isr_work);
> +	return;
> +}
> +
> +/* ADC */
> +static void pcap_disable_adc(struct pcap_chip *pcap)
> +{
> +	u32 tmp;
> +
> +	ezx_pcap_read(pcap, PCAP_REG_ADC, &tmp);
> +	tmp &= ~(PCAP_ADC_ADEN|PCAP_ADC_BATT_I_ADC|PCAP_ADC_BATT_I_POLARITY);
> +	ezx_pcap_write(pcap, PCAP_REG_ADC, tmp);
> +}
> +
> +static void pcap_adc_trigger(struct pcap_chip *pcap)
> +{
> +	u32 tmp;
> +	u8 head;
> +
> +	mutex_lock(&pcap->adc_mutex);
> +	head = pcap->adc_head;
> +	if (!pcap->adc_queue[head]) {
> +		/* queue is empty, save power */
> +		pcap_disable_adc(pcap);
> +		mutex_unlock(&pcap->adc_mutex);
> +		return;
> +	}
> +	mutex_unlock(&pcap->adc_mutex);
> +
> +	/* start conversion on requested bank */
> +	tmp = pcap->adc_queue[head]->flags | PCAP_ADC_ADEN;
> +
> +	if (pcap->adc_queue[head]->bank == PCAP_ADC_BANK_1)
> +		tmp |= PCAP_ADC_AD_SEL1;
> +
> +	ezx_pcap_write(pcap, PCAP_REG_ADC, tmp);
> +	ezx_pcap_write(pcap, PCAP_REG_ADR, PCAP_ADR_ASC);
> +}
> +
> +static irqreturn_t pcap_adc_irq(int irq, void *_pcap)
> +{
> +	struct pcap_chip *pcap = _pcap;
> +	struct pcap_adc_request *req;
> +	u16 res[2];
> +	u32 tmp;
> +
> +	mutex_lock(&pcap->adc_mutex);
> +	req = pcap->adc_queue[pcap->adc_head];
> +
> +	if (WARN(!req, KERN_WARNING "adc irq without pending request\n"))
> +		return IRQ_HANDLED;
> +
> +	/* read requested channels results */
> +	ezx_pcap_read(pcap, PCAP_REG_ADC, &tmp);
> +	tmp &= ~(PCAP_ADC_ADA1_MASK | PCAP_ADC_ADA2_MASK);
> +	tmp |= (req->ch[0] << PCAP_ADC_ADA1_SHIFT);
> +	tmp |= (req->ch[1] << PCAP_ADC_ADA2_SHIFT);
> +	ezx_pcap_write(pcap, PCAP_REG_ADC, tmp);
> +	ezx_pcap_read(pcap, PCAP_REG_ADR, &tmp);
> +	res[0] = (tmp & PCAP_ADR_ADD1_MASK) >> PCAP_ADR_ADD1_SHIFT;
> +	res[1] = (tmp & PCAP_ADR_ADD2_MASK) >> PCAP_ADR_ADD2_SHIFT;
> +
> +	pcap->adc_queue[pcap->adc_head] = NULL;
> +	pcap->adc_head = (pcap->adc_head + 1) & (PCAP_ADC_MAXQ - 1);
> +	mutex_unlock(&pcap->adc_mutex);
> +
> +	/* pass the results and release memory */
> +	req->callback(req->data, res);
> +	kfree(req);
> +
> +	/* trigger next conversion (if any) on queue */
> +	pcap_adc_trigger(pcap);
> +
> +	return IRQ_HANDLED;
> +}
> +
> +int pcap_adc_async(void *_pcap, u8 bank, u32 flags, u8 ch[],
> +						void *callback, void *data)
> +{
> +	struct pcap_chip *pcap = _pcap;
> +	struct pcap_adc_request *req;
> +
> +	/* This will be freed after we have a result */
> +	req = kmalloc(sizeof(struct pcap_adc_request), GFP_KERNEL);
> +	if (!req)
> +		return -ENOMEM;
> +
> +	req->bank = bank;
> +	req->flags = flags;
> +	req->ch[0] = ch[0];
> +	req->ch[1] = ch[1];
> +	req->callback = callback;
> +	req->data = data;
> +
> +	mutex_lock(&pcap->adc_mutex);
> +	if (pcap->adc_queue[pcap->adc_tail]) {
> +		mutex_unlock(&pcap->adc_mutex);
> +		kfree(req);
> +		return -EBUSY;
> +	}
> +	pcap->adc_queue[pcap->adc_tail] = req;
> +	pcap->adc_tail = (pcap->adc_tail + 1) & (PCAP_ADC_MAXQ - 1);
> +	mutex_unlock(&pcap->adc_mutex);
> +
> +	/* start conversion */
> +	pcap_adc_trigger(pcap);
> +
> +	return 0;
> +}
> +EXPORT_SYMBOL_GPL(pcap_adc_async);
> +
> +static void pcap_adc_sync_cb(void *param, u16 res[])
> +{
> +	struct pcap_adc_sync_request *req = param;
> +
> +	req->res[0] = res[0];
> +	req->res[1] = res[1];
> +	complete(&req->completion);
> +}
> +
> +int pcap_adc_sync(void *_pcap, u8 bank, u32 flags, u8 ch[], u16 res[])
> +{
> +	struct pcap_chip *pcap = _pcap;
> +	struct pcap_adc_sync_request sync_data;
> +	int ret;
> +
> +	init_completion(&sync_data.completion);
> +	ret = pcap_adc_async(pcap, bank, flags, ch, pcap_adc_sync_cb,
> +								&sync_data);
> +	if (ret)
> +		return ret;
> +	wait_for_completion(&sync_data.completion);
> +	res[0] = sync_data.res[0];
> +	res[1] = sync_data.res[1];
> +
> +	return 0;
> +}
> +EXPORT_SYMBOL_GPL(pcap_adc_sync);
> +
> +/* subdevs */
> +static int pcap_remove_subdev(struct device *dev, void *unused)
> +{
> +	platform_device_unregister(to_platform_device(dev));
> +	return 0;
> +}
> +
> +static int __devinit pcap_add_subdev(struct pcap_chip *pcap,
> +						struct pcap_subdev *subdev)
> +{
> +	struct platform_device *pdev;
> +
> +	pdev = platform_device_alloc(subdev->name, subdev->id);
> +	pdev->dev.parent = &pcap->spi->dev;
> +	pdev->dev.platform_data = subdev->platform_data;
> +	platform_set_drvdata(pdev, pcap);
> +
> +	return platform_device_add(pdev);
> +}
> +
> +static int __devexit ezx_pcap_remove(struct spi_device *spi)
> +{
> +	struct pcap_chip *pcap = dev_get_drvdata(&spi->dev);
> +	struct pcap_platform_data *pdata = spi->dev.platform_data;
> +	int i, adc_irq;
> +
> +	/* remove all registered subdevs */
> +	device_for_each_child(&spi->dev, NULL, pcap_remove_subdev);
> +
> +	/* cleanup ADC */
> +	adc_irq = pcap_to_irq(pcap, (pdata->config & PCAP_SECOND_PORT) ?
> +				PCAP_IRQ_ADCDONE2 : PCAP_IRQ_ADCDONE);
> +	free_irq(adc_irq, pcap);
> +	mutex_lock(&pcap->adc_mutex);
> +	for (i = 0; i < PCAP_ADC_MAXQ; i++)
> +		kfree(pcap->adc_queue[i]);
> +	mutex_unlock(&pcap->adc_mutex);
> +
> +	/* cleanup irqchip */
> +	for (i = pcap->irq_base; i < (pcap->irq_base + PCAP_NIRQS); i++)
> +		set_irq_chip_and_handler(i, NULL, NULL);
> +
> +	destroy_workqueue(pcap->workqueue);
> +
> +	kfree(pcap);
> +
> +	return 0;
> +}
> +
> +static int __devinit ezx_pcap_probe(struct spi_device *spi)
> +{
> +	struct pcap_platform_data *pdata = spi->dev.platform_data;
> +	struct pcap_chip *pcap;
> +	int i, adc_irq;
> +	int ret = -ENODEV;
> +
> +	/* platform data is required */
> +	if (!pdata)
> +		goto ret;
> +
> +	pcap = kzalloc(sizeof(*pcap), GFP_KERNEL);
> +	if (!pcap) {
> +		ret = -ENOMEM;
> +		goto ret;
> +	}
> +
> +	mutex_init(&pcap->io_mutex);
> +	mutex_init(&pcap->adc_mutex);
> +	INIT_WORK(&pcap->isr_work, pcap_isr_work);
> +	INIT_WORK(&pcap->msr_work, pcap_msr_work);
> +	dev_set_drvdata(&spi->dev, pcap);
> +
> +	/* setup spi */
> +	spi->bits_per_word = 32;
> +	spi->mode = SPI_MODE_0 | (pdata->config & PCAP_CS_AH ? SPI_CS_HIGH : 0);
> +	ret = spi_setup(spi);
> +	if (ret)
> +		goto free_pcap;
> +
> +	pcap->spi = spi;
> +
> +	/* setup irq */
> +	pcap->irq_base = pdata->irq_base;
> +	pcap->workqueue = create_singlethread_workqueue("pcapd");
> +	if (!pcap->workqueue) {
> +		dev_err(&spi->dev, "cant create pcap thread\n");
> +		goto free_pcap;
> +	}
> +
> +	/* redirect interrupts to AP, except adcdone2 */
> +	if (!(pdata->config & PCAP_SECOND_PORT))
> +		ezx_pcap_write(pcap, PCAP_REG_INT_SEL, PCAP_IRQ_ADCDONE2);
> +
> +	/* setup irq chip */
> +	for (i = pcap->irq_base; i < (pcap->irq_base + PCAP_NIRQS); i++) {
> +		set_irq_chip_and_handler(i, &pcap_irq_chip, handle_simple_irq);
> +		set_irq_chip_data(i, pcap);
> +#ifdef CONFIG_ARM
> +		set_irq_flags(i, IRQF_VALID);
> +#else
> +		set_irq_noprobe(i);
> +#endif
> +	}
> +
> +	/* mask/ack all PCAP interrupts */
> +	ezx_pcap_write(pcap, PCAP_REG_MSR, PCAP_MASK_ALL_INTERRUPT);
> +	ezx_pcap_write(pcap, PCAP_REG_ISR, PCAP_CLEAR_INTERRUPT_REGISTER);
> +	pcap->msr = PCAP_MASK_ALL_INTERRUPT;
> +
> +	set_irq_type(spi->irq, IRQ_TYPE_EDGE_RISING);
> +	set_irq_data(spi->irq, pcap);
> +	set_irq_chained_handler(spi->irq, pcap_irq_handler);
> +	set_irq_wake(spi->irq, 1);
> +
> +	/* ADC */
> +	adc_irq = pcap_to_irq(pcap, (pdata->config & PCAP_SECOND_PORT) ?
> +					PCAP_IRQ_ADCDONE2 : PCAP_IRQ_ADCDONE);
> +
> +	ret = request_irq(adc_irq, pcap_adc_irq, 0, "ADC", pcap);
> +	if (ret)
> +		goto free_irqchip;
> +
> +	/* setup subdevs */
> +	for (i = 0; i < pdata->num_subdevs; i++) {
> +		ret = pcap_add_subdev(pcap, &pdata->subdevs[i]);
> +		if (ret)
> +			goto remove_subdevs;
> +	}
> +
> +	/* board specific quirks */
> +	if (pdata->init)
> +		pdata->init(pcap);
> +
> +	return 0;
> +
> +remove_subdevs:
> +	device_for_each_child(&spi->dev, NULL, pcap_remove_subdev);
> +/* free_adc: */
> +	free_irq(adc_irq, pcap);
> +free_irqchip:
> +	for (i = pcap->irq_base; i < (pcap->irq_base + PCAP_NIRQS); i++)
> +		set_irq_chip_and_handler(i, NULL, NULL);
> +/* destroy_workqueue: */
> +	destroy_workqueue(pcap->workqueue);
> +free_pcap:
> +	kfree(pcap);
> +ret:
> +	return ret;
> +}
> +
> +static struct spi_driver ezxpcap_driver = {
> +	.probe  = ezx_pcap_probe,
> +	.remove = __devexit_p(ezx_pcap_remove),
> +	.driver = {
> +		.name   = "ezx-pcap",
> +		.owner  = THIS_MODULE,
> +	},
> +};
> +
> +static int __init ezx_pcap_init(void)
> +{
> +	return spi_register_driver(&ezxpcap_driver);
> +}
> +
> +static void __exit ezx_pcap_exit(void)
> +{
> +	spi_unregister_driver(&ezxpcap_driver);
> +}
> +
> +module_init(ezx_pcap_init);
> +module_exit(ezx_pcap_exit);
> +
> +MODULE_LICENSE("GPL");
> +MODULE_AUTHOR("Daniel Ribeiro / Harald Welte");
> +MODULE_DESCRIPTION("Motorola PCAP2 ASIC Driver");
> diff --git a/include/linux/mfd/ezx-pcap.h b/include/linux/mfd/ezx-pcap.h
> new file mode 100644
> index 0000000..feeb386
> --- /dev/null
> +++ b/include/linux/mfd/ezx-pcap.h
> @@ -0,0 +1,254 @@
> +/*
> + * Copyright 2009 Daniel Ribeiro <drwyrm@...il.com>
> + *
> + * For further information, please see http://wiki.openezx.org/PCAP2
> + */
> +
> +#ifndef EZX_PCAP_H
> +#define EZX_PCAP_H
> +
> +struct pcap_subdev {
> +	int id;
> +	const char *name;
> +	void *platform_data;
> +};
> +
> +struct pcap_platform_data {
> +	unsigned int irq_base;
> +	unsigned int config;
> +	void (*init) (void *);	/* board specific init */
> +	int num_subdevs;
> +	struct pcap_subdev *subdevs;
> +};
> +
> +int ezx_pcap_write(void *, u8, u32);
> +int ezx_pcap_read(void *, u8, u32 *);
> +int pcap_to_irq(void *, int);
> +int pcap_adc_async(void *, u8, u32, u8[], void *, void *);
> +int pcap_adc_sync(void *, u8, u32, u8[], u16[]);
> +
> +#define PCAP_SECOND_PORT	1
> +#define PCAP_CS_AH		2
> +
> +#define PCAP_REGISTER_WRITE_OP_BIT	0x80000000
> +#define PCAP_REGISTER_READ_OP_BIT	0x00000000
> +
> +#define PCAP_REGISTER_VALUE_MASK	0x01ffffff
> +#define PCAP_REGISTER_ADDRESS_MASK	0x7c000000
> +#define PCAP_REGISTER_ADDRESS_SHIFT	26
> +#define PCAP_REGISTER_NUMBER		32
> +#define PCAP_CLEAR_INTERRUPT_REGISTER	0x01ffffff
> +#define PCAP_MASK_ALL_INTERRUPT		0x01ffffff
> +
> +/* registers acessible by both pcap ports */
> +#define PCAP_REG_ISR		0x0	/* Interrupt Status */
> +#define PCAP_REG_MSR		0x1	/* Interrupt Mask */
> +#define PCAP_REG_PSTAT		0x2	/* Processor Status */
> +#define PCAP_REG_VREG2		0x6	/* Regulator Bank 2 Control */
> +#define PCAP_REG_AUXVREG	0x7	/* Auxiliary Regulator Control */
> +#define PCAP_REG_BATT		0x8	/* Battery Control */
> +#define PCAP_REG_ADC		0x9	/* AD Control */
> +#define PCAP_REG_ADR		0xa	/* AD Result */
> +#define PCAP_REG_CODEC		0xb	/* Audio Codec Control */
> +#define PCAP_REG_RX_AMPS	0xc	/* RX Audio Amplifiers Control */
> +#define PCAP_REG_ST_DAC		0xd	/* Stereo DAC Control */
> +#define PCAP_REG_BUSCTRL	0x14	/* Connectivity Control */
> +#define PCAP_REG_PERIPH		0x15	/* Peripheral Control */
> +#define PCAP_REG_LOWPWR		0x18	/* Regulator Low Power Control */
> +#define PCAP_REG_TX_AMPS	0x1a	/* TX Audio Amplifiers Control */
> +#define PCAP_REG_GP		0x1b	/* General Purpose */
> +#define PCAP_REG_TEST1		0x1c
> +#define PCAP_REG_TEST2		0x1d
> +#define PCAP_REG_VENDOR_TEST1	0x1e
> +#define PCAP_REG_VENDOR_TEST2	0x1f
> +
> +/* registers acessible by pcap port 1 only (a1200, e2 & e6) */
> +#define PCAP_REG_INT_SEL	0x3	/* Interrupt Select */
> +#define PCAP_REG_SWCTRL		0x4	/* Switching Regulator Control */
> +#define PCAP_REG_VREG1		0x5	/* Regulator Bank 1 Control */
> +#define PCAP_REG_RTC_TOD	0xe	/* RTC Time of Day */
> +#define PCAP_REG_RTC_TODA	0xf	/* RTC Time of Day Alarm */
> +#define PCAP_REG_RTC_DAY	0x10	/* RTC Day */
> +#define PCAP_REG_RTC_DAYA	0x11	/* RTC Day Alarm */
> +#define PCAP_REG_MTRTMR		0x12	/* AD Monitor Timer */
> +#define PCAP_REG_PWR		0x13	/* Power Control */
> +#define PCAP_REG_AUXVREG_MASK	0x16	/* Auxiliary Regulator Mask */
> +#define PCAP_REG_VENDOR_REV	0x17
> +#define PCAP_REG_PERIPH_MASK	0x19	/* Peripheral Mask */
> +
> +/* PCAP2 Interrupts */
> +#define PCAP_NIRQS		23
> +#define PCAP_IRQ_ADCDONE	0	/* ADC done port 1 */
> +#define PCAP_IRQ_TS		1	/* Touch Screen */
> +#define PCAP_IRQ_1HZ		2	/* 1HZ timer */
> +#define PCAP_IRQ_WH		3	/* ADC above high limit */
> +#define PCAP_IRQ_WL		4	/* ADC below low limit */
> +#define PCAP_IRQ_TODA		5	/* Time of day alarm */
> +#define PCAP_IRQ_USB4V		6	/* USB above 4V */
> +#define PCAP_IRQ_ONOFF		7	/* On/Off button */
> +#define PCAP_IRQ_ONOFF2		8	/* On/Off button 2 */
> +#define PCAP_IRQ_USB1V		9	/* USB above 1V */
> +#define PCAP_IRQ_MOBPORT	10
> +#define PCAP_IRQ_MIC		11	/* Mic attach/HS button */
> +#define PCAP_IRQ_HS		12	/* Headset attach */
> +#define PCAP_IRQ_ST		13
> +#define PCAP_IRQ_PC		14	/* Power Cut */
> +#define PCAP_IRQ_WARM		15
> +#define PCAP_IRQ_EOL		16	/* Battery End Of Life */
> +#define PCAP_IRQ_CLK		17
> +#define PCAP_IRQ_SYSRST		18	/* System Reset */
> +#define PCAP_IRQ_DUMMY		19
> +#define PCAP_IRQ_ADCDONE2	20	/* ADC done port 2 */
> +#define PCAP_IRQ_SOFTRESET	21
> +#define PCAP_IRQ_MNEXB		22
> +
> +/* voltage regulators */
> +#define V1		0
> +#define V2		1
> +#define V3		2
> +#define V4		3
> +#define V5		4
> +#define V6		5
> +#define V7		6
> +#define V8		7
> +#define V9		8
> +#define V10		9
> +#define VAUX1		10
> +#define VAUX2		11
> +#define VAUX3		12
> +#define VAUX4		13
> +#define VSIM		14
> +#define VSIM2		15
> +#define VVIB		16
> +#define SW1		17
> +#define SW2		18
> +#define SW3		19
> +#define SW1S		20
> +#define SW2S		21
> +
> +#define PCAP_BATT_DAC_MASK		0x000000ff
> +#define PCAP_BATT_DAC_SHIFT		0
> +#define PCAP_BATT_B_FDBK		(1 << 8)
> +#define PCAP_BATT_EXT_ISENSE		(1 << 9)
> +#define PCAP_BATT_V_COIN_MASK		0x00003c00
> +#define PCAP_BATT_V_COIN_SHIFT		10
> +#define PCAP_BATT_I_COIN		(1 << 14)
> +#define PCAP_BATT_COIN_CH_EN		(1 << 15)
> +#define PCAP_BATT_EOL_SEL_MASK		0x000e0000
> +#define PCAP_BATT_EOL_SEL_SHIFT		17
> +#define PCAP_BATT_EOL_CMP_EN		(1 << 20)
> +#define PCAP_BATT_BATT_DET_EN		(1 << 21)
> +#define PCAP_BATT_THERMBIAS_CTRL	(1 << 22)
> +
> +#define PCAP_ADC_ADEN			(1 << 0)
> +#define PCAP_ADC_RAND			(1 << 1)
> +#define PCAP_ADC_AD_SEL1		(1 << 2)
> +#define PCAP_ADC_AD_SEL2		(1 << 3)
> +#define PCAP_ADC_ADA1_MASK		0x00000070
> +#define PCAP_ADC_ADA1_SHIFT		4
> +#define PCAP_ADC_ADA2_MASK		0x00000380
> +#define PCAP_ADC_ADA2_SHIFT		7
> +#define PCAP_ADC_ATO_MASK		0x00003c00
> +#define PCAP_ADC_ATO_SHIFT		10
> +#define PCAP_ADC_ATOX			(1 << 14)
> +#define PCAP_ADC_MTR1			(1 << 15)
> +#define PCAP_ADC_MTR2			(1 << 16)
> +#define PCAP_ADC_TS_M_MASK		0x000e0000
> +#define PCAP_ADC_TS_M_SHIFT		17
> +#define PCAP_ADC_TS_REF_LOWPWR		(1 << 20)
> +#define PCAP_ADC_TS_REFENB		(1 << 21)
> +#define PCAP_ADC_BATT_I_POLARITY	(1 << 22)
> +#define PCAP_ADC_BATT_I_ADC		(1 << 23)
> +
> +#define PCAP_ADC_BANK_0			0
> +#define PCAP_ADC_BANK_1			1
> +/* ADC bank 0 */
> +#define PCAP_ADC_CH_COIN		0
> +#define PCAP_ADC_CH_BATT		1
> +#define PCAP_ADC_CH_BPLUS		2
> +#define PCAP_ADC_CH_MOBPORTB		3
> +#define PCAP_ADC_CH_TEMPERATURE		4
> +#define PCAP_ADC_CH_CHARGER_ID		5
> +#define PCAP_ADC_CH_AD6			6
> +/* ADC bank 1 */
> +#define PCAP_ADC_CH_AD7			0
> +#define PCAP_ADC_CH_AD8			1
> +#define PCAP_ADC_CH_AD9			2
> +#define PCAP_ADC_CH_TS_X1		3
> +#define PCAP_ADC_CH_TS_X2		4
> +#define PCAP_ADC_CH_TS_Y1		5
> +#define PCAP_ADC_CH_TS_Y2		6
> +
> +#define PCAP_ADC_T_NOW			0
> +#define PCAP_ADC_T_IN_BURST		1
> +#define PCAP_ADC_T_OUT_BURST		2
> +
> +#define PCAP_ADC_ATO_IN_BURST		6
> +#define PCAP_ADC_ATO_OUT_BURST		0
> +
> +#define PCAP_ADC_TS_M_XY		1
> +#define PCAP_ADC_TS_M_PRESSURE		2
> +#define PCAP_ADC_TS_M_PLATE_X		3
> +#define PCAP_ADC_TS_M_PLATE_Y		4
> +#define PCAP_ADC_TS_M_STANDBY		5
> +#define PCAP_ADC_TS_M_NONTS		6
> +
> +#define PCAP_ADR_ADD1_MASK		0x000003ff
> +#define PCAP_ADR_ADD1_SHIFT		0
> +#define PCAP_ADR_ADD2_MASK		0x000ffc00
> +#define PCAP_ADR_ADD2_SHIFT		10
> +#define PCAP_ADR_ADINC1			(1 << 20)
> +#define PCAP_ADR_ADINC2			(1 << 21)
> +#define PCAP_ADR_ASC			(1 << 22)
> +#define PCAP_ADR_ONESHOT		(1 << 23)
> +
> +#define PCAP_BUSCTRL_FSENB		(1 << 0)
> +#define PCAP_BUSCTRL_USB_SUSPEND	(1 << 1)
> +#define PCAP_BUSCTRL_USB_PU		(1 << 2)
> +#define PCAP_BUSCTRL_USB_PD		(1 << 3)
> +#define PCAP_BUSCTRL_VUSB_EN		(1 << 4)
> +#define PCAP_BUSCTRL_USB_PS		(1 << 5)
> +#define PCAP_BUSCTRL_VUSB_MSTR_EN	(1 << 6)
> +#define PCAP_BUSCTRL_VBUS_PD_ENB	(1 << 7)
> +#define PCAP_BUSCTRL_CURRLIM		(1 << 8)
> +#define PCAP_BUSCTRL_RS232ENB		(1 << 9)
> +#define PCAP_BUSCTRL_RS232_DIR		(1 << 10)
> +#define PCAP_BUSCTRL_SE0_CONN		(1 << 11)
> +#define PCAP_BUSCTRL_USB_PDM		(1 << 12)
> +#define PCAP_BUSCTRL_BUS_PRI_ADJ	(1 << 24)
> +
> +/* leds */
> +#define PCAP_LED0		0
> +#define PCAP_LED1		1
> +#define PCAP_BL0		2
> +#define PCAP_BL1		3
> +#define PCAP_VIB		4
> +#define PCAP_LED_3MA		0
> +#define PCAP_LED_4MA		1
> +#define PCAP_LED_5MA		2
> +#define PCAP_LED_9MA		3
> +#define PCAP_LED_GPIO_VAL_MASK	0x00ffffff
> +#define PCAP_LED_GPIO_EN	0x01000000
> +#define PCAP_LED_GPIO_INVERT	0x02000000
> +#define PCAP_LED_T_MASK		0xf
> +#define PCAP_LED_C_MASK		0x3
> +#define PCAP_BL_MASK		0x1f
> +#define PCAP_BL0_SHIFT		0
> +#define PCAP_LED0_EN		(1 << 5)
> +#define PCAP_LED1_EN		(1 << 6)
> +#define PCAP_LED0_T_SHIFT	7
> +#define PCAP_LED1_T_SHIFT	11
> +#define PCAP_LED0_C_SHIFT	15
> +#define PCAP_LED1_C_SHIFT	17
> +#define PCAP_BL1_SHIFT		20
> +#define PCAP_VIB_MASK		0x3
> +#define PCAP_VIB_SHIFT		20
> +#define PCAP_VIB_EN		(1 << 19)
> +
> +/* RTC */
> +#define PCAP_RTC_DAY_MASK	0x3fff
> +#define PCAP_RTC_TOD_MASK	0xffff
> +#define PCAP_RTC_PC_MASK	0x7
> +#define SEC_PER_DAY		86400
> +
> +#endif
> -- 
> tg: (625a6e4..) ezx/pcap (depends on: ezx/increase-nrirqs spi/pxa2xx_spi-fix-dma-resume)
> total: 0 errors, 0 warnings, 784 lines checked
> 
> pcap.patch has no obvious style problems and is ready for submission.
> 
> -- 
> Daniel Ribeiro
> 

-- 
Intel Open Source Technology Centre
http://oss.intel.com/
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Powered by blists - more mailing lists