All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Pali Rohár" <pali.rohar@gmail.com>
To: Tony Lindgren <tony@atomide.com>, Anton Vorontsov <anton@enomsg.org>
Cc: "Russell King" <linux@arm.linux.org.uk>,
	"David Woodhouse" <dwmw2@infradead.org>,
	"Felipe Balbi" <balbi@ti.com>,
	"Greg Kroah-Hartman" <gregkh@linuxfoundation.org>,
	linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
	linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org,
	freemangordon@abv.bg, aaro.koskinen@iki.fi, pavel@ucw.cz,
	"Pali Rohár" <pali.rohar@gmail.com>
Subject: [PATCH 3/4] power: isp1704_charger: Add callback function set_current
Date: Sun,  8 Sep 2013 10:50:38 +0200	[thread overview]
Message-ID: <1378630239-10006-4-git-send-email-pali.rohar@gmail.com> (raw)
In-Reply-To: <1378630239-10006-1-git-send-email-pali.rohar@gmail.com>

This patch add callback function set_current to platform data.
Driver will call this function when isp1704 change current
and board provided this callback funtion in platform data.

This patch is needed for Nokia RX-51 to tell bq2415x charging
chip about connected wallcharger events.

Signed-off-by: Pali Rohár <pali.rohar@gmail.com>
---
 drivers/power/isp1704_charger.c       |   16 ++++++++++++++++
 include/linux/power/isp1704_charger.h |    1 +
 2 files changed, 17 insertions(+)

