isp1704_charger: Allow board specific powering routine

The ISP1704/1707 chip can be put to full power down
state by asserting the CHIP_SEL line. This patch enables
platform or board specific hooks to put the device into
power down mode in case not needed.

This patch is a preparation for enabling this powering
routine in n900 (rx-51) devices.

Thanks to Heikki Krogerus for helping out with the patch.

Signed-off-by: Kalle Jokiniemi <kalle.jokiniemi@nokia.com>
Acked-By: Heikki Krogerus <heikki.krogerus@nokia.com>
Signed-off-by: Anton Vorontsov <cbouatmailru@gmail.com>

diff --git a/drivers/power/isp1704_charger.c b/drivers/power/isp1704_charger.c
index 2ad9b14a5ce37c4ec15f8cb8b319c7845e982c4f..f6d72b402a8e3dc48d37319f6ebac236df71d60a 100644 (file)
--- a/drivers/power/isp1704_charger.c
+++ b/drivers/power/isp1704_charger.c
@@ -33,6 +33,7 @@
 #include <linux/usb/ulpi.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
+#include <linux/power/isp1704_charger.h>
 
 /* Vendor specific Power Control register */
 #define ISP1704_PWR_CTRL               0x3d
@@ -70,6 +71,18 @@ struct isp1704_charger {
        unsigned                max_power;
 };
 
+/*
+ * Disable/enable the power from the isp1704 if a function for it
+ * has been provided with platform data.
+ */
+static void isp1704_charger_set_power(struct isp1704_charger *isp, bool on)
+{
+       struct isp1704_charger_data     *board = isp->dev->platform_data;
+
+       if (board->set_power)
+               board->set_power(on);
+}
+
 /*
  * Determine is the charging port DCP (dedicated charger) or CDP (Host/HUB
  * chargers).
@@ -222,6 +235,9 @@ static void isp1704_charger_work(struct work_struct *data)
 
        mutex_lock(&lock);
 
+       if (event != USB_EVENT_NONE)
+               isp1704_charger_set_power(isp, 1);
+
        switch (event) {
        case USB_EVENT_VBUS:
                isp->online = true;
@@ -269,6 +285,8 @@ static void isp1704_charger_work(struct work_struct *data)
                 */
                if (isp->otg->gadget)
                        usb_gadget_disconnect(isp->otg->gadget);
+
+               isp1704_charger_set_power(isp, 0);
                break;
        case USB_EVENT_ENUMERATED:
                if (isp->present)
@@ -394,6 +412,8 @@ static int __devinit isp1704_charger_probe(struct platform_device *pdev)
        isp->dev = &pdev->dev;
        platform_set_drvdata(pdev, isp);
 
+       isp1704_charger_set_power(isp, 1);
+
        ret = isp1704_test_ulpi(isp);
        if (ret < 0)
                goto fail1;
@@ -434,6 +454,7 @@ static int __devinit isp1704_charger_probe(struct platform_device *pdev)
 
        /* Detect charger if VBUS is valid (the cable was already plugged). */
        ret = otg_io_read(isp->otg, ULPI_USB_INT_STS);
+       isp1704_charger_set_power(isp, 0);
        if ((ret & ULPI_INT_VBUS_VALID) && !isp->otg->default_a) {
                isp->event = USB_EVENT_VBUS;
                schedule_work(&isp->work);
@@ -459,6 +480,7 @@ static int __devexit isp1704_charger_remove(struct platform_device *pdev)
        otg_unregister_notifier(isp->otg, &isp->nb);
        power_supply_unregister(&isp->psy);
        otg_put_transceiver(isp->otg);
+       isp1704_charger_set_power(isp, 0);
        kfree(isp);
 
        return 0;

diff --git a/include/linux/power/isp1704_charger.h b/include/linux/power/isp1704_charger.h
new file mode 100644 (file)
index 0000000..68096a6
--- /dev/null
+++ b/include/linux/power/isp1704_charger.h
@@ -0,0 +1,29 @@
+/*
+ * ISP1704 USB Charger Detection driver
+ *
+ * Copyright (C) 2011 Nokia Corporation
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
+
+#ifndef __ISP1704_CHARGER_H
+#define __ISP1704_CHARGER_H
+
+struct isp1704_charger_data {
+       void            (*set_power)(bool on);
+};
+
+#endif