[PATCH v2 1/3] drivers: power: twl4030_charger: fix link problems when building as module

[PATCH v2 1/3] drivers: power: twl4030_charger: fix link problems when building as module

[Marek Belisko]

If either twl4030_charger or twl4030_madc is configured as MODULE,
we get build (link) errors.

To solve, the direct call of twl4030_get_madc_conversion() is replaced
by a call to iio_read_channel_processed().

Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
Signed-off-by: Marek Belisko <marek@goldelico.com>
---
changes from V1: added missing iio_channel_release + document and add new DT bindings

 drivers/power/twl4030_charger.c | 36 ++++++++++++++++++++++++++++--------
 1 file changed, 28 insertions(+), 8 deletions(-)

diff --git a/drivers/power/twl4030_charger.c b/drivers/power/twl4030_charger.c
index f4f2c1f..5e68be4 100644
--- a/drivers/power/twl4030_charger.c
+++ b/drivers/power/twl4030_charger.c
@@ -22,7 +22,7 @@
 #include <linux/power_supply.h>
 #include <linux/notifier.h>
 #include <linux/usb/otg.h>
-#include <linux/i2c/twl4030-madc.h>
+#include <linux/iio/consumer.h>
 
 #define TWL4030_BCIMDEN		0x00
 #define TWL4030_BCIMDKEY	0x01
@@ -96,12 +96,17 @@
  * If AC (Accessory Charger) voltage exceeds 4.5V (MADC 11)
  * then AC is available.
  */
-static inline int ac_available(void)
+static inline int ac_available(struct iio_channel *channel_vac)
 {
-	return twl4030_get_madc_conversion(11) > 4500;
+	int val, err;
+
+	err = iio_read_channel_processed(channel_vac, &val);
+	if (err < 0)
+		return 0;
+	return val > 4500;
 }
 #else
-static inline int ac_available(void)
+static inline int ac_available(struct iio_channel *channel_vac)
 {
 	return 0;
 }
@@ -128,6 +133,7 @@ struct twl4030_bci {
 	 */
 	unsigned int		ichg_eoc, ichg_lo, ichg_hi;
 	unsigned int		usb_cur, ac_cur;
+	struct iio_channel	*channel_vac;
 	bool			ac_is_active;
 	int			usb_mode, ac_mode; /* charging mode requested */
 #define	CHARGE_OFF	0
@@ -278,7 +284,7 @@ static int twl4030_charger_update_current(struct twl4030_bci *bci)
 	 * If AC (Accessory Charger) voltage exceeds 4.5V (MADC 11)
 	 * and AC is enabled, set current for 'ac'
 	 */
-	if (ac_available()) {
+	if (ac_available(bci->channel_vac)) {
 		cur = bci->ac_cur;
 		bci->ac_is_active = true;
 	} else {
@@ -1048,6 +1054,12 @@ static int twl4030_bci_probe(struct platform_device *pdev)
 		return ret;
 	}
 
+	bci->channel_vac = iio_channel_get(&pdev->dev, "vac");
+	if (IS_ERR(bci->channel_vac)) {
+		dev_err(&pdev->dev, "could not request vac iio channel");
+		return PTR_ERR(bci->channel_vac);
+	}
+
 	INIT_WORK(&bci->work, twl4030_bci_usb_work);
 	INIT_DELAYED_WORK(&bci->current_worker, twl4030_current_worker);
 
@@ -1061,8 +1073,10 @@ static int twl4030_bci_probe(struct platform_device *pdev)
 			bci->transceiver = devm_usb_get_phy_by_node(
 				bci->dev, phynode, &bci->usb_nb);
 			if (IS_ERR(bci->transceiver) &&
-			    PTR_ERR(bci->transceiver) == -EPROBE_DEFER)
-				return -EPROBE_DEFER;
+			    PTR_ERR(bci->transceiver) == -EPROBE_DEFER) {
+				ret = -EPROBE_DEFER;
+				goto fail;
+			}
 		}
 	}
 