diff --git a/drivers/power/isp1704_charger.c b/drivers/power/isp1704_charger.c
index f726cb6..4f20a1a 100644
--- a/drivers/power/isp1704_charger.c
+++ b/drivers/power/isp1704_charger.c
@@ -91,6 +91,18 @@ static void isp1704_charger_set_power(struct isp1704_charger *isp, bool on)
 }
 
 /*
+ * Set charger current from isp1704 if a function for it
+ * has been provided with platform data.
+ */
+static void isp1704_charger_set_current(struct isp1704_charger *isp, int mA)
+{
+	struct isp1704_charger_data *board = isp->dev->platform_data;
+
+	if (board && board->set_current)
+		board->set_current(mA);
+}
+
+/*
  * Determine is the charging port DCP (dedicated charger) or CDP (Host/HUB
  * chargers).
  *
@@ -257,6 +269,7 @@ static void isp1704_charger_work(struct work_struct *data)
 			if (isp1704_charger_detect_dcp(isp)) {
 				isp->psy.type = POWER_SUPPLY_TYPE_USB_DCP;
 				isp->current_max = 1800;
+				isp1704_charger_set_current(isp, 1800);
 			} else {
 				isp->psy.type = POWER_SUPPLY_TYPE_USB;
 				isp->current_max = 500;
@@ -277,6 +290,8 @@ static void isp1704_charger_work(struct work_struct *data)
 
 			if (isp->current_max > 100)
 				isp->psy.type = POWER_SUPPLY_TYPE_USB_CDP;
+
+			isp1704_charger_set_current(isp, isp->current_max);
 		}
 		break;
 	case USB_EVENT_NONE:
@@ -297,6 +312,7 @@ static void isp1704_charger_work(struct work_struct *data)
 			usb_gadget_disconnect(isp->phy->otg->gadget);
 
 		isp1704_charger_set_power(isp, 0);
+		isp1704_charger_set_current(isp, 0);
 		break;
 	default:
 		goto out;
diff --git a/include/linux/power/isp1704_charger.h b/include/linux/power/isp1704_charger.h
index 68096a6..d154b02 100644
--- a/include/linux/power/isp1704_charger.h
+++ b/include/linux/power/isp1704_charger.h
@@ -24,6 +24,7 @@
 
 struct isp1704_charger_data {
 	void		(*set_power)(bool on);
+	void		(*set_current)(int mA);
 };
 
 #endif
-- 
1.7.10.4


WARNING: multiple messages have this Message-ID (diff)
From: pali.rohar@gmail.com (Pali Rohár)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 3/4] power: isp1704_charger: Add callback function set_current
Date: Sun,  8 Sep 2013 10:50:38 +0200	[thread overview]
Message-ID: <1378630239-10006-4-git-send-email-pali.rohar@gmail.com> (raw)
In-Reply-To: <1378630239-10006-1-git-send-email-pali.rohar@gmail.com>

This patch add callback function set_current to platform data.
Driver will call this function when isp1704 change current
and board provided this callback funtion in platform data.

This patch is needed for Nokia RX-51 to tell bq2415x charging
chip about connected wallcharger events.

Signed-off-by: Pali Roh?r <pali.rohar@gmail.com>
---
 drivers/power/isp1704_charger.c       |   16 ++++++++++++++++
 include/linux/power/isp1704_charger.h |    1 +
 2 files changed, 17 insertions(+)

diff --git a/drivers/power/isp1704_charger.c b/drivers/power/isp1704_charger.c
index f726cb6..4f20a1a 100644
--- a/drivers/power/isp1704_charger.c
+++ b/drivers/power/isp1704_charger.c
@@ -91,6 +91,18 @@ static void isp1704_charger_set_power(struct isp1704_charger *isp, bool on)
 }
 
 /*
+ * Set charger current from isp1704 if a function for it
+ * has been provided with platform data.
+ */
+static void isp1704_charger_set_current(struct isp1704_charger *isp, int mA)
+{
+	struct isp1704_charger_data *board = isp->dev->platform_data;
+
+	if (board && board->set_current)
+		board->set_current(mA);
+}
+
+/*
  * Determine is the charging port DCP (dedicated charger) or CDP (Host/HUB
  * chargers).
  *
@@ -257,6 +269,7 @@ static void isp1704_charger_work(struct work_struct *data)
 			if (isp1704_charger_detect_dcp(isp)) {
 				isp->psy.type = POWER_SUPPLY_TYPE_USB_DCP;
 				isp->current_max = 1800;
+				isp1704_charger_set_current(isp, 1800);
 			} else {
 				isp->psy.type = POWER_SUPPLY_TYPE_USB;
 				isp->current_max = 500;
@@ -277,6 +290,8 @@ static void isp1704_charger_work(struct work_struct *data)
 
 			if (isp->current_max > 100)
 				isp->psy.type = POWER_SUPPLY_TYPE_USB_CDP;
+
+			isp1704_charger_set_current(isp, isp->current_max);
 		}
 		break;
 	case USB_EVENT_NONE:
@@ -297,6 +312,7 @@ static void isp1704_charger_work(struct work_struct *data)
 			usb_gadget_disconnect(isp->phy->otg->gadget);
 
 		isp1704_charger_set_power(isp, 0);
+		isp1704_charger_set_current(isp, 0);
 		break;
 	default:
 		goto out;
diff --git a/include/linux/power/isp1704_charger.h b/include/linux/power/isp1704_charger.h
index 68096a6..d154b02 100644
--- a/include/linux/power/isp1704_charger.h
+++ b/include/linux/power/isp1704_charger.h
@@ -24,6 +24,7 @@
 
 struct isp1704_charger_data {
 	void		(*set_power)(bool on);
+	void		(*set_current)(int mA);
 };
 
 #endif
-- 
1.7.10.4

  parent reply	other threads:[~2013-09-08  8:51 UTC|newest]

Thread overview: 148+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-09-08  8:50 [PATCH 0/4] Add support for charging battery in Nokia RX-51 Pali Rohár
2013-09-08  8:50 ` Pali Rohár
2013-09-08  8:50 ` [PATCH 1/4] usb: musb: Call atomic_notifier_call_chain when status is changed Pali Rohár
2013-09-08  8:50   ` Pali Rohár
2013-09-17 15:48   ` Felipe Balbi
2013-09-17 15:48     ` Felipe Balbi
2013-09-17 15:48     ` Felipe Balbi
2013-09-17 15:49   ` Felipe Balbi
2013-09-17 15:49     ` Felipe Balbi
2013-09-17 15:49     ` Felipe Balbi
2013-09-17 16:05     ` Pali Rohár
2013-09-17 16:05       ` Pali Rohár
2013-09-17 16:05       ` Pali Rohár
2013-09-17 16:08       ` Felipe Balbi
2013-09-17 16:08         ` Felipe Balbi
2013-09-17 16:08         ` Felipe Balbi
2013-09-17 19:28         ` Pali Rohár
2013-09-17 19:28           ` Pali Rohár
2013-09-18  1:49           ` Felipe Balbi
2013-09-18  1:49             ` Felipe Balbi
2013-09-18  1:49             ` Felipe Balbi
2013-09-18  8:20             ` Pali Rohár
2013-09-18  8:20               ` Pali Rohár
2013-09-18  8:20               ` Pali Rohár
2013-09-18  9:04               ` Javier Martinez Canillas
2013-09-18  9:04                 ` Javier Martinez Canillas
2013-09-18  9:04                 ` Javier Martinez Canillas
2013-09-18 13:30                 ` Pavel Machek
2013-09-18 13:30                   ` Pavel Machek
2013-09-18 13:57                   ` Javier Martinez Canillas
2013-09-18 13:57                     ` Javier Martinez Canillas
2013-09-18 14:22                     ` Pavel Machek
2013-09-18 14:22                       ` Pavel Machek
2013-09-18 14:35                       ` Pavel Machek
2013-09-18 14:35                         ` Pavel Machek
2013-09-18 16:25                         ` Felipe Balbi
2013-09-18 16:25                           ` Felipe Balbi
2013-09-18 16:25                           ` Felipe Balbi
2013-09-18 14:53                       ` Javier Martinez Canillas
2013-09-18 14:53                         ` Javier Martinez Canillas
2013-09-18 15:56                     ` Pali Rohár
2013-09-18 15:56                       ` Pali Rohár
2013-09-18 15:56                       ` Pali Rohár
2013-09-18 16:36                       ` Felipe Balbi
2013-09-18 16:36                         ` Felipe Balbi
2013-09-18 16:36                         ` Felipe Balbi
2013-09-18 16:43                         ` Pali Rohár
2013-09-18 16:43                           ` Pali Rohár
2013-09-18 16:43                           ` Pali Rohár
2013-09-18 16:48                           ` Felipe Balbi
2013-09-18 16:48                             ` Felipe Balbi
2013-09-18 16:48                             ` Felipe Balbi
2013-09-18 17:03                             ` [PATCH usb 1/2] usb: musb: Add missing ATOMIC_INIT_NOTIFIER_HEAD Pali Rohár
2013-09-18 17:03                               ` Pali Rohár
2013-09-18 17:03                               ` Pali Rohár
2013-09-25  8:17                               ` Pali Rohár
2013-09-25  8:17                                 ` Pali Rohár
2013-09-25  8:17                                 ` Pali Rohár
2013-09-25 20:33                                 ` Felipe Balbi
2013-09-25 20:33                                   ` Felipe Balbi
2013-09-25 20:33                                   ` Felipe Balbi
2013-09-26  0:00                                   ` Pavel Machek
2013-09-26  0:00                                     ` Pavel Machek
2013-10-01 14:22                                     ` Felipe Balbi
2013-10-01 14:22                                       ` Felipe Balbi
2013-10-01 14:22                                       ` Felipe Balbi
2013-09-18 17:03                             ` [PATCH usb 2/2] usb: musb: Call atomic_notifier_call_chain when status is changed Pali Rohár
2013-09-18 17:03                               ` Pali Rohár
2013-09-18 17:03                               ` Pali Rohár
2013-09-08  8:50 ` [PATCH 2/4] power: isp1704_charger: Fix driver to work with changes introduced in v3.5 Pali Rohár
2013-09-08  8:50   ` Pali Rohár
2013-10-22 21:03   ` Anton Vorontsov
2013-10-22 21:03     ` Anton Vorontsov
2013-09-08  8:50 ` Pali Rohár [this message]
2013-09-08  8:50   ` [PATCH 3/4] power: isp1704_charger: Add callback function set_current Pali Rohár
2013-09-08  8:50 ` [PATCH 4/4] RX-51: Add platform function and data for bq24150a charger Pali Rohár
2013-09-08  8:50   ` Pali Rohár
2013-09-09 13:39   ` Sebastian Reichel
2013-09-09 13:39     ` Sebastian Reichel
2013-09-20 19:22   ` Pali Rohár
2013-09-20 19:22     ` Pali Rohár
2013-09-23 18:03     ` Tony Lindgren
2013-09-23 18:03       ` Tony Lindgren
2013-09-23 19:16       ` Pali Rohár
2013-09-23 19:16         ` Pali Rohár
2013-09-23 20:00         ` Sebastian Reichel
2013-09-23 20:00           ` Sebastian Reichel
2013-09-23 20:06           ` Pali Rohár
2013-09-23 20:06             ` Pali Rohár
2013-09-23 20:47             ` Sebastian Reichel
2013-09-23 20:47               ` Sebastian Reichel
2013-09-23 23:11               ` Tony Lindgren
2013-09-23 23:11                 ` Tony Lindgren
2013-09-24  0:05               ` Pavel Machek
2013-09-24  0:05                 ` Pavel Machek
2013-09-24 17:05               ` Pali Rohár
2013-09-24 17:05                 ` Pali Rohár
2013-09-24 20:50                 ` Sebastian Reichel
2013-09-24 20:50                   ` Sebastian Reichel
2013-09-14  9:38 ` [PATCH 0/4] Add support for charging battery in Nokia RX-51 Pali Rohár
2013-09-14  9:38   ` Pali Rohár
2013-09-21 13:42 ` Pali Rohár
2013-09-21 13:42   ` Pali Rohár
2013-11-19 10:18 ` [PATCH v2 0/3] " Pali Rohár
2013-11-19 10:18   ` [PATCH v2 1/3] power_supply: Add power_supply notifier Pali Rohár
2013-11-19 13:10     ` Pavel Machek
2013-11-19 13:19       ` Pali Rohár
2013-11-24 17:02     ` Sebastian Reichel
2013-11-27 17:23     ` Tc, Jenny
2013-11-27 17:23       ` Tc, Jenny
2013-12-01 22:20       ` Anton Vorontsov
2013-12-01 22:23     ` Anton Vorontsov
2013-12-01 22:23       ` Anton Vorontsov
2014-01-03 11:09       ` Tc, Jenny
2014-01-03 11:09         ` Tc, Jenny
2014-01-03 16:02         ` Anton Vorontsov
2013-11-19 10:18   ` [PATCH v2 2/3] bq2415x_charger: Use power_supply notifier for automode Pali Rohár
2013-11-19 13:24     ` Pavel Machek
2013-12-24  1:58       ` Anton Vorontsov
2013-11-24 17:00     ` Sebastian Reichel
2013-11-24 19:01       ` Pali Rohár
2013-11-24 19:26         ` Sebastian Reichel
2013-11-24 19:41           ` Pali Rohár
2013-11-24 21:00             ` Sebastian Reichel
2013-11-25 14:01             ` Pavel Machek
2013-11-25 14:10               ` Pali Rohár
2013-11-25 15:18                 ` Pavel Machek
2013-11-25 18:52                   ` Pali Rohár
2013-11-24 17:18     ` Michael Trimarchi
2013-11-24 17:18       ` Michael Trimarchi
2013-11-24 19:01       ` Pali Rohár
2013-11-25 19:16         ` Michael Trimarchi
2013-11-25 19:16           ` Michael Trimarchi
2013-12-01 22:37           ` Anton Vorontsov
2013-12-02  0:02             ` Michael Trimarchi
2013-12-02  0:24               ` Anton Vorontsov
2013-12-02  1:45                 ` Michael Trimarchi
2014-01-19 20:54                   ` Sebastian Reichel
2014-01-19 20:56                     ` Michael Trimarchi
2014-01-20 10:21                     ` Russell King - ARM Linux
2014-01-20 11:24                       ` Sebastian Reichel
2013-12-06 13:32     ` Pali Rohár
2013-11-19 10:18   ` [PATCH v2 3/3] RX-51: Add platform data for bq24150a charger Pali Rohár
2013-11-19 13:32     ` Pavel Machek
2013-11-24 10:28       ` Pali Rohár
2013-11-19 14:44   ` [PATCH v2 0/3] Add support for charging battery in Nokia RX-51 Sebastian Reichel
2013-11-19 15:40     ` Tony Lindgren
2013-11-19 21:38     ` Pali Rohár

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=1378630239-10006-4-git-send-email-pali.rohar@gmail.com \
    --to=pali.rohar@gmail.com \
    --cc=aaro.koskinen@iki.fi \
    --cc=anton@enomsg.org \
    --cc=balbi@ti.com \
    --cc=dwmw2@infradead.org \
    --cc=freemangordon@abv.bg \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-omap@vger.kernel.org \
    --cc=linux-usb@vger.kernel.org \
    --cc=linux@arm.linux.org.uk \
    --cc=pavel@ucw.cz \
    --cc=tony@atomide.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.