2009-06-27 03:17:42

by Daniel Ribeiro

[permalink] [raw]

Subject: [PATCH] MFD/PCAP: ezx_pcap_setbits()

---

Provides an atomic set_bits functions, as needed by the pcap-regulator
driver.

Signed-off-by: Daniel Ribeiro <[email protected]>

---
drivers/mfd/ezx-pcap.c | 23 +++++++++++++++++++++++
include/linux/mfd/ezx-pcap.h | 1 +
2 files changed, 24 insertions(+), 0 deletions(-)

diff --git a/drivers/mfd/ezx-pcap.c b/drivers/mfd/ezx-pcap.c
index 732664f..86d3948 100644
--- a/drivers/mfd/ezx-pcap.c
+++ b/drivers/mfd/ezx-pcap.c
@@ -107,6 +107,29 @@ int ezx_pcap_read(struct pcap_chip *pcap, u8 reg_num, u32 *value)
}
EXPORT_SYMBOL_GPL(ezx_pcap_read);

+int ezx_pcap_set_bits(struct pcap_chip *pcap, u8 reg_num, u32 mask, u32 val)
+{
+ int ret;
+ u32 tmp = PCAP_REGISTER_READ_OP_BIT |
+ (reg_num << PCAP_REGISTER_ADDRESS_SHIFT);
+
+ mutex_lock(&pcap->io_mutex);
+ ret = ezx_pcap_putget(pcap, &tmp);
+ if (ret)
+ goto out_unlock;
+
+ tmp &= (PCAP_REGISTER_VALUE_MASK & ~mask);
+ tmp |= (val & mask) | PCAP_REGISTER_WRITE_OP_BIT |
+ (reg_num << PCAP_REGISTER_ADDRESS_SHIFT);
+
+ ret = ezx_pcap_putget(pcap, &tmp);
+out_unlock:
+ mutex_unlock(&pcap->io_mutex);
+
+ return ret;
+}
+EXPORT_SYMBOL_GPL(ezx_pcap_set_bits);
+
/* IRQ */
int irq_to_pcap(struct pcap_chip *pcap, int irq)
{
diff --git a/include/linux/mfd/ezx-pcap.h b/include/linux/mfd/ezx-pcap.h
index b15caac..dec82b0 100644
--- a/include/linux/mfd/ezx-pcap.h
+++ b/include/linux/mfd/ezx-pcap.h
@@ -25,6 +25,7 @@ struct pcap_chip;

int ezx_pcap_write(struct pcap_chip *, u8, u32);
int ezx_pcap_read(struct pcap_chip *, u8, u32 *);
+int ezx_pcap_set_bits(struct pcap_chip *, u8, u32, u32);
int pcap_to_irq(struct pcap_chip *, int);
int irq_to_pcap(struct pcap_chip *, int);
int pcap_adc_async(struct pcap_chip *, u8, u32, u8[], void *, void *);
--
tg: (e94c381..) pcap/set_bits (depends on: pcap/fix-irq-handler)

--
Daniel Ribeiro

---

Attachments:

signature.asc (197.00 B)
Esta ? uma parte de mensagem assinada digitalmente

2009-07-03 10:48:39

by Samuel Ortiz

[permalink] [raw]

Subject: Re: [PATCH] MFD/PCAP: ezx_pcap_setbits()

---

On Sat, Jun 27, 2009 at 12:17:20AM -0300, Daniel Ribeiro wrote:
> Provides an atomic set_bits functions, as needed by the pcap-regulator
> driver.
>
> Signed-off-by: Daniel Ribeiro <[email protected]>
Applied to my for-next branch, thanks Daniel.

Cheers,
Samuel.


> ---
> drivers/mfd/ezx-pcap.c | 23 +++++++++++++++++++++++
> include/linux/mfd/ezx-pcap.h | 1 +
> 2 files changed, 24 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/mfd/ezx-pcap.c b/drivers/mfd/ezx-pcap.c
> index 732664f..86d3948 100644
> --- a/drivers/mfd/ezx-pcap.c
> +++ b/drivers/mfd/ezx-pcap.c
> @@ -107,6 +107,29 @@ int ezx_pcap_read(struct pcap_chip *pcap, u8 reg_num, u32 *value)
> }
> EXPORT_SYMBOL_GPL(ezx_pcap_read);
>
> +int ezx_pcap_set_bits(struct pcap_chip *pcap, u8 reg_num, u32 mask, u32 val)
> +{
> + int ret;
> + u32 tmp = PCAP_REGISTER_READ_OP_BIT |
> + (reg_num << PCAP_REGISTER_ADDRESS_SHIFT);
> +
> + mutex_lock(&pcap->io_mutex);
> + ret = ezx_pcap_putget(pcap, &tmp);
> + if (ret)
> + goto out_unlock;
> +
> + tmp &= (PCAP_REGISTER_VALUE_MASK & ~mask);
> + tmp |= (val & mask) | PCAP_REGISTER_WRITE_OP_BIT |
> + (reg_num << PCAP_REGISTER_ADDRESS_SHIFT);
> +
> + ret = ezx_pcap_putget(pcap, &tmp);
> +out_unlock:
> + mutex_unlock(&pcap->io_mutex);
> +
> + return ret;
> +}
> +EXPORT_SYMBOL_GPL(ezx_pcap_set_bits);
> +
> /* IRQ */
> int irq_to_pcap(struct pcap_chip *pcap, int irq)
> {
> diff --git a/include/linux/mfd/ezx-pcap.h b/include/linux/mfd/ezx-pcap.h
> index b15caac..dec82b0 100644
> --- a/include/linux/mfd/ezx-pcap.h
> +++ b/include/linux/mfd/ezx-pcap.h
> @@ -25,6 +25,7 @@ struct pcap_chip;
>
> int ezx_pcap_write(struct pcap_chip *, u8, u32);
> int ezx_pcap_read(struct pcap_chip *, u8, u32 *);
> +int ezx_pcap_set_bits(struct pcap_chip *, u8, u32, u32);
> int pcap_to_irq(struct pcap_chip *, int);
> int irq_to_pcap(struct pcap_chip *, int);
> int pcap_adc_async(struct pcap_chip *, u8, u32, u8[], void *, void *);
> --
> tg: (e94c381..) pcap/set_bits (depends on: pcap/fix-irq-handler)
>
> --
> Daniel Ribeiro



--
Intel Open Source Technology Centre
http://oss.intel.com/