@@ -1073,7 +1087,7 @@ static int twl4030_bci_probe(struct platform_device *pdev)
 			       TWL4030_INTERRUPTS_BCIIMR1A);
 	if (ret < 0) {
 		dev_err(&pdev->dev, "failed to unmask interrupts: %d\n", ret);
-		return ret;
+		goto fail;
 	}
 
 	reg = ~(u32)(TWL4030_VBATOV | TWL4030_VBUSOV | TWL4030_ACCHGOV);
@@ -1106,6 +1120,10 @@ static int twl4030_bci_probe(struct platform_device *pdev)
 		twl4030_charger_enable_backup(0, 0);
 
 	return 0;
+fail:
+	iio_channel_release(bci->channel_vac);
+
+	return ret;
 }
 
 static int __exit twl4030_bci_remove(struct platform_device *pdev)
@@ -1116,6 +1134,8 @@ static int __exit twl4030_bci_remove(struct platform_device *pdev)
 	twl4030_charger_enable_usb(bci, false);
 	twl4030_charger_enable_backup(0, 0);
 
+	iio_channel_release(bci->channel_vac);
+
 	device_remove_file(&bci->usb->dev, &dev_attr_max_current);
 	device_remove_file(&bci->usb->dev, &dev_attr_mode);
 	device_remove_file(&bci->ac->dev, &dev_attr_max_current);
-- 
1.9.1

[PATCH v2 2/3] Documentation: DT: twl-charger: document new iio properties

[Marek Belisko]

Document added iio properties to avoid using direct funcion call from twl4030-madc
driver.

Signed-off-by: Marek Belisko <marek@goldelico.com>
---
 Documentation/devicetree/bindings/power/twl-charger.txt | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Documentation/devicetree/bindings/power/twl-charger.txt b/Documentation/devicetree/bindings/power/twl-charger.txt
index 3b4ea1b..54faee6 100644
--- a/Documentation/devicetree/bindings/power/twl-charger.txt
+++ b/Documentation/devicetree/bindings/power/twl-charger.txt
@@ -15,6 +15,9 @@ Required properties:
   - "ti,twl4030-bci"
 - interrupts: two interrupt lines from the TWL SIH (secondary
   interrupt handler) - interrupts 9 and 2.
+- io-channels: Should contain following: <&twl4030_madc 11>
+- io-channel-names: Shoud contains following value:
+* "vac" - ADC channel for measuring the voltage of the external AC charger
 
 Optional properties:
 - ti,bb-uvolt: microvolts for charging the backup battery.
@@ -25,6 +28,8 @@ Examples:
 bci {
    compatible = "ti,twl4030-bci";
    interrupts = <9>, <2>;
+   io-channels = <&twl4030_madc 11>;
+   io-channel-name = "vac";
    ti,bb-uvolt = <3200000>;
    ti,bb-uamp = <150>;
 };
-- 
1.9.1

[PATCH v2 3/3] ARM: dts: twl4030: add iio properties for bci subnode

[Marek Belisko]

Added new iio properties which are required for twl4030-charger driver and
allow to use twl4030-madc indirectly.

Signed-off-by: Marek Belisko <marek@goldelico.com>
---
 arch/arm/boot/dts/twl4030.dtsi | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/arm/boot/dts/twl4030.dtsi b/arch/arm/boot/dts/twl4030.dtsi
index 36ae916..482b7aa 100644
--- a/arch/arm/boot/dts/twl4030.dtsi
+++ b/arch/arm/boot/dts/twl4030.dtsi
@@ -22,6 +22,8 @@
 	charger: bci {
 		compatible = "ti,twl4030-bci";
 		interrupts = <9>, <2>;
+		io-channels = <&twl4030_madc 11>;
+		io-channel-name = "vac";
 		bci3v1-supply = <&vusb3v1>;
 	};
 
-- 
1.9.1

Re: [PATCH v2 1/3] drivers: power: twl4030_charger: fix link problems when building as module

[Sebastian Reichel]

