From: Anton Vorontsov <cbouatmailru@gmail.com>
To: Haojian Zhuang <haojian.zhuang@gmail.com>,
Samuel Ortiz <sameo@linux.intel.com>,
Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: Philip Rakity <prakity@marvell.com>,
David Woodhouse <dwmw2@infradead.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] power: max8925. remove support for irq bits that do not exist
Date: Fri, 25 Nov 2011 23:09:33 +0400 [thread overview]
Message-ID: <20111125190933.GA13179@oksana.dev.rtsoft.ru> (raw)
In-Reply-To: <CAN1soZx1DU3eYwOJvMNF5jdNorkfWuLpBwk5eV5VA89Bw5d4rg@mail.gmail.com>
MFD guys: OK to go through battery GIT tree?
On Sat, Aug 27, 2011 at 07:16:30AM +0800, Haojian Zhuang wrote:
> On Sat, Aug 27, 2011 at 6:27 AM, Philip Rakity <prakity@marvell.com> wrote:
> >
> > The max8925 cannot return usb status. The bits
> > - [MAX8925_IRQ_VCHG_USB_OVP] = {
> > - .reg = MAX8925_CHG_IRQ1,
> > - .mask_reg = MAX8925_CHG_IRQ1_MASK,
> > - .offs = 1 << 3,
> > - },
> > - [MAX8925_IRQ_VCHG_USB_F] = {
> > - .reg = MAX8925_CHG_IRQ1,
> > - .mask_reg = MAX8925_CHG_IRQ1_MASK,
> > - .offs = 1 << 4,
> > - },
> > - [MAX8925_IRQ_VCHG_USB_R] = {
> > - .reg = MAX8925_CHG_IRQ1,
> > - .mask_reg = MAX8925_CHG_IRQ1_MASK,
> > - .offs = 1 << 5,
> > - },
> >
> > do not exist in the irq register.
> >
> > Signed-off-by: Philip Rakity <prakity@marvell.com>
> > ---
> > drivers/mfd/max8925-core.c | 15 ---------------
> > drivers/power/max8925_power.c | 13 -------------
> > include/linux/mfd/max8925.h | 3 ---
> > 3 files changed, 0 insertions(+), 31 deletions(-)
> >
> > diff --git a/drivers/mfd/max8925-core.c b/drivers/mfd/max8925-core.c
> > index e1e59c9..ca881ef 100644
> > --- a/drivers/mfd/max8925-core.c
> > +++ b/drivers/mfd/max8925-core.c
> > @@ -210,21 +210,6 @@ static struct max8925_irq_data max8925_irqs[] = {
> > .mask_reg = MAX8925_CHG_IRQ1_MASK,
> > .offs = 1 << 2,
> > },
> > - [MAX8925_IRQ_VCHG_USB_OVP] = {
> > - .reg = MAX8925_CHG_IRQ1,
> > - .mask_reg = MAX8925_CHG_IRQ1_MASK,
> > - .offs = 1 << 3,
> > - },
> > - [MAX8925_IRQ_VCHG_USB_F] = {
> > - .reg = MAX8925_CHG_IRQ1,
> > - .mask_reg = MAX8925_CHG_IRQ1_MASK,
> > - .offs = 1 << 4,
> > - },
> > - [MAX8925_IRQ_VCHG_USB_R] = {
> > - .reg = MAX8925_CHG_IRQ1,
> > - .mask_reg = MAX8925_CHG_IRQ1_MASK,
> > - .offs = 1 << 5,
> > - },
> > [MAX8925_IRQ_VCHG_THM_OK_R] = {
> > .reg = MAX8925_CHG_IRQ2,
> > .mask_reg = MAX8925_CHG_IRQ2_MASK,
> > diff --git a/drivers/power/max8925_power.c b/drivers/power/max8925_power.c
> > index 5e4e046..377d1e6 100644
> > --- a/drivers/power/max8925_power.c
> > +++ b/drivers/power/max8925_power.c
> > @@ -120,16 +120,6 @@ static irqreturn_t max8925_charger_handler(int irq, void *data)
> > __set_charger(info, 0);
> > dev_dbg(chip->dev, "Adapter removed\n");
> > break;
> > - case MAX8925_IRQ_VCHG_USB_R:
> > - info->usb_online = 1;
> > - __set_charger(info, 1);
> > - dev_dbg(chip->dev, "USB inserted\n");
> > - break;
> > - case MAX8925_IRQ_VCHG_USB_F:
> > - info->usb_online = 0;
> > - __set_charger(info, 0);
> > - dev_dbg(chip->dev, "USB removed\n");
> > - break;
> > case MAX8925_IRQ_VCHG_THM_OK_F:
> > /* Battery is not ready yet */
> > dev_dbg(chip->dev, "Battery temperature is out of range\n");
> > @@ -370,9 +360,6 @@ static __devinit int max8925_init_charger(struct max8925_chip *chip,
> > REQUEST_IRQ(MAX8925_IRQ_VCHG_DC_F, "ac-remove");
> > REQUEST_IRQ(MAX8925_IRQ_VCHG_DC_R, "ac-insert");
> > }
> > - REQUEST_IRQ(MAX8925_IRQ_VCHG_USB_OVP, "usb-ovp");
> > - REQUEST_IRQ(MAX8925_IRQ_VCHG_USB_F, "usb-remove");
> > - REQUEST_IRQ(MAX8925_IRQ_VCHG_USB_R, "usb-insert");
> > if (!info->no_temp_support) {
> > REQUEST_IRQ(MAX8925_IRQ_VCHG_THM_OK_R, "batt-temp-in-range");
> > REQUEST_IRQ(MAX8925_IRQ_VCHG_THM_OK_F, "batt-temp-out-range");
> > diff --git a/include/linux/mfd/max8925.h b/include/linux/mfd/max8925.h
> > index 008f807..b8e6d94 100644
> > --- a/include/linux/mfd/max8925.h
> > +++ b/include/linux/mfd/max8925.h
> > @@ -167,9 +167,6 @@ enum {
> > MAX8925_IRQ_VCHG_DC_OVP,
> > MAX8925_IRQ_VCHG_DC_F,
> > MAX8925_IRQ_VCHG_DC_R,
> > - MAX8925_IRQ_VCHG_USB_OVP,
> > - MAX8925_IRQ_VCHG_USB_F,
> > - MAX8925_IRQ_VCHG_USB_R,
> > MAX8925_IRQ_VCHG_THM_OK_R,
> > MAX8925_IRQ_VCHG_THM_OK_F,
> > MAX8925_IRQ_VCHG_SYSLOW_F,
> > --
> > 1.7.6
> >
> >
> >
>
> Loop maintainer
--
Anton Vorontsov
Email: cbouatmailru@gmail.com
next prev parent reply other threads:[~2011-11-25 19:09 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-26 22:27 [PATCH] power: max8925. remove support for irq bits that do not exist Philip Rakity
2011-08-26 23:16 ` Haojian Zhuang
2011-11-25 19:09 ` Anton Vorontsov [this message]
2011-12-12 17:33 ` Samuel Ortiz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20111125190933.GA13179@oksana.dev.rtsoft.ru \
--to=cbouatmailru@gmail.com \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=dwmw2@infradead.org \
--cc=haojian.zhuang@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=prakity@marvell.com \
--cc=sameo@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.