[-- Attachment #1: Type: text/plain, Size: 816 bytes --]

Hi Marek,

On Tue, Sep 22, 2015 at 10:19:29PM +0200, Marek Belisko wrote:
> If either twl4030_charger or twl4030_madc is configured as MODULE,
> we get build (link) errors.
> 
> To solve, the direct call of twl4030_get_madc_conversion() is replaced
> by a call to iio_read_channel_processed().
>
> Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
> Signed-off-by: Marek Belisko <marek@goldelico.com>
> ---
> changes from V1: added missing iio_channel_release + document and add new DT bindings

That was fast :) Patchset looks fine to me except for one last
thing: Let's make the iio-channel optional, so that old DT blobs
are still supported. Also the IS_REACHABLE(CONFIG_TWL4030_MADC)
check can be removed, it should no longer be needed with
iio_read_channel_processed().

-- Sebastian

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [PATCH v2 1/3] drivers: power: twl4030_charger: fix link problems when building as module

[Belisko Marek]

Hi Sebastian,

On Tue, Sep 22, 2015 at 11:29 PM, Sebastian Reichel <sre@kernel.org> wrote:
> Hi Marek,
>
> On Tue, Sep 22, 2015 at 10:19:29PM +0200, Marek Belisko wrote:
>> If either twl4030_charger or twl4030_madc is configured as MODULE,
>> we get build (link) errors.
>>
>> To solve, the direct call of twl4030_get_madc_conversion() is replaced
>> by a call to iio_read_channel_processed().
>>
>> Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
>> Signed-off-by: Marek Belisko <marek@goldelico.com>
>> ---
>> changes from V1: added missing iio_channel_release + document and add new DT bindings
>
> That was fast :) Patchset looks fine to me except for one last
> thing: Let's make the iio-channel optional, so that old DT blobs
> are still supported. Also the IS_REACHABLE(CONFIG_TWL4030_MADC)
> check can be removed, it should no longer be needed with
> iio_read_channel_processed().
OK I updated driver code to pass when 'vac' property isn't found in
DT. Should I mark it also
in DT bindings or keep it as it was in v2? Thanks.
>
> -- Sebastian

BR,

marek


-- 
as simple and primitive as possible
-------------------------------------------------
Marek Belisko - OPEN-NANDRA
Freelance Developer

Ruska Nova Ves 219 | Presov, 08005 Slovak Republic
Tel: +421 915 052 184
skype: marekwhite
twitter: #opennandra
web: http://open-nandra.com

Re: [PATCH v2 1/3] drivers: power: twl4030_charger: fix link problems when building as module

[Sebastian Reichel]

[-- Attachment #1: Type: text/plain, Size: 1270 bytes --]

Hi,

On Thu, Sep 24, 2015 at 09:09:15PM +0200, Belisko Marek wrote:
> On Tue, Sep 22, 2015 at 11:29 PM, Sebastian Reichel <sre@kernel.org> wrote:
> > On Tue, Sep 22, 2015 at 10:19:29PM +0200, Marek Belisko wrote:
> >> If either twl4030_charger or twl4030_madc is configured as MODULE,
> >> we get build (link) errors.
> >>
> >> To solve, the direct call of twl4030_get_madc_conversion() is replaced
> >> by a call to iio_read_channel_processed().
> >>
> >> Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
> >> Signed-off-by: Marek Belisko <marek@goldelico.com>
> >> ---
> >> changes from V1: added missing iio_channel_release + document and add new DT bindings
> >
> > That was fast :) Patchset looks fine to me except for one last
> > thing: Let's make the iio-channel optional, so that old DT blobs
> > are still supported. Also the IS_REACHABLE(CONFIG_TWL4030_MADC)
> > check can be removed, it should no longer be needed with
> > iio_read_channel_processed().
> OK I updated driver code to pass when 'vac' property isn't found in
> DT. Should I mark it also
> in DT bindings or keep it as it was in v2? Thanks.

Move it from "Required properties:" to "Optional properties:". Maybe
stating, that the feature does not work, if it's not provided.

-- Sebastian

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]