Skip to contentSkip to conversation

Add initial support for DA9150 Charger & Fuel-Gauge IC

PATCH Superseded Adam Thomson 4 participants 20 messages Dec 22, 2014 – Jan 21, 2015

Subsystems (4)

v5 of 7 Superseded Latest is v7 →

lore
Share & tools
lore
#0 lore raw

v5 cover Add initial support for DA9150 Charger & Fuel-Gauge IC

This patch set adds initial support for the Dialog DA9150 Integrated Charger & Fuel-Gauge IC. The device also provides GPIO and GPADC functionality.

In this patch set the following is provided:
- MFD Core support and DT bindings documentation.
- IIO GPADC support and DT bindings documentation.
- Power Supply Charger support and DT bindings documentation.
- Update to MAINTAINERS file to add DA9150 files to Dialog support list.
- Update to IIO ABI document to add info regarding input current readings.

To keep patch submission from being too large, support for GPIO and Fuel-Gauge will come after initial support patches are accepted.

This patch set is baselined against the v3.19-rc1 kernel version.

Changes in v5:
- Use sizeof(*gpadc) instead of sizeof(struct da9150_gpadc) in GPADC driver.
- Fix erroneous goto for IRQ failure in GPADC driver. Now returns err directly.
- Remove IIO ABI document patch as this has been taken by maintainer.

Changes in v4:
- Correct MODULE_AUTHOR lines so e-mail addresses correctly surrounded with <>.
- Update to MFD binding document to remove unnecesary I2C reference, make module description generic, and add link to interrupt binding documentation.
- For GPADC driver, irq request moved above iio related calls in probe() to mirror correctly the remove() function ordering, as requested.
- For charger driver, remove additional sysfs entries as these are not necessary (debug only).
- For charger driver, add helper function for requesting IRQs, to make probe() function cleaner/simpler.

Changes in v3:
- IRQ register and remove helper functions removed from MFD, deemed unnecessary. Drivers using helper functions updated to use direct calls to relevant kernel framework functions.
- MFD I2C file removed and code folded into -core file as requested.
- MFD core now buildable as driver module.
- Platform data structure definition moved into core header, pdata.h removed.
- Update functions in GPADC driver to be static, where appropriate.
- Change units of GPADC readings to match ABI documentation. Updates to charger driver also made to align with this modification.
- Refactor GPADC temp calculations to use scale & offset method.
- Scale values now returned as FRACTIONAL to allow for accurate conversion in user-space.
- Tidy up of GPADC scale, offset and raw functions to return from case statements with correct return types.
- Update GPADC channel macros naming to prefix with DA9150, prevent conflict.
- GPADC GPIO voltage readings actually in 6V range, updated accordingly.
- Addition to IIO ABI document to add details on input current readings.
- Small style updates to address comments.

Changes in v2:
- Drop devicetree prefix patch as this is being dealt with separately.
- IIO framework fix patch removed from set, has already been accepted/merged.
- Use __ instead of _ for protecting #ifdefs in headers.
- Moved private data & definitions to source files and remove unwanted headers.
- Bug fix to EXPORT_SYMBOL for common functions in MFD core used by sub-devices, so they can be correctly built as kernel modules.
- Removed unnecessary channels from GPADC IIO driver to simplify code.
- For GPADC IIO driver, VBAT reading now provides scale and offset values as it is a linear scale.
- GPADC read code refactored to make it tidier.
- Remove use of flag to indicate GPADC availability. IIO framework should indicate need to defer if it's not yet instantiated.
- Unwanted comments removed.
- Removed conditional shutdown of device (Charger/MFD) as this is not needed.
- Removed AC type supply from charger as device cannot differentiate. Now just uses USB supply type.
- Removed use of invalid-tbat flag from platform data as it doesn't really add anything to the driver except forcing battery present status.
- Bug fix for checking of usb_phy validity in Charger probe() function.
- Addition of common IRQ release function to allow sub-devices to explicitly tidy up IRQs when devm clean up is too late.
- Improved tidy up of resources in charger.
- Fix location of IIO GPADC related devicetree binding document so it now resides correctly under 'adc' directory.
- Add update to MAINTAINERS file to include these files in Dialog support list.

Adam Thomson (7):
mfd: Add support for DA9150 combined charger & fuel-gauge device
mfd: da9150: Add DT binding documentation for core
iio: Add support for DA9150 GPADC
iio: da9150: Add DT binding documentation for GPADC
power: Add support for DA9150 Charger
power: da9150: Add DT binding documentation for charger
MAINTAINERS: Include DA9150 files in Dialog Semiconductor support
list.

 .../devicetree/bindings/iio/adc/da9150-gpadc.txt   |   16 +
 Documentation/devicetree/bindings/mfd/da9150.txt   |   43 +
 .../devicetree/bindings/power/da9150-charger.txt   |   26 +
 MAINTAINERS                                        |    4 +
 drivers/iio/adc/Kconfig                            |    9 +
 drivers/iio/adc/Makefile                           |    1 +
 drivers/iio/adc/da9150-gpadc.c                     |  409 +++++++
 drivers/mfd/Kconfig                                |   12 +
 drivers/mfd/Makefile                               |    2 +-
 drivers/mfd/da9150-core.c                          |  413 +++++++
 drivers/power/Kconfig                              |   12 +
 drivers/power/Makefile                             |    1 +
 drivers/power/da9150-charger.c                     |  666 +++++++++++
 include/linux/mfd/da9150/core.h                    |   68 ++
 include/linux/mfd/da9150/registers.h               | 1155 ++++++++++++++++++++
 15 files changed, 2836 insertions(+), 1 deletion(-)
 create mode 100644 Documentation/devicetree/bindings/iio/adc/da9150-gpadc.txt
 create mode 100644 Documentation/devicetree/bindings/mfd/da9150.txt
 create mode 100644 Documentation/devicetree/bindings/power/da9150-charger.txt
 create mode 100644 drivers/iio/adc/da9150-gpadc.c
 create mode 100644 drivers/mfd/da9150-core.c
 create mode 100644 drivers/power/da9150-charger.c
 create mode 100644 include/linux/mfd/da9150/core.h
 create mode 100644 include/linux/mfd/da9150/registers.h

--
1.9.3

#1 lore raw

PATCH v5 1/7 mfd: Add support for DA9150 combined charger & fuel-gauge device

DA9150 is a combined Charger and Fuel-Gauge IC, with additional GPIO and GPADC functionality.

---
 drivers/mfd/Kconfig                  |   12 +
 drivers/mfd/Makefile                 |    2 +-
 drivers/mfd/da9150-core.c            |  413 ++++++++++++
 include/linux/mfd/da9150/core.h      |   68 ++
 include/linux/mfd/da9150/registers.h | 1155 ++++++++++++++++++++++++++++++++++
 5 files changed, 1649 insertions(+), 1 deletion(-)
 create mode 100644 drivers/mfd/da9150-core.c
 create mode 100644 include/linux/mfd/da9150/core.h
 create mode 100644 include/linux/mfd/da9150/registers.h
drivers/mfd/Kconfig +12 -0
index 2e6b731..56e80d2 100644
@@ -195,6 +195,18 @@ config MFD_DA9063
 	  Additional drivers must be enabled in order to use the functionality
 	  of the device.
 
+config MFD_DA9150
+	tristate "Dialog Semiconductor DA9150 Charger Fuel-Gauge chip"
+	depends on I2C=y
+	select MFD_CORE
+	select REGMAP_I2C
+	select REGMAP_IRQ
+	help
+	  This adds support for the DA9150 integrated charger and fuel-gauge
+	  chip. This driver provides common support for accessing the device.
+	  Additional drivers must be enabled in order to use the specific
+	  features of the device.
+
 config MFD_DLN2
 	tristate "Diolan DLN2 support"
 	select MFD_CORE
drivers/mfd/Makefile +1 -1
index 53467e2..f06f4c6 100644
@@ -113,7 +113,7 @@ obj-$(CONFIG_MFD_DA9055)	+= da9055.o
 
 da9063-objs			:= da9063-core.o da9063-irq.o da9063-i2c.o
 obj-$(CONFIG_MFD_DA9063)	+= da9063.o
-
+obj-$(CONFIG_MFD_DA9150)	+= da9150-core.o
 obj-$(CONFIG_MFD_MAX14577)	+= max14577.o
 obj-$(CONFIG_MFD_MAX77686)	+= max77686.o
 obj-$(CONFIG_MFD_MAX77693)	+= max77693.o
drivers/mfd/da9150-core.c new file +413 -0

413 lines not on this page · raw message

include/linux/mfd/da9150/core.h new file +68 -0

68 lines not on this page · raw message

include/linux/mfd/da9150/registers.h new file +1155 -0

1,155 lines not on this page · raw message

--
1.9.3

#2 lore raw

Re: [PATCH v5 1/7] mfd: Add support for DA9150 combined charger & fuel-gauge device

Quoted 69 lines · Adam Thomson

DA9150 is a combined Charger and Fuel-Gauge IC, with additional GPIO and GPADC functionality.

---
 drivers/mfd/Kconfig                  |   12 +
 drivers/mfd/Makefile                 |    2 +-
 drivers/mfd/da9150-core.c            |  413 ++++++++++++
 include/linux/mfd/da9150/core.h      |   68 ++
 include/linux/mfd/da9150/registers.h | 1155 ++++++++++++++++++++++++++++++++++
 5 files changed, 1649 insertions(+), 1 deletion(-)
 create mode 100644 drivers/mfd/da9150-core.c
 create mode 100644 include/linux/mfd/da9150/core.h
 create mode 100644 include/linux/mfd/da9150/registers.h
drivers/mfd/Kconfig +12 -0
index 2e6b731..56e80d2 100644
@@ -195,6 +195,18 @@ config MFD_DA9063
 	  Additional drivers must be enabled in order to use the functionality
 	  of the device.
 
+config MFD_DA9150
+	tristate "Dialog Semiconductor DA9150 Charger Fuel-Gauge chip"
+	depends on I2C=y
+	select MFD_CORE
+	select REGMAP_I2C
+	select REGMAP_IRQ
+	help
+	  This adds support for the DA9150 integrated charger and fuel-gauge
+	  chip. This driver provides common support for accessing the device.
+	  Additional drivers must be enabled in order to use the specific
+	  features of the device.
+
 config MFD_DLN2
 	tristate "Diolan DLN2 support"
 	select MFD_CORE
drivers/mfd/Makefile +1 -1
index 53467e2..f06f4c6 100644
@@ -113,7 +113,7 @@ obj-$(CONFIG_MFD_DA9055)	+= da9055.o
 
 da9063-objs			:= da9063-core.o da9063-irq.o da9063-i2c.o
 obj-$(CONFIG_MFD_DA9063)	+= da9063.o
-
+obj-$(CONFIG_MFD_DA9150)	+= da9150-core.o
 obj-$(CONFIG_MFD_MAX14577)	+= max14577.o
 obj-$(CONFIG_MFD_MAX77686)	+= max77686.o
 obj-$(CONFIG_MFD_MAX77693)	+= max77693.o
drivers/mfd/da9150-core.c new file +12 -0
new file mode 100644
index 0000000..4d757b9
@@ -0,0 +1,413 @@
+/*
+ * DA9150 Core MFD Driver
+ *
+ * Copyright (c) 2014 Dialog Semiconductor
+ *
+ * Author: Adam Thomson <[email protected]>
+ *
+ * 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.
+ */

[...]

Quoted 46 lines
drivers/mfd/da9150-core.c new file +46 -0
+u8 da9150_reg_read(struct da9150 *da9150, u16 reg)
+{
+	int val, ret;
+
+	ret = regmap_read(da9150->regmap, reg, &val);
+	if (ret)
+		dev_err(da9150->dev, "Failed to read from reg 0x%x: %d\n",
+			reg, ret);
+
+	return (u8) val;
+}
+EXPORT_SYMBOL_GPL(da9150_reg_read);
+
+void da9150_reg_write(struct da9150 *da9150, u16 reg, u8 val)
+{
+	int ret;
+
+	ret = regmap_write(da9150->regmap, reg, val);
+	if (ret)
+		dev_err(da9150->dev, "Failed to write to reg 0x%x: %d\n",
+			reg, ret);
+}
+EXPORT_SYMBOL_GPL(da9150_reg_write);
+
+void da9150_set_bits(struct da9150 *da9150, u16 reg, u8 mask, u8 val)
+{
+	int ret;
+
+	ret = regmap_update_bits(da9150->regmap, reg, mask, val);
+	if (ret)
+		dev_err(da9150->dev, "Failed to set bits in reg 0x%x: %d\n",
+			reg, ret);
+}
+EXPORT_SYMBOL_GPL(da9150_set_bits);
+
+void da9150_bulk_read(struct da9150 *da9150, u16 reg, int count, u8 *buf)
+{
+	int ret;
+
+	ret = regmap_bulk_read(da9150->regmap, reg, buf, count);
+	if (ret)
+		dev_err(da9150->dev, "Failed to bulk read from reg 0x%x: %d\n",
+			reg, ret);
+}
+EXPORT_SYMBOL_GPL(da9150_bulk_read);
+

drivers/mfd/da9150-core.c line 165

Quoted 10 lines
drivers/mfd/da9150-core.c new file +10 -0
+void da9150_bulk_write(struct da9150 *da9150, u16 reg, int count, const u8 *buf)
+{
+	int ret;
+
+	ret = regmap_raw_write(da9150->regmap, reg, buf, count);
+	if (ret)
+		dev_err(da9150->dev, "Failed to bulk write to reg 0x%x %d\n",
+			reg, ret);
+}
+EXPORT_SYMBOL_GPL(da9150_bulk_write);

I've never been a fan of this type of aggregation. Can you explain to me what the point of them is?

Signature · 4 lines
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
#3 lore raw

RE: [PATCH v5 1/7] mfd: Add support for DA9150 combined charger & fuel-gauge device

T24gSmFudWFyeSAxOSwgMjAxNSAxMTozNCwgTGVlIEpvbmVzIHdyb3RlOg0KDQo+IE9uIE1vbiwg MjIgRGVjIDIwMTQsIEFkYW0gVGhvbXNvbiB3cm90ZToNCj4gDQo+ID4gREE5MTUwIGlzIGEgY29t YmluZWQgQ2hhcmdlciBhbmQgRnVlbC1HYXVnZSBJQywgd2l0aCBhZGRpdGlvbmFsDQo+ID4gR1BJ TyBhbmQgR1BBREMgZnVuY3Rpb25hbGl0eS4NCj4gPg0KPiA+IFNpZ25lZC1vZmYtYnk6IEFkYW0g VGhvbXNvbiA8QWRhbS5UaG9tc29uLk9wZW5zb3VyY2VAZGlhc2VtaS5jb20+DQo+ID4gLS0tDQo+ ID4gIGRyaXZlcnMvbWZkL0tjb25maWcgICAgICAgICAgICAgICAgICB8ICAgMTIgKw0KPiA+ICBk cml2ZXJzL21mZC9NYWtlZmlsZSAgICAgICAgICAgICAgICAgfCAgICAyICstDQo+ID4gIGRyaXZl cnMvbWZkL2RhOTE1MC1jb3JlLmMgICAgICAgICAgICB8ICA0MTMgKysrKysrKysrKysrDQo+ID4g IGluY2x1ZGUvbGludXgvbWZkL2RhOTE1MC9jb3JlLmggICAgICB8ICAgNjggKysNCj4gPiAgaW5j bHVkZS9saW51eC9tZmQvZGE5MTUwL3JlZ2lzdGVycy5oIHwgMTE1NQ0KPiArKysrKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrDQo+ID4gIDUgZmlsZXMgY2hhbmdlZCwgMTY0OSBpbnNlcnRp b25zKCspLCAxIGRlbGV0aW9uKC0pDQo+ID4gIGNyZWF0ZSBtb2RlIDEwMDY0NCBkcml2ZXJzL21m ZC9kYTkxNTAtY29yZS5jDQo+ID4gIGNyZWF0ZSBtb2RlIDEwMDY0NCBpbmNsdWRlL2xpbnV4L21m ZC9kYTkxNTAvY29yZS5oDQo+ID4gIGNyZWF0ZSBtb2RlIDEwMDY0NCBpbmNsdWRlL2xpbnV4L21m ZC9kYTkxNTAvcmVnaXN0ZXJzLmgNCj4gPg0KPiA+IGRpZmYgLS1naXQgYS9kcml2ZXJzL21mZC9L Y29uZmlnIGIvZHJpdmVycy9tZmQvS2NvbmZpZw0KPiA+IGluZGV4IDJlNmI3MzEuLjU2ZTgwZDIg MTAwNjQ0DQo+ID4gLS0tIGEvZHJpdmVycy9tZmQvS2NvbmZpZw0KPiA+ICsrKyBiL2RyaXZlcnMv bWZkL0tjb25maWcNCj4gPiBAQCAtMTk1LDYgKzE5NSwxOCBAQCBjb25maWcgTUZEX0RBOTA2Mw0K PiA+ICAJICBBZGRpdGlvbmFsIGRyaXZlcnMgbXVzdCBiZSBlbmFibGVkIGluIG9yZGVyIHRvIHVz ZSB0aGUgZnVuY3Rpb25hbGl0eQ0KPiA+ICAJICBvZiB0aGUgZGV2aWNlLg0KPiA+DQo+ID4gK2Nv bmZpZyBNRkRfREE5MTUwDQo+ID4gKwl0cmlzdGF0ZSAiRGlhbG9nIFNlbWljb25kdWN0b3IgREE5 MTUwIENoYXJnZXIgRnVlbC1HYXVnZSBjaGlwIg0KPiA+ICsJZGVwZW5kcyBvbiBJMkM9eQ0KPiA+ ICsJc2VsZWN0IE1GRF9DT1JFDQo+ID4gKwlzZWxlY3QgUkVHTUFQX0kyQw0KPiA+ICsJc2VsZWN0 IFJFR01BUF9JUlENCj4gPiArCWhlbHANCj4gPiArCSAgVGhpcyBhZGRzIHN1cHBvcnQgZm9yIHRo ZSBEQTkxNTAgaW50ZWdyYXRlZCBjaGFyZ2VyIGFuZCBmdWVsLWdhdWdlDQo+ID4gKwkgIGNoaXAu IFRoaXMgZHJpdmVyIHByb3ZpZGVzIGNvbW1vbiBzdXBwb3J0IGZvciBhY2Nlc3NpbmcgdGhlIGRl dmljZS4NCj4gPiArCSAgQWRkaXRpb25hbCBkcml2ZXJzIG11c3QgYmUgZW5hYmxlZCBpbiBvcmRl ciB0byB1c2UgdGhlIHNwZWNpZmljDQo+ID4gKwkgIGZlYXR1cmVzIG9mIHRoZSBkZXZpY2UuDQo+ ID4gKw0KPiA+ICBjb25maWcgTUZEX0RMTjINCj4gPiAgCXRyaXN0YXRlICJEaW9sYW4gRExOMiBz dXBwb3J0Ig0KPiA+ICAJc2VsZWN0IE1GRF9DT1JFDQo+ID4gZGlmZiAtLWdpdCBhL2RyaXZlcnMv bWZkL01ha2VmaWxlIGIvZHJpdmVycy9tZmQvTWFrZWZpbGUNCj4gPiBpbmRleCA1MzQ2N2UyLi5m MDZmNGM2IDEwMDY0NA0KPiA+IC0tLSBhL2RyaXZlcnMvbWZkL01ha2VmaWxlDQo+ID4gKysrIGIv ZHJpdmVycy9tZmQvTWFrZWZpbGUNCj4gPiBAQCAtMTEzLDcgKzExMyw3IEBAIG9iai0kKENPTkZJ R19NRkRfREE5MDU1KQkrPSBkYTkwNTUubw0KPiA+DQo+ID4gIGRhOTA2My1vYmpzCQkJOj0gZGE5 MDYzLWNvcmUubyBkYTkwNjMtaXJxLm8gZGE5MDYzLWkyYy5vDQo+ID4gIG9iai0kKENPTkZJR19N RkRfREE5MDYzKQkrPSBkYTkwNjMubw0KPiA+IC0NCj4gPiArb2JqLSQoQ09ORklHX01GRF9EQTkx NTApCSs9IGRhOTE1MC1jb3JlLm8NCj4gPiAgb2JqLSQoQ09ORklHX01GRF9NQVgxNDU3NykJKz0g bWF4MTQ1Nzcubw0KPiA+ICBvYmotJChDT05GSUdfTUZEX01BWDc3Njg2KQkrPSBtYXg3NzY4Ni5v DQo+ID4gIG9iai0kKENPTkZJR19NRkRfTUFYNzc2OTMpCSs9IG1heDc3NjkzLm8NCj4gPiBkaWZm IC0tZ2l0IGEvZHJpdmVycy9tZmQvZGE5MTUwLWNvcmUuYyBiL2RyaXZlcnMvbWZkL2RhOTE1MC1j b3JlLmMNCj4gPiBuZXcgZmlsZSBtb2RlIDEwMDY0NA0KPiA+IGluZGV4IDAwMDAwMDAuLjRkNzU3 YjkNCj4gPiAtLS0gL2Rldi9udWxsDQo+ID4gKysrIGIvZHJpdmVycy9tZmQvZGE5MTUwLWNvcmUu Yw0KPiA+IEBAIC0wLDAgKzEsNDEzIEBADQo+ID4gKy8qDQo+ID4gKyAqIERBOTE1MCBDb3JlIE1G RCBEcml2ZXINCj4gPiArICoNCj4gPiArICogQ29weXJpZ2h0IChjKSAyMDE0IERpYWxvZyBTZW1p Y29uZHVjdG9yDQo+ID4gKyAqDQo+ID4gKyAqIEF1dGhvcjogQWRhbSBUaG9tc29uIDxBZGFtLlRo b21zb24uT3BlbnNvdXJjZUBkaWFzZW1pLmNvbT4NCj4gPiArICoNCj4gPiArICogVGhpcyBwcm9n cmFtIGlzIGZyZWUgc29mdHdhcmU7IHlvdSBjYW4gcmVkaXN0cmlidXRlICBpdCBhbmQvb3IgbW9k aWZ5IGl0DQo+ID4gKyAqIHVuZGVyICB0aGUgdGVybXMgb2YgIHRoZSBHTlUgR2VuZXJhbCAgUHVi bGljIExpY2Vuc2UgYXMgcHVibGlzaGVkIGJ5IHRoZQ0KPiA+ICsgKiBGcmVlIFNvZnR3YXJlIEZv dW5kYXRpb247ICBlaXRoZXIgdmVyc2lvbiAyIG9mIHRoZSAgTGljZW5zZSwgb3IgKGF0IHlvdXIN Cj4gPiArICogb3B0aW9uKSBhbnkgbGF0ZXIgdmVyc2lvbi4NCj4gPiArICovDQo+IA0KPiBbLi4u XQ0KPiANCj4gPiArdTggZGE5MTUwX3JlZ19yZWFkKHN0cnVjdCBkYTkxNTAgKmRhOTE1MCwgdTE2 IHJlZykNCj4gPiArew0KPiA+ICsJaW50IHZhbCwgcmV0Ow0KPiA+ICsNCj4gPiArCXJldCA9IHJl Z21hcF9yZWFkKGRhOTE1MC0+cmVnbWFwLCByZWcsICZ2YWwpOw0KPiA+ICsJaWYgKHJldCkNCj4g PiArCQlkZXZfZXJyKGRhOTE1MC0+ZGV2LCAiRmFpbGVkIHRvIHJlYWQgZnJvbSByZWcgMHgleDog JWRcbiIsDQo+ID4gKwkJCXJlZywgcmV0KTsNCj4gPiArDQo+ID4gKwlyZXR1cm4gKHU4KSB2YWw7 DQo+ID4gK30NCj4gPiArRVhQT1JUX1NZTUJPTF9HUEwoZGE5MTUwX3JlZ19yZWFkKTsNCj4gPiAr DQo+ID4gK3ZvaWQgZGE5MTUwX3JlZ193cml0ZShzdHJ1Y3QgZGE5MTUwICpkYTkxNTAsIHUxNiBy ZWcsIHU4IHZhbCkNCj4gPiArew0KPiA+ICsJaW50IHJldDsNCj4gPiArDQo+ID4gKwlyZXQgPSBy ZWdtYXBfd3JpdGUoZGE5MTUwLT5yZWdtYXAsIHJlZywgdmFsKTsNCj4gPiArCWlmIChyZXQpDQo+ ID4gKwkJZGV2X2VycihkYTkxNTAtPmRldiwgIkZhaWxlZCB0byB3cml0ZSB0byByZWcgMHgleDog JWRcbiIsDQo+ID4gKwkJCXJlZywgcmV0KTsNCj4gPiArfQ0KPiA+ICtFWFBPUlRfU1lNQk9MX0dQ TChkYTkxNTBfcmVnX3dyaXRlKTsNCj4gPiArDQo+ID4gK3ZvaWQgZGE5MTUwX3NldF9iaXRzKHN0 cnVjdCBkYTkxNTAgKmRhOTE1MCwgdTE2IHJlZywgdTggbWFzaywgdTggdmFsKQ0KPiA+ICt7DQo+ ID4gKwlpbnQgcmV0Ow0KPiA+ICsNCj4gPiArCXJldCA9IHJlZ21hcF91cGRhdGVfYml0cyhkYTkx NTAtPnJlZ21hcCwgcmVnLCBtYXNrLCB2YWwpOw0KPiA+ICsJaWYgKHJldCkNCj4gPiArCQlkZXZf ZXJyKGRhOTE1MC0+ZGV2LCAiRmFpbGVkIHRvIHNldCBiaXRzIGluIHJlZyAweCV4OiAlZFxuIiwN Cj4gPiArCQkJcmVnLCByZXQpOw0KPiA+ICt9DQo+ID4gK0VYUE9SVF9TWU1CT0xfR1BMKGRhOTE1 MF9zZXRfYml0cyk7DQo+ID4gKw0KPiA+ICt2b2lkIGRhOTE1MF9idWxrX3JlYWQoc3RydWN0IGRh OTE1MCAqZGE5MTUwLCB1MTYgcmVnLCBpbnQgY291bnQsIHU4ICpidWYpDQo+ID4gK3sNCj4gPiAr CWludCByZXQ7DQo+ID4gKw0KPiA+ICsJcmV0ID0gcmVnbWFwX2J1bGtfcmVhZChkYTkxNTAtPnJl Z21hcCwgcmVnLCBidWYsIGNvdW50KTsNCj4gPiArCWlmIChyZXQpDQo+ID4gKwkJZGV2X2Vycihk YTkxNTAtPmRldiwgIkZhaWxlZCB0byBidWxrIHJlYWQgZnJvbSByZWcgMHgleDogJWRcbiIsDQo+ ID4gKwkJCXJlZywgcmV0KTsNCj4gPiArfQ0KPiA+ICtFWFBPUlRfU1lNQk9MX0dQTChkYTkxNTBf YnVsa19yZWFkKTsNCj4gPiArDQo+ID4gK3ZvaWQgZGE5MTUwX2J1bGtfd3JpdGUoc3RydWN0IGRh OTE1MCAqZGE5MTUwLCB1MTYgcmVnLCBpbnQgY291bnQsIGNvbnN0IHU4DQo+ICpidWYpDQo+ID4g K3sNCj4gPiArCWludCByZXQ7DQo+ID4gKw0KPiA+ICsJcmV0ID0gcmVnbWFwX3Jhd193cml0ZShk YTkxNTAtPnJlZ21hcCwgcmVnLCBidWYsIGNvdW50KTsNCj4gPiArCWlmIChyZXQpDQo+ID4gKwkJ ZGV2X2VycihkYTkxNTAtPmRldiwgIkZhaWxlZCB0byBidWxrIHdyaXRlIHRvIHJlZyAweCV4ICVk XG4iLA0KPiA+ICsJCQlyZWcsIHJldCk7DQo+ID4gK30NCj4gPiArRVhQT1JUX1NZTUJPTF9HUEwo ZGE5MTUwX2J1bGtfd3JpdGUpOw0KPiANCj4gSSd2ZSBuZXZlciBiZWVuIGEgZmFuIG9mIHRoaXMg dHlwZSBvZiBhZ2dyZWdhdGlvbi4gIENhbiB5b3UgZXhwbGFpbiB0bw0KPiBtZSB3aGF0IHRoZSBw b2ludCBvZiB0aGVtIGlzPw0KDQpJIHJlZmVyIHlvdSBiYWNrIHRvIG91ciBwcmV2aW91cyBkaXNj dXNzaW9uIHNvbWUgdGltZSBiYWNrOg0KDQpodHRwczovL2xrbWwub3JnL2xrbWwvMjAxNC85Lzkv Mjg0DQoNCidUaGUgcmVhc29uIGZvciB0aGVzZSBpcyBiZWNhdXNlIGZ1dHVyZSBwYXRjaGVzIHRv IGFkZCBhZGRpdGlvbmFsIGZ1bmN0aW9uYWxpdHkNCndpbGwgaW50cm9kdWNlIEkyQyBhY2Nlc3Mg ZnVuY3Rpb25zIHdoaWNoIGRvIG5vdCB1c2UgcmVnbWFwIGFuZCBhY2Nlc3MgdGhlDQpkZXZpY2Ug dmlhIGEgc2VwYXJhdGUgSTJDIGFkZHJlc3MgZm9yIHRoaXMgcHVycG9zZS4gSSB3aWxsIG5lZWQg dG8gcHJvdmlkZQ0KYWNjZXNzIGZ1bmN0aW9ucyBmb3IgdGhhdCwgYW5kIHNvIGhhdmluZyBhIGNv bW1vbiBzdHlsZSBvZiBJMkMgYWNjZXNzIG1ha2VzDQpzZW5zZSBmb3IgdGhpcyBkcml2ZXIuIE1l YW5zIGFueSBhY2Nlc3MganVzdCBuZWVkcyB0byBwcm92aWRlIHRoZSBNRkQgcHJpdmF0ZQ0KZGF0 YSwgYW5kIHRoZSByZWxldmFudCBmdW5jdGlvbnMgdGFrZSBjYXJlIG9mIHRoZSByZXN0LiBJIHRo aW5rIHRoaXMgaXMgY2xlYW5lcg0KaW4gdGhpcyBpbnN0YW5jZS4nDQo=
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

Acked-by
#4 lore raw

Re: [PATCH v5 1/7] mfd: Add support for DA9150 combined charger & fuel-gauge device

Quoted 142 lines · Opensource [Adam Thomson]
Quoted 123 lines · Lee Jones
Quoted 10 lines · Adam Thomson

DA9150 is a combined Charger and Fuel-Gauge IC, with additional GPIO and GPADC functionality.

---
 drivers/mfd/Kconfig                  |   12 +
 drivers/mfd/Makefile                 |    2 +-
 drivers/mfd/da9150-core.c            |  413 ++++++++++++
 include/linux/mfd/da9150/core.h      |   68 ++
 include/linux/mfd/da9150/registers.h | 1155

++++++++++++++++++++++++++++++++++

Quoted 59 lines
 5 files changed, 1649 insertions(+), 1 deletion(-)
 create mode 100644 drivers/mfd/da9150-core.c
 create mode 100644 include/linux/mfd/da9150/core.h
 create mode 100644 include/linux/mfd/da9150/registers.h
drivers/mfd/Kconfig +12 -0
index 2e6b731..56e80d2 100644
@@ -195,6 +195,18 @@ config MFD_DA9063
 	  Additional drivers must be enabled in order to use the functionality
 	  of the device.
 
+config MFD_DA9150
+	tristate "Dialog Semiconductor DA9150 Charger Fuel-Gauge chip"
+	depends on I2C=y
+	select MFD_CORE
+	select REGMAP_I2C
+	select REGMAP_IRQ
+	help
+	  This adds support for the DA9150 integrated charger and fuel-gauge
+	  chip. This driver provides common support for accessing the device.
+	  Additional drivers must be enabled in order to use the specific
+	  features of the device.
+
 config MFD_DLN2
 	tristate "Diolan DLN2 support"
 	select MFD_CORE
drivers/mfd/Makefile +1 -1
index 53467e2..f06f4c6 100644
@@ -113,7 +113,7 @@ obj-$(CONFIG_MFD_DA9055)	+= da9055.o
 
 da9063-objs			:= da9063-core.o da9063-irq.o da9063-i2c.o
 obj-$(CONFIG_MFD_DA9063)	+= da9063.o
-
+obj-$(CONFIG_MFD_DA9150)	+= da9150-core.o
 obj-$(CONFIG_MFD_MAX14577)	+= max14577.o
 obj-$(CONFIG_MFD_MAX77686)	+= max77686.o
 obj-$(CONFIG_MFD_MAX77693)	+= max77693.o
drivers/mfd/da9150-core.c new file +12 -0
new file mode 100644
index 0000000..4d757b9
@@ -0,0 +1,413 @@
+/*
+ * DA9150 Core MFD Driver
+ *
+ * Copyright (c) 2014 Dialog Semiconductor
+ *
+ * Author: Adam Thomson <[email protected]>
+ *
+ * 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.
+ */

[...]

Quoted 37 lines
drivers/mfd/da9150-core.c new file +37 -0
+u8 da9150_reg_read(struct da9150 *da9150, u16 reg)
+{
+	int val, ret;
+
+	ret = regmap_read(da9150->regmap, reg, &val);
+	if (ret)
+		dev_err(da9150->dev, "Failed to read from reg 0x%x: %d\n",
+			reg, ret);
+
+	return (u8) val;
+}
+EXPORT_SYMBOL_GPL(da9150_reg_read);
+
+void da9150_reg_write(struct da9150 *da9150, u16 reg, u8 val)
+{
+	int ret;
+
+	ret = regmap_write(da9150->regmap, reg, val);
+	if (ret)
+		dev_err(da9150->dev, "Failed to write to reg 0x%x: %d\n",
+			reg, ret);
+}
+EXPORT_SYMBOL_GPL(da9150_reg_write);
+
+void da9150_set_bits(struct da9150 *da9150, u16 reg, u8 mask, u8 val)
+{
+	int ret;
+
+	ret = regmap_update_bits(da9150->regmap, reg, mask, val);
+	if (ret)
+		dev_err(da9150->dev, "Failed to set bits in reg 0x%x: %d\n",
+			reg, ret);
+}
+EXPORT_SYMBOL_GPL(da9150_set_bits);
+
+void da9150_bulk_read(struct da9150 *da9150, u16 reg, int count, u8 *buf)
+{

drivers/mfd/da9150-core.c

Quoted 10 lines
drivers/mfd/da9150-core.c new file +10 -0
+	int ret;
+
+	ret = regmap_bulk_read(da9150->regmap, reg, buf, count);
+	if (ret)
+		dev_err(da9150->dev, "Failed to bulk read from reg 0x%x: %d\n",
+			reg, ret);
+}
+EXPORT_SYMBOL_GPL(da9150_bulk_read);
+
+void da9150_bulk_write(struct da9150 *da9150, u16 reg, int count, const u8

*buf)

Quoted 12 lines

drivers/mfd/da9150-core.c line 165

Quoted 9 lines
drivers/mfd/da9150-core.c new file +9 -0
+{
+	int ret;
+
+	ret = regmap_raw_write(da9150->regmap, reg, buf, count);
+	if (ret)
+		dev_err(da9150->dev, "Failed to bulk write to reg 0x%x %d\n",
+			reg, ret);
+}
+EXPORT_SYMBOL_GPL(da9150_bulk_write);

I've never been a fan of this type of aggregation. Can you explain to me what the point of them is?

I refer you back to our previous discussion some time back:

https://lkml.org/lkml/2014/9/9/284

Quoted 7 lines

'The reason for these is because future patches to add additional functionality will introduce I2C access functions which do not use regmap and access the device via a separate I2C address for this purpose. I will need to provide access functions for that, and so having a common style of I2C access makes sense for this driver. Means any access just needs to provide the MFD private data, and the relevant functions take care of the rest. I think this is cleaner in this instance.'

Well at least I'm consistent.

For my own reference:

Signature · 4 lines
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
#5 lore raw

PATCH v5 2/7 mfd: da9150: Add DT binding documentation for core

In reply to Adam Thomson
---
 Documentation/devicetree/bindings/mfd/da9150.txt | 43 ++++++++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/mfd/da9150.txt
Documentation/devicetree/bindings/mfd/da9150.txt new file +43 -0
new file mode 100644
index 0000000..d0588ea
@@ -0,0 +1,43 @@
+Dialog Semiconductor DA9150 Combined Charger/Fuel-Gauge MFD bindings
+
+DA9150 consists of a group of sub-devices:
+
+Device			 Description
+------			 -----------
+da9150-gpadc		: General Purpose ADC
+da9150-charger		: Battery Charger
+
+======
+
+Required properties:
+- compatible : Should be "dlg,da9150"
+- reg: Specifies the I2C slave address
+- interrupt-parent: Specifies the phandle of the interrupt controller to which
+  the IRQs from da9150 are delivered to.
+- interrupts: IRQ line info for da9150 chip.
+- interrupt-controller: da9150 has internal IRQs (own IRQ domain).
+  (See Documentation/devicetree/bindings/interrupt-controller/interrupts.txt for
+   further information relating to interrupt properties)
+
+Sub-devices:
+- da9150-gpadc: See Documentation/devicetree/bindings/iio/adc/da9150-gpadc.txt
+- da9150-charger: See Documentation/devicetree/bindings/power/da9150-charger.txt
+
+
+Example:
+
+	charger_fg: da9150@58 {
+		compatible = "dlg,da9150";
+		reg = <0x58>;
+		interrupt-parent = <&gpio6>;
+		interrupts = <11 IRQ_TYPE_LEVEL_LOW>;
+		interrupt-controller;
+
+		gpadc: da9150-gpadc {
+			...
+		};
+
+		da9150-charger {
+			...
+		};
+	};

--
1.9.3

#6 lore raw

PATCH v5 3/7 iio: Add support for DA9150 GPADC

In reply to Adam Thomson

This patch adds support for DA9150 Charger & Fuel-Gauge IC GPADC.

---
 drivers/iio/adc/Kconfig        |   9 +
 drivers/iio/adc/Makefile       |   1 +
 drivers/iio/adc/da9150-gpadc.c | 409 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 419 insertions(+)
 create mode 100644 drivers/iio/adc/da9150-gpadc.c
drivers/iio/adc/Kconfig +9 -0
index 0f79e47..6e00b81 100644
@@ -135,6 +135,15 @@ config AXP288_ADC
 	  device. Depending on platform configuration, this general purpose ADC can
 	  be used for sampling sensors such as thermal resistors.
 
+config DA9150_GPADC
+	tristate "Dialog DA9150 GPADC driver support"
+	depends on MFD_DA9150
+	help
+	  Say yes here to build support for Dialog DA9150 GPADC.
+
+	  This driver can also be built as a module. If chosen, the module name
+	  will be da9150-gpadc.
+
 config EXYNOS_ADC
 	tristate "Exynos ADC driver support"
 	depends on ARCH_EXYNOS || ARCH_S3C24XX || ARCH_S3C64XX || (OF && COMPILE_TEST)
drivers/iio/adc/Makefile +1 -0
index 701fdb7..d56ee9b 100644
@@ -15,6 +15,7 @@ obj-$(CONFIG_AD7887) += ad7887.o
 obj-$(CONFIG_AD799X) += ad799x.o
 obj-$(CONFIG_AT91_ADC) += at91_adc.o
 obj-$(CONFIG_AXP288_ADC) += axp288_adc.o
+obj-$(CONFIG_DA9150_GPADC) += da9150-gpadc.o
 obj-$(CONFIG_EXYNOS_ADC) += exynos_adc.o
 obj-$(CONFIG_LP8788_ADC) += lp8788_adc.o
 obj-$(CONFIG_MAX1027) += max1027.o
drivers/iio/adc/da9150-gpadc.c new file +409 -0

409 lines not on this page · raw message

--
1.9.3

Reviewed-by on v5 3/7
#7 lore raw

Re: [PATCH v5 3/7] iio: Add support for DA9150 GPADC

Adam Thomson schrieb am 22.12.2014 um 17:51:

Quoted 3 lines

This patch adds support for DA9150 Charger & Fuel-Gauge IC GPADC.

Quoted 462 lines
---
 drivers/iio/adc/Kconfig        |   9 +
 drivers/iio/adc/Makefile       |   1 +
 drivers/iio/adc/da9150-gpadc.c | 409 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 419 insertions(+)
 create mode 100644 drivers/iio/adc/da9150-gpadc.c
drivers/iio/adc/Kconfig +9 -0
index 0f79e47..6e00b81 100644
@@ -135,6 +135,15 @@ config AXP288_ADC
 	  device. Depending on platform configuration, this general purpose ADC can
 	  be used for sampling sensors such as thermal resistors.
 
+config DA9150_GPADC
+	tristate "Dialog DA9150 GPADC driver support"
+	depends on MFD_DA9150
+	help
+	  Say yes here to build support for Dialog DA9150 GPADC.
+
+	  This driver can also be built as a module. If chosen, the module name
+	  will be da9150-gpadc.
+
 config EXYNOS_ADC
 	tristate "Exynos ADC driver support"
 	depends on ARCH_EXYNOS || ARCH_S3C24XX || ARCH_S3C64XX || (OF && COMPILE_TEST)
drivers/iio/adc/Makefile +1 -0
index 701fdb7..d56ee9b 100644
@@ -15,6 +15,7 @@ obj-$(CONFIG_AD7887) += ad7887.o
 obj-$(CONFIG_AD799X) += ad799x.o
 obj-$(CONFIG_AT91_ADC) += at91_adc.o
 obj-$(CONFIG_AXP288_ADC) += axp288_adc.o
+obj-$(CONFIG_DA9150_GPADC) += da9150-gpadc.o
 obj-$(CONFIG_EXYNOS_ADC) += exynos_adc.o
 obj-$(CONFIG_LP8788_ADC) += lp8788_adc.o
 obj-$(CONFIG_MAX1027) += max1027.o
drivers/iio/adc/da9150-gpadc.c new file +409 -1
new file mode 100644
index 0000000..3f7bc81
@@ -0,0 +1,409 @@
+/*
+ * DA9150 GPADC Driver
+ *
+ * Copyright (c) 2014 Dialog Semiconductor
+ *
+ * Author: Adam Thomson <[email protected]>
+ *
+ * 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.
+ */
+
+#include <linux/kernel.h>
+#include <linux/slab.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/interrupt.h>
+#include <linux/mutex.h>
+#include <linux/completion.h>
+#include <linux/iio/iio.h>
+#include <linux/iio/machine.h>
+#include <linux/iio/driver.h>
+#include <linux/mfd/da9150/core.h>
+#include <linux/mfd/da9150/registers.h>
+
+/* Channels */
+enum da9150_gpadc_hw_channel {
+	DA9150_GPADC_HW_CHAN_GPIOA_2V = 0,
+	DA9150_GPADC_HW_CHAN_GPIOA_2V_,
+	DA9150_GPADC_HW_CHAN_GPIOB_2V,
+	DA9150_GPADC_HW_CHAN_GPIOB_2V_,
+	DA9150_GPADC_HW_CHAN_GPIOC_2V,
+	DA9150_GPADC_HW_CHAN_GPIOC_2V_,
+	DA9150_GPADC_HW_CHAN_GPIOD_2V,
+	DA9150_GPADC_HW_CHAN_GPIOD_2V_,
+	DA9150_GPADC_HW_CHAN_IBUS_SENSE,
+	DA9150_GPADC_HW_CHAN_IBUS_SENSE_,
+	DA9150_GPADC_HW_CHAN_VBUS_DIV,
+	DA9150_GPADC_HW_CHAN_VBUS_DIV_,
+	DA9150_GPADC_HW_CHAN_ID,
+	DA9150_GPADC_HW_CHAN_ID_,
+	DA9150_GPADC_HW_CHAN_VSYS,
+	DA9150_GPADC_HW_CHAN_VSYS_,
+	DA9150_GPADC_HW_CHAN_GPIOA_6V,
+	DA9150_GPADC_HW_CHAN_GPIOA_6V_,
+	DA9150_GPADC_HW_CHAN_GPIOB_6V,
+	DA9150_GPADC_HW_CHAN_GPIOB_6V_,
+	DA9150_GPADC_HW_CHAN_GPIOC_6V,
+	DA9150_GPADC_HW_CHAN_GPIOC_6V_,
+	DA9150_GPADC_HW_CHAN_GPIOD_6V,
+	DA9150_GPADC_HW_CHAN_GPIOD_6V_,
+	DA9150_GPADC_HW_CHAN_VBAT,
+	DA9150_GPADC_HW_CHAN_VBAT_,
+	DA9150_GPADC_HW_CHAN_TBAT,
+	DA9150_GPADC_HW_CHAN_TBAT_,
+	DA9150_GPADC_HW_CHAN_TJUNC_CORE,
+	DA9150_GPADC_HW_CHAN_TJUNC_CORE_,
+	DA9150_GPADC_HW_CHAN_TJUNC_OVP,
+	DA9150_GPADC_HW_CHAN_TJUNC_OVP_,
+};
+
+enum da9150_gpadc_channel {
+	DA9150_GPADC_CHAN_GPIOA = 0,
+	DA9150_GPADC_CHAN_GPIOB,
+	DA9150_GPADC_CHAN_GPIOC,
+	DA9150_GPADC_CHAN_GPIOD,
+	DA9150_GPADC_CHAN_IBUS,
+	DA9150_GPADC_CHAN_VBUS,
+	DA9150_GPADC_CHAN_ID,
+	DA9150_GPADC_CHAN_VSYS,
+	DA9150_GPADC_CHAN_VBAT,
+	DA9150_GPADC_CHAN_TBAT,
+	DA9150_GPADC_CHAN_TJUNC_CORE,
+	DA9150_GPADC_CHAN_TJUNC_OVP,
+};
+
+/* Private data */
+struct da9150_gpadc {
+	struct da9150 *da9150;
+	struct device *dev;
+
+	struct mutex lock;
+	struct completion complete;
+};
+
+
+static irqreturn_t da9150_gpadc_irq(int irq, void *data)
+{
+
+	struct da9150_gpadc *gpadc = data;
+
+	complete(&gpadc->complete);
+
+	return IRQ_HANDLED;
+}
+
+static int da9150_gpadc_read_adc(struct da9150_gpadc *gpadc, int hw_chan)
+{
+	u8 result_regs[2];
+	int result;
+
+	mutex_lock(&gpadc->lock);
+
+	/* Set channel & enable measurement */
+	da9150_reg_write(gpadc->da9150, DA9150_GPADC_MAN,
+			 (DA9150_GPADC_EN_MASK |
+			  hw_chan << DA9150_GPADC_MUX_SHIFT));
+
+	/* Consume left-over completion from a previous timeout */
+	try_wait_for_completion(&gpadc->complete);
+
+	/* Check for actual completion */
+	wait_for_completion_timeout(&gpadc->complete, msecs_to_jiffies(5));
+
+	/* Read result and status from device */
+	da9150_bulk_read(gpadc->da9150, DA9150_GPADC_RES_A, 2, result_regs);
+
+	mutex_unlock(&gpadc->lock);
+
+	/* Check to make sure device really has completed reading */
+	if (result_regs[1] & DA9150_GPADC_RUN_MASK) {
+		dev_err(gpadc->dev, "Timeout on channel %d of GPADC\n",
+			hw_chan);
+		return -ETIMEDOUT;
+	}
+
+	/* LSBs - 2 bits */
+	result = (result_regs[1] & DA9150_GPADC_RES_L_MASK) >>
+		 DA9150_GPADC_RES_L_SHIFT;
+	/* MSBs - 8 bits */
+	result |= result_regs[0] << DA9150_GPADC_RES_L_BITS;
+
+	return result;
+}
+
+static inline int da9150_gpadc_gpio_6v_voltage_now(int raw_val)
+{
+	/* Convert to mV */
+	return (6 * ((raw_val * 1000) + 500)) / 1024;
+}
+
+static inline int da9150_gpadc_ibus_current_avg(int raw_val)
+{
+	/* Convert to mA */
+	return (4 * ((raw_val * 1000) + 500)) / 2048;
+}
+
+static inline int da9150_gpadc_vbus_21v_voltage_now(int raw_val)
+{
+	/* Convert to mV */
+	return (21 * ((raw_val * 1000) + 500)) / 1024;
+}
+
+static inline int da9150_gpadc_vsys_6v_voltage_now(int raw_val)
+{
+	/* Convert to mV */
+	return (3 * ((raw_val * 1000) + 500)) / 512;
+}
+
+static int da9150_gpadc_read_processed(struct da9150_gpadc *gpadc, int channel,
+				       int hw_chan, int *val)
+{
+	int raw_val;
+
+	raw_val = da9150_gpadc_read_adc(gpadc, hw_chan);
+	if (raw_val < 0)
+		return raw_val;
+
+	switch (channel) {
+	case DA9150_GPADC_CHAN_GPIOA:
+	case DA9150_GPADC_CHAN_GPIOB:
+	case DA9150_GPADC_CHAN_GPIOC:
+	case DA9150_GPADC_CHAN_GPIOD:
+		*val = da9150_gpadc_gpio_6v_voltage_now(raw_val);
+		break;
+	case DA9150_GPADC_CHAN_IBUS:
+		*val = da9150_gpadc_ibus_current_avg(raw_val);
+		break;
+	case DA9150_GPADC_CHAN_VBUS:
+		*val = da9150_gpadc_vbus_21v_voltage_now(raw_val);
+		break;
+	case DA9150_GPADC_CHAN_VSYS:
+		*val = da9150_gpadc_vsys_6v_voltage_now(raw_val);
+		break;
+	default:
+		/* No processing for other channels so return raw value */
+		*val = raw_val;
+		break;
+	}
+
+	return IIO_VAL_INT;
+}
+
+static int da9150_gpadc_read_scale(int channel, int *val, int *val2)
+{
+	switch (channel) {
+	case DA9150_GPADC_CHAN_VBAT:
+		*val = 2932;
+		*val2 = 1000;
+		return IIO_VAL_FRACTIONAL;
+	case DA9150_GPADC_CHAN_TJUNC_CORE:
+	case DA9150_GPADC_CHAN_TJUNC_OVP:
+		*val = 1000000;
+		*val2 = 4420;
+		return IIO_VAL_FRACTIONAL;
+	default:
+		return -EINVAL;
+	}
+}
+
+static int da9150_gpadc_read_offset(int channel, int *val)
+{
+	switch (channel) {
+	case DA9150_GPADC_CHAN_VBAT:
+		*val = 1500000 / 2932;
+		return IIO_VAL_INT;
+	case DA9150_GPADC_CHAN_TJUNC_CORE:
+	case DA9150_GPADC_CHAN_TJUNC_OVP:
+		*val = -144;
+		return IIO_VAL_INT;
+	default:
+		return -EINVAL;
+	}
+}
+
+static int da9150_gpadc_read_raw(struct iio_dev *indio_dev,
+				 struct iio_chan_spec const *chan,
+				 int *val, int *val2, long mask)
+{
+	struct da9150_gpadc *gpadc = iio_priv(indio_dev);
+
+	if ((chan->channel < DA9150_GPADC_CHAN_GPIOA) ||
+	    (chan->channel > DA9150_GPADC_CHAN_TJUNC_OVP))
+		return -EINVAL;
+
+	switch (mask) {
+	case IIO_CHAN_INFO_RAW:
+	case IIO_CHAN_INFO_PROCESSED:
+		return da9150_gpadc_read_processed(gpadc, chan->channel,
+						   chan->address, val);
+	case IIO_CHAN_INFO_SCALE:
+		return da9150_gpadc_read_scale(chan->channel, val, val2);
+	case IIO_CHAN_INFO_OFFSET:
+		return da9150_gpadc_read_offset(chan->channel, val);
+	default:
+		return -EINVAL;
+	}
+}
+
+static const struct iio_info da9150_gpadc_info = {
+	.read_raw = &da9150_gpadc_read_raw,
+	.driver_module = THIS_MODULE,
+};
+
+#define DA9150_GPADC_CHANNEL(_id, _hw_id, _type, chan_info,	\
+			     _ext_name) {			\
+	.type = _type,						\
+	.indexed = 1,						\
+	.channel = DA9150_GPADC_CHAN_##_id,			\
+	.address = DA9150_GPADC_HW_CHAN_##_hw_id,		\
+	.info_mask_separate = chan_info,			\
+	.extend_name = _ext_name,				\
+	.datasheet_name = #_id,					\
+}
+
+#define DA9150_GPADC_CHANNEL_RAW(_id, _hw_id, _type, _ext_name)	\
+	DA9150_GPADC_CHANNEL(_id, _hw_id, _type,		\
+			     BIT(IIO_CHAN_INFO_RAW), _ext_name)
+
+#define DA9150_GPADC_CHANNEL_SCALED(_id, _hw_id, _type, _ext_name)	\
+	DA9150_GPADC_CHANNEL(_id, _hw_id, _type,			\
+			     BIT(IIO_CHAN_INFO_RAW) |			\
+			     BIT(IIO_CHAN_INFO_SCALE) |			\
+			     BIT(IIO_CHAN_INFO_OFFSET),			\
+			     _ext_name)
+
+#define DA9150_GPADC_CHANNEL_PROCESSED(_id, _hw_id, _type, _ext_name)	\
+	DA9150_GPADC_CHANNEL(_id, _hw_id, _type,			\
+			     BIT(IIO_CHAN_INFO_PROCESSED), _ext_name)
+
+/* Supported channels */
+static const struct iio_chan_spec da9150_gpadc_channels[] = {
+	DA9150_GPADC_CHANNEL_PROCESSED(GPIOA, GPIOA_6V, IIO_VOLTAGE, "GPIOA"),
+	DA9150_GPADC_CHANNEL_PROCESSED(GPIOB, GPIOB_6V, IIO_VOLTAGE, "GPIOB"),
+	DA9150_GPADC_CHANNEL_PROCESSED(GPIOC, GPIOC_6V, IIO_VOLTAGE, "GPIOC"),
+	DA9150_GPADC_CHANNEL_PROCESSED(GPIOD, GPIOD_6V, IIO_VOLTAGE, "GPIOD"),
+	DA9150_GPADC_CHANNEL_PROCESSED(IBUS, IBUS_SENSE, IIO_CURRENT, "IBUS"),
+	DA9150_GPADC_CHANNEL_PROCESSED(VBUS, VBUS_DIV_, IIO_VOLTAGE, "VBUS"),
+	DA9150_GPADC_CHANNEL_RAW(ID, ID, IIO_VOLTAGE, "ID"),
+	DA9150_GPADC_CHANNEL_PROCESSED(VSYS, VSYS, IIO_VOLTAGE, "VSYS"),
+	DA9150_GPADC_CHANNEL_SCALED(VBAT, VBAT, IIO_VOLTAGE, "VBAT"),
+	DA9150_GPADC_CHANNEL_RAW(TBAT, TBAT, IIO_VOLTAGE, "TBAT"),
+	DA9150_GPADC_CHANNEL_SCALED(TJUNC_CORE, TJUNC_CORE, IIO_TEMP,
+				    "TJUNC_CORE"),
+	DA9150_GPADC_CHANNEL_SCALED(TJUNC_OVP, TJUNC_OVP, IIO_TEMP,
+				    "TJUNC_OVP"),
+};
+
+/* Default maps used by da9150-charger */
+static struct iio_map da9150_gpadc_default_maps[] = {
+	{
+		.consumer_dev_name = "da9150-charger",
+		.consumer_channel = "CHAN_IBUS",
+		.adc_channel_label = "IBUS",
+	},
+	{
+		.consumer_dev_name = "da9150-charger",
+		.consumer_channel = "CHAN_VBUS",
+		.adc_channel_label = "VBUS",
+	},
+	{
+		.consumer_dev_name = "da9150-charger",
+		.consumer_channel = "CHAN_TJUNC",
+		.adc_channel_label = "TJUNC_CORE",
+	},
+	{
+		.consumer_dev_name = "da9150-charger",
+		.consumer_channel = "CHAN_VBAT",
+		.adc_channel_label = "VBAT",
+	},
+	{},
+};
+
+static int da9150_gpadc_probe(struct platform_device *pdev)
+{
+	struct device *dev = &pdev->dev;
+	struct da9150 *da9150 = dev_get_drvdata(dev->parent);
+	struct da9150_gpadc *gpadc;
+	struct iio_dev *indio_dev;
+	int irq, ret;
+
+	indio_dev = devm_iio_device_alloc(&pdev->dev, sizeof(*gpadc));
+	if (!indio_dev) {
+		dev_err(&pdev->dev, "Failed to allocate IIO device\n");
+		return -ENOMEM;
+	}
+	gpadc = iio_priv(indio_dev);
+
+	platform_set_drvdata(pdev, indio_dev);
+	gpadc->da9150 = da9150;
+	gpadc->dev = dev;
+	mutex_init(&gpadc->lock);
+	init_completion(&gpadc->complete);
+
+	irq = platform_get_irq_byname(pdev, "GPADC");
+	if (irq < 0) {
+		dev_err(dev, "Failed to get IRQ: %d\n", irq);
+		return irq;
+	}
+
+	ret = devm_request_threaded_irq(dev, irq, NULL, da9150_gpadc_irq,
+					IRQF_ONESHOT, "GPADC", gpadc);
+	if (ret) {
+		dev_err(dev, "Failed to request IRQ %d: %d\n", irq, ret);
+		return ret;
+	}
+
+	ret = iio_map_array_register(indio_dev, da9150_gpadc_default_maps);
+	if (ret) {
+		dev_err(dev, "Failed to register IIO maps: %d\n", ret);
+		return ret;
+	}
+
+	indio_dev->name = dev_name(dev);
+	indio_dev->dev.parent = dev;
+	indio_dev->dev.of_node = pdev->dev.of_node;
+	indio_dev->info = &da9150_gpadc_info;
+	indio_dev->modes = INDIO_DIRECT_MODE;
+	indio_dev->channels = da9150_gpadc_channels;
+	indio_dev->num_channels = ARRAY_SIZE(da9150_gpadc_channels);
+
+	ret = iio_device_register(indio_dev);
+	if (ret) {
+		dev_err(dev, "Failed to register IIO device: %d\n", ret);
+		goto iio_map_unreg;
+	}
+
+	return 0;
+
+iio_map_unreg:
+	iio_map_array_unregister(indio_dev);
+
+	return ret;
+}
+
+static int da9150_gpadc_remove(struct platform_device *pdev)
+{
+	struct iio_dev *indio_dev = platform_get_drvdata(pdev);
+
+	iio_device_unregister(indio_dev);
+	iio_map_array_unregister(indio_dev);
+
+	return 0;
+}
+
+static struct platform_driver da9150_gpadc_driver = {
+	.driver = {
+		.name = "da9150-gpadc",
+	},
+	.probe = da9150_gpadc_probe,
+	.remove = da9150_gpadc_remove,
+};
+
+module_platform_driver(da9150_gpadc_driver);
+
+MODULE_DESCRIPTION("GPADC Driver for DA9150");
+MODULE_AUTHOR("Adam Thomson <[email protected]>");
+MODULE_LICENSE("GPL");
--

1.9.3

--
To unsubscribe from this list: send the line "unsubscribe linux-iio" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

maintainer Acked-by on v5 3/7
#8 lore raw

Re: [PATCH v5 3/7] iio: Add support for DA9150 GPADC

In reply to Adam Thomson
Quoted 3 lines · Adam Thomson

This patch adds support for DA9150 Charger & Fuel-Gauge IC GPADC.

One last query from me.

Using the extended channel names in IIO is only really appropriate when they don't correspond to simple pins on the side of the chip. For those just drop the extname bit. Some of the channels you have here, definitely need them though.

Drop those first 4 or convince me otherwise and add

Quoted 322 lines
---
 drivers/iio/adc/Kconfig        |   9 +
 drivers/iio/adc/Makefile       |   1 +
 drivers/iio/adc/da9150-gpadc.c | 409 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 419 insertions(+)
 create mode 100644 drivers/iio/adc/da9150-gpadc.c
drivers/iio/adc/Kconfig +9 -0
index 0f79e47..6e00b81 100644
@@ -135,6 +135,15 @@ config AXP288_ADC
 	  device. Depending on platform configuration, this general purpose ADC can
 	  be used for sampling sensors such as thermal resistors.
 
+config DA9150_GPADC
+	tristate "Dialog DA9150 GPADC driver support"
+	depends on MFD_DA9150
+	help
+	  Say yes here to build support for Dialog DA9150 GPADC.
+
+	  This driver can also be built as a module. If chosen, the module name
+	  will be da9150-gpadc.
+
 config EXYNOS_ADC
 	tristate "Exynos ADC driver support"
 	depends on ARCH_EXYNOS || ARCH_S3C24XX || ARCH_S3C64XX || (OF && COMPILE_TEST)
drivers/iio/adc/Makefile +1 -0
index 701fdb7..d56ee9b 100644
@@ -15,6 +15,7 @@ obj-$(CONFIG_AD7887) += ad7887.o
 obj-$(CONFIG_AD799X) += ad799x.o
 obj-$(CONFIG_AT91_ADC) += at91_adc.o
 obj-$(CONFIG_AXP288_ADC) += axp288_adc.o
+obj-$(CONFIG_DA9150_GPADC) += da9150-gpadc.o
 obj-$(CONFIG_EXYNOS_ADC) += exynos_adc.o
 obj-$(CONFIG_LP8788_ADC) += lp8788_adc.o
 obj-$(CONFIG_MAX1027) += max1027.o
drivers/iio/adc/da9150-gpadc.c new file +277 -0
new file mode 100644
index 0000000..3f7bc81
@@ -0,0 +1,409 @@
+/*
+ * DA9150 GPADC Driver
+ *
+ * Copyright (c) 2014 Dialog Semiconductor
+ *
+ * Author: Adam Thomson <[email protected]>
+ *
+ * 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.
+ */
+
+#include <linux/kernel.h>
+#include <linux/slab.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/interrupt.h>
+#include <linux/mutex.h>
+#include <linux/completion.h>
+#include <linux/iio/iio.h>
+#include <linux/iio/machine.h>
+#include <linux/iio/driver.h>
+#include <linux/mfd/da9150/core.h>
+#include <linux/mfd/da9150/registers.h>
+
+/* Channels */
+enum da9150_gpadc_hw_channel {
+	DA9150_GPADC_HW_CHAN_GPIOA_2V = 0,
+	DA9150_GPADC_HW_CHAN_GPIOA_2V_,
+	DA9150_GPADC_HW_CHAN_GPIOB_2V,
+	DA9150_GPADC_HW_CHAN_GPIOB_2V_,
+	DA9150_GPADC_HW_CHAN_GPIOC_2V,
+	DA9150_GPADC_HW_CHAN_GPIOC_2V_,
+	DA9150_GPADC_HW_CHAN_GPIOD_2V,
+	DA9150_GPADC_HW_CHAN_GPIOD_2V_,
+	DA9150_GPADC_HW_CHAN_IBUS_SENSE,
+	DA9150_GPADC_HW_CHAN_IBUS_SENSE_,
+	DA9150_GPADC_HW_CHAN_VBUS_DIV,
+	DA9150_GPADC_HW_CHAN_VBUS_DIV_,
+	DA9150_GPADC_HW_CHAN_ID,
+	DA9150_GPADC_HW_CHAN_ID_,
+	DA9150_GPADC_HW_CHAN_VSYS,
+	DA9150_GPADC_HW_CHAN_VSYS_,
+	DA9150_GPADC_HW_CHAN_GPIOA_6V,
+	DA9150_GPADC_HW_CHAN_GPIOA_6V_,
+	DA9150_GPADC_HW_CHAN_GPIOB_6V,
+	DA9150_GPADC_HW_CHAN_GPIOB_6V_,
+	DA9150_GPADC_HW_CHAN_GPIOC_6V,
+	DA9150_GPADC_HW_CHAN_GPIOC_6V_,
+	DA9150_GPADC_HW_CHAN_GPIOD_6V,
+	DA9150_GPADC_HW_CHAN_GPIOD_6V_,
+	DA9150_GPADC_HW_CHAN_VBAT,
+	DA9150_GPADC_HW_CHAN_VBAT_,
+	DA9150_GPADC_HW_CHAN_TBAT,
+	DA9150_GPADC_HW_CHAN_TBAT_,
+	DA9150_GPADC_HW_CHAN_TJUNC_CORE,
+	DA9150_GPADC_HW_CHAN_TJUNC_CORE_,
+	DA9150_GPADC_HW_CHAN_TJUNC_OVP,
+	DA9150_GPADC_HW_CHAN_TJUNC_OVP_,
+};
+
+enum da9150_gpadc_channel {
+	DA9150_GPADC_CHAN_GPIOA = 0,
+	DA9150_GPADC_CHAN_GPIOB,
+	DA9150_GPADC_CHAN_GPIOC,
+	DA9150_GPADC_CHAN_GPIOD,
+	DA9150_GPADC_CHAN_IBUS,
+	DA9150_GPADC_CHAN_VBUS,
+	DA9150_GPADC_CHAN_ID,
+	DA9150_GPADC_CHAN_VSYS,
+	DA9150_GPADC_CHAN_VBAT,
+	DA9150_GPADC_CHAN_TBAT,
+	DA9150_GPADC_CHAN_TJUNC_CORE,
+	DA9150_GPADC_CHAN_TJUNC_OVP,
+};
+
+/* Private data */
+struct da9150_gpadc {
+	struct da9150 *da9150;
+	struct device *dev;
+
+	struct mutex lock;
+	struct completion complete;
+};
+
+
+static irqreturn_t da9150_gpadc_irq(int irq, void *data)
+{
+
+	struct da9150_gpadc *gpadc = data;
+
+	complete(&gpadc->complete);
+
+	return IRQ_HANDLED;
+}
+
+static int da9150_gpadc_read_adc(struct da9150_gpadc *gpadc, int hw_chan)
+{
+	u8 result_regs[2];
+	int result;
+
+	mutex_lock(&gpadc->lock);
+
+	/* Set channel & enable measurement */
+	da9150_reg_write(gpadc->da9150, DA9150_GPADC_MAN,
+			 (DA9150_GPADC_EN_MASK |
+			  hw_chan << DA9150_GPADC_MUX_SHIFT));
+
+	/* Consume left-over completion from a previous timeout */
+	try_wait_for_completion(&gpadc->complete);
+
+	/* Check for actual completion */
+	wait_for_completion_timeout(&gpadc->complete, msecs_to_jiffies(5));
+
+	/* Read result and status from device */
+	da9150_bulk_read(gpadc->da9150, DA9150_GPADC_RES_A, 2, result_regs);
+
+	mutex_unlock(&gpadc->lock);
+
+	/* Check to make sure device really has completed reading */
+	if (result_regs[1] & DA9150_GPADC_RUN_MASK) {
+		dev_err(gpadc->dev, "Timeout on channel %d of GPADC\n",
+			hw_chan);
+		return -ETIMEDOUT;
+	}
+
+	/* LSBs - 2 bits */
+	result = (result_regs[1] & DA9150_GPADC_RES_L_MASK) >>
+		 DA9150_GPADC_RES_L_SHIFT;
+	/* MSBs - 8 bits */
+	result |= result_regs[0] << DA9150_GPADC_RES_L_BITS;
+
+	return result;
+}
+
+static inline int da9150_gpadc_gpio_6v_voltage_now(int raw_val)
+{
+	/* Convert to mV */
+	return (6 * ((raw_val * 1000) + 500)) / 1024;
+}
+
+static inline int da9150_gpadc_ibus_current_avg(int raw_val)
+{
+	/* Convert to mA */
+	return (4 * ((raw_val * 1000) + 500)) / 2048;
+}
+
+static inline int da9150_gpadc_vbus_21v_voltage_now(int raw_val)
+{
+	/* Convert to mV */
+	return (21 * ((raw_val * 1000) + 500)) / 1024;
+}
+
+static inline int da9150_gpadc_vsys_6v_voltage_now(int raw_val)
+{
+	/* Convert to mV */
+	return (3 * ((raw_val * 1000) + 500)) / 512;
+}
+
+static int da9150_gpadc_read_processed(struct da9150_gpadc *gpadc, int channel,
+				       int hw_chan, int *val)
+{
+	int raw_val;
+
+	raw_val = da9150_gpadc_read_adc(gpadc, hw_chan);
+	if (raw_val < 0)
+		return raw_val;
+
+	switch (channel) {
+	case DA9150_GPADC_CHAN_GPIOA:
+	case DA9150_GPADC_CHAN_GPIOB:
+	case DA9150_GPADC_CHAN_GPIOC:
+	case DA9150_GPADC_CHAN_GPIOD:
+		*val = da9150_gpadc_gpio_6v_voltage_now(raw_val);
+		break;
+	case DA9150_GPADC_CHAN_IBUS:
+		*val = da9150_gpadc_ibus_current_avg(raw_val);
+		break;
+	case DA9150_GPADC_CHAN_VBUS:
+		*val = da9150_gpadc_vbus_21v_voltage_now(raw_val);
+		break;
+	case DA9150_GPADC_CHAN_VSYS:
+		*val = da9150_gpadc_vsys_6v_voltage_now(raw_val);
+		break;
+	default:
+		/* No processing for other channels so return raw value */
+		*val = raw_val;
+		break;
+	}
+
+	return IIO_VAL_INT;
+}
+
+static int da9150_gpadc_read_scale(int channel, int *val, int *val2)
+{
+	switch (channel) {
+	case DA9150_GPADC_CHAN_VBAT:
+		*val = 2932;
+		*val2 = 1000;
+		return IIO_VAL_FRACTIONAL;
+	case DA9150_GPADC_CHAN_TJUNC_CORE:
+	case DA9150_GPADC_CHAN_TJUNC_OVP:
+		*val = 1000000;
+		*val2 = 4420;
+		return IIO_VAL_FRACTIONAL;
+	default:
+		return -EINVAL;
+	}
+}
+
+static int da9150_gpadc_read_offset(int channel, int *val)
+{
+	switch (channel) {
+	case DA9150_GPADC_CHAN_VBAT:
+		*val = 1500000 / 2932;
+		return IIO_VAL_INT;
+	case DA9150_GPADC_CHAN_TJUNC_CORE:
+	case DA9150_GPADC_CHAN_TJUNC_OVP:
+		*val = -144;
+		return IIO_VAL_INT;
+	default:
+		return -EINVAL;
+	}
+}
+
+static int da9150_gpadc_read_raw(struct iio_dev *indio_dev,
+				 struct iio_chan_spec const *chan,
+				 int *val, int *val2, long mask)
+{
+	struct da9150_gpadc *gpadc = iio_priv(indio_dev);
+
+	if ((chan->channel < DA9150_GPADC_CHAN_GPIOA) ||
+	    (chan->channel > DA9150_GPADC_CHAN_TJUNC_OVP))
+		return -EINVAL;
+
+	switch (mask) {
+	case IIO_CHAN_INFO_RAW:
+	case IIO_CHAN_INFO_PROCESSED:
+		return da9150_gpadc_read_processed(gpadc, chan->channel,
+						   chan->address, val);
+	case IIO_CHAN_INFO_SCALE:
+		return da9150_gpadc_read_scale(chan->channel, val, val2);
+	case IIO_CHAN_INFO_OFFSET:
+		return da9150_gpadc_read_offset(chan->channel, val);
+	default:
+		return -EINVAL;
+	}
+}
+
+static const struct iio_info da9150_gpadc_info = {
+	.read_raw = &da9150_gpadc_read_raw,
+	.driver_module = THIS_MODULE,
+};
+
+#define DA9150_GPADC_CHANNEL(_id, _hw_id, _type, chan_info,	\
+			     _ext_name) {			\
+	.type = _type,						\
+	.indexed = 1,						\
+	.channel = DA9150_GPADC_CHAN_##_id,			\
+	.address = DA9150_GPADC_HW_CHAN_##_hw_id,		\
+	.info_mask_separate = chan_info,			\
+	.extend_name = _ext_name,				\
+	.datasheet_name = #_id,					\
+}
+
+#define DA9150_GPADC_CHANNEL_RAW(_id, _hw_id, _type, _ext_name)	\
+	DA9150_GPADC_CHANNEL(_id, _hw_id, _type,		\
+			     BIT(IIO_CHAN_INFO_RAW), _ext_name)
+
+#define DA9150_GPADC_CHANNEL_SCALED(_id, _hw_id, _type, _ext_name)	\
+	DA9150_GPADC_CHANNEL(_id, _hw_id, _type,			\
+			     BIT(IIO_CHAN_INFO_RAW) |			\
+			     BIT(IIO_CHAN_INFO_SCALE) |			\
+			     BIT(IIO_CHAN_INFO_OFFSET),			\
+			     _ext_name)
+

drivers/iio/adc/da9150-gpadc.c line 287

Quoted 10 lines
drivers/iio/adc/da9150-gpadc.c new file +10 -0
+#define DA9150_GPADC_CHANNEL_PROCESSED(_id, _hw_id, _type, _ext_name)	\
+	DA9150_GPADC_CHANNEL(_id, _hw_id, _type,			\
+			     BIT(IIO_CHAN_INFO_PROCESSED), _ext_name)
+
+/* Supported channels */
+static const struct iio_chan_spec da9150_gpadc_channels[] = {
+	DA9150_GPADC_CHANNEL_PROCESSED(GPIOA, GPIOA_6V, IIO_VOLTAGE, "GPIOA"),
+	DA9150_GPADC_CHANNEL_PROCESSED(GPIOB, GPIOB_6V, IIO_VOLTAGE, "GPIOB"),
+	DA9150_GPADC_CHANNEL_PROCESSED(GPIOC, GPIOC_6V, IIO_VOLTAGE, "GPIOC"),
+	DA9150_GPADC_CHANNEL_PROCESSED(GPIOD, GPIOD_6V, IIO_VOLTAGE, "GPIOD"),

I'm not sure some of these really deserve extended names. Those are usually reserved for naming strange internal adc channels etc. These first 4 are presumably just for input pins? Those should just be channels 0..3 On another note, unless you want really weird sysfs attribute names, the extended names want to be lowercase.

drivers/iio/adc/da9150-gpadc.c line 290

Quoted 3 lines
drivers/iio/adc/da9150-gpadc.c new file +3 -0
+	DA9150_GPADC_CHANNEL_PROCESSED(IBUS, IBUS_SENSE, IIO_CURRENT, "IBUS"),
+	DA9150_GPADC_CHANNEL_PROCESSED(VBUS, VBUS_DIV_, IIO_VOLTAGE, "VBUS"),
+	DA9150_GPADC_CHANNEL_RAW(ID, ID, IIO_VOLTAGE, "ID"),

You hae an identifier voltage? That's certainly unusual but if so - fair enough and it defintely needs the extname!

drivers/iio/adc/da9150-gpadc.c line 295

Quoted 5 lines
drivers/iio/adc/da9150-gpadc.c new file +5 -0
+	DA9150_GPADC_CHANNEL_PROCESSED(VSYS, VSYS, IIO_VOLTAGE, "VSYS"),
+	DA9150_GPADC_CHANNEL_SCALED(VBAT, VBAT, IIO_VOLTAGE, "VBAT"),
+	DA9150_GPADC_CHANNEL_RAW(TBAT, TBAT, IIO_VOLTAGE, "TBAT"),
+	DA9150_GPADC_CHANNEL_SCALED(TJUNC_CORE, TJUNC_CORE, IIO_TEMP,
+				    "TJUNC_CORE"),

tjunc_core is a good use of extname ;)

Quoted 117 lines
drivers/iio/adc/da9150-gpadc.c new file +114 -1
+	DA9150_GPADC_CHANNEL_SCALED(TJUNC_OVP, TJUNC_OVP, IIO_TEMP,
+				    "TJUNC_OVP"),
+};
+
+/* Default maps used by da9150-charger */
+static struct iio_map da9150_gpadc_default_maps[] = {
+	{
+		.consumer_dev_name = "da9150-charger",
+		.consumer_channel = "CHAN_IBUS",
+		.adc_channel_label = "IBUS",
+	},
+	{
+		.consumer_dev_name = "da9150-charger",
+		.consumer_channel = "CHAN_VBUS",
+		.adc_channel_label = "VBUS",
+	},
+	{
+		.consumer_dev_name = "da9150-charger",
+		.consumer_channel = "CHAN_TJUNC",
+		.adc_channel_label = "TJUNC_CORE",
+	},
+	{
+		.consumer_dev_name = "da9150-charger",
+		.consumer_channel = "CHAN_VBAT",
+		.adc_channel_label = "VBAT",
+	},
+	{},
+};
+
+static int da9150_gpadc_probe(struct platform_device *pdev)
+{
+	struct device *dev = &pdev->dev;
+	struct da9150 *da9150 = dev_get_drvdata(dev->parent);
+	struct da9150_gpadc *gpadc;
+	struct iio_dev *indio_dev;
+	int irq, ret;
+
+	indio_dev = devm_iio_device_alloc(&pdev->dev, sizeof(*gpadc));
+	if (!indio_dev) {
+		dev_err(&pdev->dev, "Failed to allocate IIO device\n");
+		return -ENOMEM;
+	}
+	gpadc = iio_priv(indio_dev);
+
+	platform_set_drvdata(pdev, indio_dev);
+	gpadc->da9150 = da9150;
+	gpadc->dev = dev;
+	mutex_init(&gpadc->lock);
+	init_completion(&gpadc->complete);
+
+	irq = platform_get_irq_byname(pdev, "GPADC");
+	if (irq < 0) {
+		dev_err(dev, "Failed to get IRQ: %d\n", irq);
+		return irq;
+	}
+
+	ret = devm_request_threaded_irq(dev, irq, NULL, da9150_gpadc_irq,
+					IRQF_ONESHOT, "GPADC", gpadc);
+	if (ret) {
+		dev_err(dev, "Failed to request IRQ %d: %d\n", irq, ret);
+		return ret;
+	}
+
+	ret = iio_map_array_register(indio_dev, da9150_gpadc_default_maps);
+	if (ret) {
+		dev_err(dev, "Failed to register IIO maps: %d\n", ret);
+		return ret;
+	}
+
+	indio_dev->name = dev_name(dev);
+	indio_dev->dev.parent = dev;
+	indio_dev->dev.of_node = pdev->dev.of_node;
+	indio_dev->info = &da9150_gpadc_info;
+	indio_dev->modes = INDIO_DIRECT_MODE;
+	indio_dev->channels = da9150_gpadc_channels;
+	indio_dev->num_channels = ARRAY_SIZE(da9150_gpadc_channels);
+
+	ret = iio_device_register(indio_dev);
+	if (ret) {
+		dev_err(dev, "Failed to register IIO device: %d\n", ret);
+		goto iio_map_unreg;
+	}
+
+	return 0;
+
+iio_map_unreg:
+	iio_map_array_unregister(indio_dev);
+
+	return ret;
+}
+
+static int da9150_gpadc_remove(struct platform_device *pdev)
+{
+	struct iio_dev *indio_dev = platform_get_drvdata(pdev);
+
+	iio_device_unregister(indio_dev);
+	iio_map_array_unregister(indio_dev);
+
+	return 0;
+}
+
+static struct platform_driver da9150_gpadc_driver = {
+	.driver = {
+		.name = "da9150-gpadc",
+	},
+	.probe = da9150_gpadc_probe,
+	.remove = da9150_gpadc_remove,
+};
+
+module_platform_driver(da9150_gpadc_driver);
+
+MODULE_DESCRIPTION("GPADC Driver for DA9150");
+MODULE_AUTHOR("Adam Thomson <[email protected]>");
+MODULE_LICENSE("GPL");
--

1.9.3

#9 lore raw

RE: [PATCH v5 3/7] iio: Add support for DA9150 GPADC

Quoted 6 lines · Jonathan Cameron
Quoted 3 lines · Adam Thomson

This patch adds support for DA9150 Charger & Fuel-Gauge IC GPADC.

One last query from me.

Quoted 7 lines

Using the extended channel names in IIO is only really appropriate when they don't correspond to simple pins on the side of the chip. For those just drop the extname bit. Some of the channels you have here, definitely need them though.

Drop those first 4 or convince me otherwise and add

Have added responses below. If the comments are accepted then I'll respin and add you're 'Acked-by'. Is that ok?

Quoted 338 lines
Quoted 4 lines
---
 drivers/iio/adc/Kconfig        |   9 +
 drivers/iio/adc/Makefile       |   1 +
 drivers/iio/adc/da9150-gpadc.c | 409

+++++++++++++++++++++++++++++++++++++++++

Quoted 13 lines
 3 files changed, 419 insertions(+)
 create mode 100644 drivers/iio/adc/da9150-gpadc.c
drivers/iio/adc/Kconfig +2 -0
index 0f79e47..6e00b81 100644
@@ -135,6 +135,15 @@ config AXP288_ADC
 	  device. Depending on platform configuration, this general purpose ADC can
 	  be used for sampling sensors such as thermal resistors.
 
+config DA9150_GPADC
+	tristate "Dialog DA9150 GPADC driver support"

drivers/iio/adc/Kconfig config AXP288_ADC · line 149

Quoted 10 lines
drivers/iio/adc/Kconfig +7 -0
+	depends on MFD_DA9150
+	help
+	  Say yes here to build support for Dialog DA9150 GPADC.
+
+	  This driver can also be built as a module. If chosen, the module name
+	  will be da9150-gpadc.
+
 config EXYNOS_ADC
 	tristate "Exynos ADC driver support"
 	depends on ARCH_EXYNOS || ARCH_S3C24XX || ARCH_S3C64XX || (OF &&

COMPILE_TEST)

Quoted 169 lines
drivers/iio/adc/Makefile +1 -0
index 701fdb7..d56ee9b 100644
@@ -15,6 +15,7 @@ obj-$(CONFIG_AD7887) += ad7887.o
 obj-$(CONFIG_AD799X) += ad799x.o
 obj-$(CONFIG_AT91_ADC) += at91_adc.o
 obj-$(CONFIG_AXP288_ADC) += axp288_adc.o
+obj-$(CONFIG_DA9150_GPADC) += da9150-gpadc.o
 obj-$(CONFIG_EXYNOS_ADC) += exynos_adc.o
 obj-$(CONFIG_LP8788_ADC) += lp8788_adc.o
 obj-$(CONFIG_MAX1027) += max1027.o
drivers/iio/adc/da9150-gpadc.c new file +151 -0
new file mode 100644
index 0000000..3f7bc81
@@ -0,0 +1,409 @@
+/*
+ * DA9150 GPADC Driver
+ *
+ * Copyright (c) 2014 Dialog Semiconductor
+ *
+ * Author: Adam Thomson <[email protected]>
+ *
+ * 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.
+ */
+
+#include <linux/kernel.h>
+#include <linux/slab.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/interrupt.h>
+#include <linux/mutex.h>
+#include <linux/completion.h>
+#include <linux/iio/iio.h>
+#include <linux/iio/machine.h>
+#include <linux/iio/driver.h>
+#include <linux/mfd/da9150/core.h>
+#include <linux/mfd/da9150/registers.h>
+
+/* Channels */
+enum da9150_gpadc_hw_channel {
+	DA9150_GPADC_HW_CHAN_GPIOA_2V = 0,
+	DA9150_GPADC_HW_CHAN_GPIOA_2V_,
+	DA9150_GPADC_HW_CHAN_GPIOB_2V,
+	DA9150_GPADC_HW_CHAN_GPIOB_2V_,
+	DA9150_GPADC_HW_CHAN_GPIOC_2V,
+	DA9150_GPADC_HW_CHAN_GPIOC_2V_,
+	DA9150_GPADC_HW_CHAN_GPIOD_2V,
+	DA9150_GPADC_HW_CHAN_GPIOD_2V_,
+	DA9150_GPADC_HW_CHAN_IBUS_SENSE,
+	DA9150_GPADC_HW_CHAN_IBUS_SENSE_,
+	DA9150_GPADC_HW_CHAN_VBUS_DIV,
+	DA9150_GPADC_HW_CHAN_VBUS_DIV_,
+	DA9150_GPADC_HW_CHAN_ID,
+	DA9150_GPADC_HW_CHAN_ID_,
+	DA9150_GPADC_HW_CHAN_VSYS,
+	DA9150_GPADC_HW_CHAN_VSYS_,
+	DA9150_GPADC_HW_CHAN_GPIOA_6V,
+	DA9150_GPADC_HW_CHAN_GPIOA_6V_,
+	DA9150_GPADC_HW_CHAN_GPIOB_6V,
+	DA9150_GPADC_HW_CHAN_GPIOB_6V_,
+	DA9150_GPADC_HW_CHAN_GPIOC_6V,
+	DA9150_GPADC_HW_CHAN_GPIOC_6V_,
+	DA9150_GPADC_HW_CHAN_GPIOD_6V,
+	DA9150_GPADC_HW_CHAN_GPIOD_6V_,
+	DA9150_GPADC_HW_CHAN_VBAT,
+	DA9150_GPADC_HW_CHAN_VBAT_,
+	DA9150_GPADC_HW_CHAN_TBAT,
+	DA9150_GPADC_HW_CHAN_TBAT_,
+	DA9150_GPADC_HW_CHAN_TJUNC_CORE,
+	DA9150_GPADC_HW_CHAN_TJUNC_CORE_,
+	DA9150_GPADC_HW_CHAN_TJUNC_OVP,
+	DA9150_GPADC_HW_CHAN_TJUNC_OVP_,
+};
+
+enum da9150_gpadc_channel {
+	DA9150_GPADC_CHAN_GPIOA = 0,
+	DA9150_GPADC_CHAN_GPIOB,
+	DA9150_GPADC_CHAN_GPIOC,
+	DA9150_GPADC_CHAN_GPIOD,
+	DA9150_GPADC_CHAN_IBUS,
+	DA9150_GPADC_CHAN_VBUS,
+	DA9150_GPADC_CHAN_ID,
+	DA9150_GPADC_CHAN_VSYS,
+	DA9150_GPADC_CHAN_VBAT,
+	DA9150_GPADC_CHAN_TBAT,
+	DA9150_GPADC_CHAN_TJUNC_CORE,
+	DA9150_GPADC_CHAN_TJUNC_OVP,
+};
+
+/* Private data */
+struct da9150_gpadc {
+	struct da9150 *da9150;
+	struct device *dev;
+
+	struct mutex lock;
+	struct completion complete;
+};
+
+
+static irqreturn_t da9150_gpadc_irq(int irq, void *data)
+{
+
+	struct da9150_gpadc *gpadc = data;
+
+	complete(&gpadc->complete);
+
+	return IRQ_HANDLED;
+}
+
+static int da9150_gpadc_read_adc(struct da9150_gpadc *gpadc, int hw_chan)
+{
+	u8 result_regs[2];
+	int result;
+
+	mutex_lock(&gpadc->lock);
+
+	/* Set channel & enable measurement */
+	da9150_reg_write(gpadc->da9150, DA9150_GPADC_MAN,
+			 (DA9150_GPADC_EN_MASK |
+			  hw_chan << DA9150_GPADC_MUX_SHIFT));
+
+	/* Consume left-over completion from a previous timeout */
+	try_wait_for_completion(&gpadc->complete);
+
+	/* Check for actual completion */
+	wait_for_completion_timeout(&gpadc->complete, msecs_to_jiffies(5));
+
+	/* Read result and status from device */
+	da9150_bulk_read(gpadc->da9150, DA9150_GPADC_RES_A, 2, result_regs);
+
+	mutex_unlock(&gpadc->lock);
+
+	/* Check to make sure device really has completed reading */
+	if (result_regs[1] & DA9150_GPADC_RUN_MASK) {
+		dev_err(gpadc->dev, "Timeout on channel %d of GPADC\n",
+			hw_chan);
+		return -ETIMEDOUT;
+	}
+
+	/* LSBs - 2 bits */
+	result = (result_regs[1] & DA9150_GPADC_RES_L_MASK) >>
+		 DA9150_GPADC_RES_L_SHIFT;
+	/* MSBs - 8 bits */
+	result |= result_regs[0] << DA9150_GPADC_RES_L_BITS;
+
+	return result;
+}
+
+static inline int da9150_gpadc_gpio_6v_voltage_now(int raw_val)
+{
+	/* Convert to mV */
+	return (6 * ((raw_val * 1000) + 500)) / 1024;
+}
+
+static inline int da9150_gpadc_ibus_current_avg(int raw_val)
+{
+	/* Convert to mA */
+	return (4 * ((raw_val * 1000) + 500)) / 2048;
+}
+
+static inline int da9150_gpadc_vbus_21v_voltage_now(int raw_val)
+{
+	/* Convert to mV */

drivers/iio/adc/da9150-gpadc.c line 161

Quoted 10 lines
drivers/iio/adc/da9150-gpadc.c new file +10 -0
+	return (21 * ((raw_val * 1000) + 500)) / 1024;
+}
+
+static inline int da9150_gpadc_vsys_6v_voltage_now(int raw_val)
+{
+	/* Convert to mV */
+	return (3 * ((raw_val * 1000) + 500)) / 512;
+}
+
+static int da9150_gpadc_read_processed(struct da9150_gpadc *gpadc, int

channel,

Quoted 107 lines
drivers/iio/adc/da9150-gpadc.c new file +107 -0
+				       int hw_chan, int *val)
+{
+	int raw_val;
+
+	raw_val = da9150_gpadc_read_adc(gpadc, hw_chan);
+	if (raw_val < 0)
+		return raw_val;
+
+	switch (channel) {
+	case DA9150_GPADC_CHAN_GPIOA:
+	case DA9150_GPADC_CHAN_GPIOB:
+	case DA9150_GPADC_CHAN_GPIOC:
+	case DA9150_GPADC_CHAN_GPIOD:
+		*val = da9150_gpadc_gpio_6v_voltage_now(raw_val);
+		break;
+	case DA9150_GPADC_CHAN_IBUS:
+		*val = da9150_gpadc_ibus_current_avg(raw_val);
+		break;
+	case DA9150_GPADC_CHAN_VBUS:
+		*val = da9150_gpadc_vbus_21v_voltage_now(raw_val);
+		break;
+	case DA9150_GPADC_CHAN_VSYS:
+		*val = da9150_gpadc_vsys_6v_voltage_now(raw_val);
+		break;
+	default:
+		/* No processing for other channels so return raw value */
+		*val = raw_val;
+		break;
+	}
+
+	return IIO_VAL_INT;
+}
+
+static int da9150_gpadc_read_scale(int channel, int *val, int *val2)
+{
+	switch (channel) {
+	case DA9150_GPADC_CHAN_VBAT:
+		*val = 2932;
+		*val2 = 1000;
+		return IIO_VAL_FRACTIONAL;
+	case DA9150_GPADC_CHAN_TJUNC_CORE:
+	case DA9150_GPADC_CHAN_TJUNC_OVP:
+		*val = 1000000;
+		*val2 = 4420;
+		return IIO_VAL_FRACTIONAL;
+	default:
+		return -EINVAL;
+	}
+}
+
+static int da9150_gpadc_read_offset(int channel, int *val)
+{
+	switch (channel) {
+	case DA9150_GPADC_CHAN_VBAT:
+		*val = 1500000 / 2932;
+		return IIO_VAL_INT;
+	case DA9150_GPADC_CHAN_TJUNC_CORE:
+	case DA9150_GPADC_CHAN_TJUNC_OVP:
+		*val = -144;
+		return IIO_VAL_INT;
+	default:
+		return -EINVAL;
+	}
+}
+
+static int da9150_gpadc_read_raw(struct iio_dev *indio_dev,
+				 struct iio_chan_spec const *chan,
+				 int *val, int *val2, long mask)
+{
+	struct da9150_gpadc *gpadc = iio_priv(indio_dev);
+
+	if ((chan->channel < DA9150_GPADC_CHAN_GPIOA) ||
+	    (chan->channel > DA9150_GPADC_CHAN_TJUNC_OVP))
+		return -EINVAL;
+
+	switch (mask) {
+	case IIO_CHAN_INFO_RAW:
+	case IIO_CHAN_INFO_PROCESSED:
+		return da9150_gpadc_read_processed(gpadc, chan->channel,
+						   chan->address, val);
+	case IIO_CHAN_INFO_SCALE:
+		return da9150_gpadc_read_scale(chan->channel, val, val2);
+	case IIO_CHAN_INFO_OFFSET:
+		return da9150_gpadc_read_offset(chan->channel, val);
+	default:
+		return -EINVAL;
+	}
+}
+
+static const struct iio_info da9150_gpadc_info = {
+	.read_raw = &da9150_gpadc_read_raw,
+	.driver_module = THIS_MODULE,
+};
+
+#define DA9150_GPADC_CHANNEL(_id, _hw_id, _type, chan_info,	\
+			     _ext_name) {			\
+	.type = _type,						\
+	.indexed = 1,						\
+	.channel = DA9150_GPADC_CHAN_##_id,			\
+	.address = DA9150_GPADC_HW_CHAN_##_hw_id,		\
+	.info_mask_separate = chan_info,			\
+	.extend_name = _ext_name,				\
+	.datasheet_name = #_id,					\
+}
+
+#define DA9150_GPADC_CHANNEL_RAW(_id, _hw_id, _type, _ext_name)	\
+	DA9150_GPADC_CHANNEL(_id, _hw_id, _type,		\

drivers/iio/adc/da9150-gpadc.c

Quoted 10 lines
drivers/iio/adc/da9150-gpadc.c new file +10 -0
+			     BIT(IIO_CHAN_INFO_RAW), _ext_name)
+
+#define DA9150_GPADC_CHANNEL_SCALED(_id, _hw_id, _type, _ext_name)	\
+	DA9150_GPADC_CHANNEL(_id, _hw_id, _type,			\
+			     BIT(IIO_CHAN_INFO_RAW) |			\
+			     BIT(IIO_CHAN_INFO_SCALE) |			\
+			     BIT(IIO_CHAN_INFO_OFFSET),			\
+			     _ext_name)
+
+#define DA9150_GPADC_CHANNEL_PROCESSED(_id, _hw_id, _type, _ext_name)
	\

drivers/iio/adc/da9150-gpadc.c

Quoted 6 lines
drivers/iio/adc/da9150-gpadc.c new file +6 -0
+	DA9150_GPADC_CHANNEL(_id, _hw_id, _type,			\
+			     BIT(IIO_CHAN_INFO_PROCESSED), _ext_name)
+
+/* Supported channels */
+static const struct iio_chan_spec da9150_gpadc_channels[] = {
+	DA9150_GPADC_CHANNEL_PROCESSED(GPIOA, GPIOA_6V, IIO_VOLTAGE,

"GPIOA"),

drivers/iio/adc/da9150-gpadc.c line 285

Quoted 1 line
drivers/iio/adc/da9150-gpadc.c new file +1 -0
+	DA9150_GPADC_CHANNEL_PROCESSED(GPIOB, GPIOB_6V, IIO_VOLTAGE,

"GPIOB"),

drivers/iio/adc/da9150-gpadc.c line 286

Quoted 1 line
drivers/iio/adc/da9150-gpadc.c new file +1 -0
+	DA9150_GPADC_CHANNEL_PROCESSED(GPIOC, GPIOC_6V, IIO_VOLTAGE,

"GPIOC"),

Quoted 8 lines

drivers/iio/adc/da9150-gpadc.c line 287

Quoted 1 line
drivers/iio/adc/da9150-gpadc.c new file +1 -0
+	DA9150_GPADC_CHANNEL_PROCESSED(GPIOD, GPIOD_6V, IIO_VOLTAGE,

"GPIOD"),
I'm not sure some of these really deserve extended names. Those are usually reserved for naming strange internal adc channels etc. These first 4 are presumably just for input pins? Those should just be channels 0..3 On another note, unless you want really weird sysfs attribute names, the extended names want to be lowercase.

I'd prefer to keep the names because the input pins are muxed with GPIOs of the chip, so thought it sensible to show that this is the case. Am happy to change to lower-case to follow convention.

Quoted 7 lines

drivers/iio/adc/da9150-gpadc.c line 288

Quoted 1 line
drivers/iio/adc/da9150-gpadc.c new file +1 -0
+	DA9150_GPADC_CHANNEL_PROCESSED(IBUS, IBUS_SENSE, IIO_CURRENT,

"IBUS"),

drivers/iio/adc/da9150-gpadc.c line 289

Quoted 1 line
drivers/iio/adc/da9150-gpadc.c new file +1 -0
+	DA9150_GPADC_CHANNEL_PROCESSED(VBUS, VBUS_DIV_, IIO_VOLTAGE,

"VBUS"),

drivers/iio/adc/da9150-gpadc.c line 290

Quoted 1 line
drivers/iio/adc/da9150-gpadc.c new file +1 -0
+	DA9150_GPADC_CHANNEL_RAW(ID, ID, IIO_VOLTAGE, "ID"),

You hae an identifier voltage? That's certainly unusual but if so - fair enough and it defintely needs the extname!

Thanks for pointing that out. Having checked again, this is not needed and can be dispensed with.

Quoted 125 lines

drivers/iio/adc/da9150-gpadc.c

Quoted 4 lines
drivers/iio/adc/da9150-gpadc.c new file +4 -0
+	DA9150_GPADC_CHANNEL_PROCESSED(VSYS, VSYS, IIO_VOLTAGE, "VSYS"),
+	DA9150_GPADC_CHANNEL_SCALED(VBAT, VBAT, IIO_VOLTAGE, "VBAT"),
+	DA9150_GPADC_CHANNEL_RAW(TBAT, TBAT, IIO_VOLTAGE, "TBAT"),
+	DA9150_GPADC_CHANNEL_SCALED(TJUNC_CORE, TJUNC_CORE,

IIO_TEMP,

drivers/iio/adc/da9150-gpadc.c line 295

Quoted 1 line
drivers/iio/adc/da9150-gpadc.c new file +1 -0
+				    "TJUNC_CORE"),

tjunc_core is a good use of extname ;)

Quoted 103 lines
drivers/iio/adc/da9150-gpadc.c new file +103 -0
+	DA9150_GPADC_CHANNEL_SCALED(TJUNC_OVP, TJUNC_OVP, IIO_TEMP,
+				    "TJUNC_OVP"),
+};
+
+/* Default maps used by da9150-charger */
+static struct iio_map da9150_gpadc_default_maps[] = {
+	{
+		.consumer_dev_name = "da9150-charger",
+		.consumer_channel = "CHAN_IBUS",
+		.adc_channel_label = "IBUS",
+	},
+	{
+		.consumer_dev_name = "da9150-charger",
+		.consumer_channel = "CHAN_VBUS",
+		.adc_channel_label = "VBUS",
+	},
+	{
+		.consumer_dev_name = "da9150-charger",
+		.consumer_channel = "CHAN_TJUNC",
+		.adc_channel_label = "TJUNC_CORE",
+	},
+	{
+		.consumer_dev_name = "da9150-charger",
+		.consumer_channel = "CHAN_VBAT",
+		.adc_channel_label = "VBAT",
+	},
+	{},
+};
+
+static int da9150_gpadc_probe(struct platform_device *pdev)
+{
+	struct device *dev = &pdev->dev;
+	struct da9150 *da9150 = dev_get_drvdata(dev->parent);
+	struct da9150_gpadc *gpadc;
+	struct iio_dev *indio_dev;
+	int irq, ret;
+
+	indio_dev = devm_iio_device_alloc(&pdev->dev, sizeof(*gpadc));
+	if (!indio_dev) {
+		dev_err(&pdev->dev, "Failed to allocate IIO device\n");
+		return -ENOMEM;
+	}
+	gpadc = iio_priv(indio_dev);
+
+	platform_set_drvdata(pdev, indio_dev);
+	gpadc->da9150 = da9150;
+	gpadc->dev = dev;
+	mutex_init(&gpadc->lock);
+	init_completion(&gpadc->complete);
+
+	irq = platform_get_irq_byname(pdev, "GPADC");
+	if (irq < 0) {
+		dev_err(dev, "Failed to get IRQ: %d\n", irq);
+		return irq;
+	}
+
+	ret = devm_request_threaded_irq(dev, irq, NULL, da9150_gpadc_irq,
+					IRQF_ONESHOT, "GPADC", gpadc);
+	if (ret) {
+		dev_err(dev, "Failed to request IRQ %d: %d\n", irq, ret);
+		return ret;
+	}
+
+	ret = iio_map_array_register(indio_dev, da9150_gpadc_default_maps);
+	if (ret) {
+		dev_err(dev, "Failed to register IIO maps: %d\n", ret);
+		return ret;
+	}
+
+	indio_dev->name = dev_name(dev);
+	indio_dev->dev.parent = dev;
+	indio_dev->dev.of_node = pdev->dev.of_node;
+	indio_dev->info = &da9150_gpadc_info;
+	indio_dev->modes = INDIO_DIRECT_MODE;
+	indio_dev->channels = da9150_gpadc_channels;
+	indio_dev->num_channels = ARRAY_SIZE(da9150_gpadc_channels);
+
+	ret = iio_device_register(indio_dev);
+	if (ret) {
+		dev_err(dev, "Failed to register IIO device: %d\n", ret);
+		goto iio_map_unreg;
+	}
+
+	return 0;
+
+iio_map_unreg:
+	iio_map_array_unregister(indio_dev);
+
+	return ret;
+}
+
+static int da9150_gpadc_remove(struct platform_device *pdev)
+{
+	struct iio_dev *indio_dev = platform_get_drvdata(pdev);
+
+	iio_device_unregister(indio_dev);
+	iio_map_array_unregister(indio_dev);
+
+	return 0;
+}
+
+static struct platform_driver da9150_gpadc_driver = {
+	.driver = {

drivers/iio/adc/da9150-gpadc.c

Quoted 10 lines
drivers/iio/adc/da9150-gpadc.c new file +10 -0
+		.name = "da9150-gpadc",
+	},
+	.probe = da9150_gpadc_probe,
+	.remove = da9150_gpadc_remove,
+};
+
+module_platform_driver(da9150_gpadc_driver);
+
+MODULE_DESCRIPTION("GPADC Driver for DA9150");
+MODULE_AUTHOR("Adam Thomson

<[email protected]>");

Quoted 4 lines
drivers/iio/adc/da9150-gpadc.c new file +1 -1
+MODULE_LICENSE("GPL");
--

1.9.3

maintainer
#10 lore raw

Re: [PATCH v5 3/7] iio: Add support for DA9150 GPADC

Quoted 13 lines · Opensource [Adam Thomson]
Quoted 11 lines · Jonathan Cameron
Quoted 3 lines · Adam Thomson

This patch adds support for DA9150 Charger & Fuel-Gauge IC GPADC.

One last query from me.

Using the extended channel names in IIO is only really appropriate when they don't correspond to simple pins on the side of the chip. For those just drop the extname bit. Some of the channels you have here, definitely need them though.

Quoted 6 lines
Quoted 2 lines

Drop those first 4 or convince me otherwise and add

Have added responses below. If the comments are accepted then I'll respin and add you're 'Acked-by'. Is that ok?

Not accepted as yet :)

Quoted 22 lines
Quoted 13 lines
Quoted 1 line

+#define DA9150_GPADC_CHANNEL_PROCESSED(_id, _hw_id, _type, _ext_name)

	\

drivers/iio/adc/da9150-gpadc.c

Quoted 6 lines
drivers/iio/adc/da9150-gpadc.c new file +6 -0
+	DA9150_GPADC_CHANNEL(_id, _hw_id, _type,			\
+			     BIT(IIO_CHAN_INFO_PROCESSED), _ext_name)
+
+/* Supported channels */
+static const struct iio_chan_spec da9150_gpadc_channels[] = {
+	DA9150_GPADC_CHANNEL_PROCESSED(GPIOA, GPIOA_6V, IIO_VOLTAGE,

"GPIOA"),

Review

Quoted 1 line
(quoted diff) +1 -0
+	DA9150_GPADC_CHANNEL_PROCESSED(GPIOB, GPIOB_6V, IIO_VOLTAGE,

"GPIOB"),

Review

Quoted 1 line
(quoted diff) +1 -0
+	DA9150_GPADC_CHANNEL_PROCESSED(GPIOC, GPIOC_6V, IIO_VOLTAGE,

"GPIOC"),

Quoted 8 lines

Review

Quoted 1 line
(quoted diff) +1 -0
+	DA9150_GPADC_CHANNEL_PROCESSED(GPIOD, GPIOD_6V, IIO_VOLTAGE,

"GPIOD"),
I'm not sure some of these really deserve extended names. Those are usually reserved for naming strange internal adc channels etc. These first 4 are presumably just for input pins? Those should just be channels 0..3 On another note, unless you want really weird sysfs attribute names, the extended names want to be lowercase.

Quoted 3 lines

I'd prefer to keep the names because the input pins are muxed with GPIOs of the chip, so thought it sensible to show that this is the case. Am happy to change to lower-case to follow convention.

Hmm. It's a bit of an oddity as the point of the naming
is about the uses, not which pins they are on. If we exposed the 'datasheet_name' parameter directly rather than just using it internally I'd suggest relying on that - but clearly you want it to be apparent in the interface. Whether that is useful is the question I'd raise here (and is the reason datasheet_name is not exposed.

The obvious question is does userspace care? Answer is probably not.

It cares what is being measured but this is about what pins it is on and doesn't provide any information on what is connected to them.

Quoted 137 lines
Quoted 8 lines

Review

Quoted 2 lines
(quoted diff) +1 -0
+	DA9150_GPADC_CHANNEL_PROCESSED(IBUS, IBUS_SENSE, IIO_CURRENT,

"IBUS"),

Review

Quoted 1 line
(quoted diff) +1 -0
+	DA9150_GPADC_CHANNEL_PROCESSED(VBUS, VBUS_DIV_, IIO_VOLTAGE,

"VBUS"),

drivers/iio/adc/da9150-gpadc.c line 290

Quoted 1 line
drivers/iio/adc/da9150-gpadc.c new file +1 -0
+	DA9150_GPADC_CHANNEL_RAW(ID, ID, IIO_VOLTAGE, "ID"),

You hae an identifier voltage? That's certainly unusual but if so - fair enough and it defintely needs the extname!

Thanks for pointing that out. Having checked again, this is not needed and can be dispensed with.

Quoted 125 lines

drivers/iio/adc/da9150-gpadc.c

Quoted 4 lines
drivers/iio/adc/da9150-gpadc.c new file +4 -0
+	DA9150_GPADC_CHANNEL_PROCESSED(VSYS, VSYS, IIO_VOLTAGE, "VSYS"),
+	DA9150_GPADC_CHANNEL_SCALED(VBAT, VBAT, IIO_VOLTAGE, "VBAT"),
+	DA9150_GPADC_CHANNEL_RAW(TBAT, TBAT, IIO_VOLTAGE, "TBAT"),
+	DA9150_GPADC_CHANNEL_SCALED(TJUNC_CORE, TJUNC_CORE,

IIO_TEMP,

drivers/iio/adc/da9150-gpadc.c line 295

Quoted 1 line
drivers/iio/adc/da9150-gpadc.c new file +1 -0
+				    "TJUNC_CORE"),

tjunc_core is a good use of extname ;)

Quoted 103 lines
drivers/iio/adc/da9150-gpadc.c new file +103 -0
+	DA9150_GPADC_CHANNEL_SCALED(TJUNC_OVP, TJUNC_OVP, IIO_TEMP,
+				    "TJUNC_OVP"),
+};
+
+/* Default maps used by da9150-charger */
+static struct iio_map da9150_gpadc_default_maps[] = {
+	{
+		.consumer_dev_name = "da9150-charger",
+		.consumer_channel = "CHAN_IBUS",
+		.adc_channel_label = "IBUS",
+	},
+	{
+		.consumer_dev_name = "da9150-charger",
+		.consumer_channel = "CHAN_VBUS",
+		.adc_channel_label = "VBUS",
+	},
+	{
+		.consumer_dev_name = "da9150-charger",
+		.consumer_channel = "CHAN_TJUNC",
+		.adc_channel_label = "TJUNC_CORE",
+	},
+	{
+		.consumer_dev_name = "da9150-charger",
+		.consumer_channel = "CHAN_VBAT",
+		.adc_channel_label = "VBAT",
+	},
+	{},
+};
+
+static int da9150_gpadc_probe(struct platform_device *pdev)
+{
+	struct device *dev = &pdev->dev;
+	struct da9150 *da9150 = dev_get_drvdata(dev->parent);
+	struct da9150_gpadc *gpadc;
+	struct iio_dev *indio_dev;
+	int irq, ret;
+
+	indio_dev = devm_iio_device_alloc(&pdev->dev, sizeof(*gpadc));
+	if (!indio_dev) {
+		dev_err(&pdev->dev, "Failed to allocate IIO device\n");
+		return -ENOMEM;
+	}
+	gpadc = iio_priv(indio_dev);
+
+	platform_set_drvdata(pdev, indio_dev);
+	gpadc->da9150 = da9150;
+	gpadc->dev = dev;
+	mutex_init(&gpadc->lock);
+	init_completion(&gpadc->complete);
+
+	irq = platform_get_irq_byname(pdev, "GPADC");
+	if (irq < 0) {
+		dev_err(dev, "Failed to get IRQ: %d\n", irq);
+		return irq;
+	}
+
+	ret = devm_request_threaded_irq(dev, irq, NULL, da9150_gpadc_irq,
+					IRQF_ONESHOT, "GPADC", gpadc);
+	if (ret) {
+		dev_err(dev, "Failed to request IRQ %d: %d\n", irq, ret);
+		return ret;
+	}
+
+	ret = iio_map_array_register(indio_dev, da9150_gpadc_default_maps);
+	if (ret) {
+		dev_err(dev, "Failed to register IIO maps: %d\n", ret);
+		return ret;
+	}
+
+	indio_dev->name = dev_name(dev);
+	indio_dev->dev.parent = dev;
+	indio_dev->dev.of_node = pdev->dev.of_node;
+	indio_dev->info = &da9150_gpadc_info;
+	indio_dev->modes = INDIO_DIRECT_MODE;
+	indio_dev->channels = da9150_gpadc_channels;
+	indio_dev->num_channels = ARRAY_SIZE(da9150_gpadc_channels);
+
+	ret = iio_device_register(indio_dev);
+	if (ret) {
+		dev_err(dev, "Failed to register IIO device: %d\n", ret);
+		goto iio_map_unreg;
+	}
+
+	return 0;
+
+iio_map_unreg:
+	iio_map_array_unregister(indio_dev);
+
+	return ret;
+}
+
+static int da9150_gpadc_remove(struct platform_device *pdev)
+{
+	struct iio_dev *indio_dev = platform_get_drvdata(pdev);
+
+	iio_device_unregister(indio_dev);
+	iio_map_array_unregister(indio_dev);
+
+	return 0;
+}
+
+static struct platform_driver da9150_gpadc_driver = {
+	.driver = {

drivers/iio/adc/da9150-gpadc.c

Quoted 10 lines
drivers/iio/adc/da9150-gpadc.c new file +10 -0
+		.name = "da9150-gpadc",
+	},
+	.probe = da9150_gpadc_probe,
+	.remove = da9150_gpadc_remove,
+};
+
+module_platform_driver(da9150_gpadc_driver);
+
+MODULE_DESCRIPTION("GPADC Driver for DA9150");
+MODULE_AUTHOR("Adam Thomson

<[email protected]>");

Quoted 4 lines

+MODULE_LICENSE("GPL");
--
1.9.3

#11 lore raw

RE: [PATCH v5 3/7] iio: Add support for DA9150 GPADC

Quoted 14 lines · Jonathan Cameron
Quoted 13 lines · Opensource [Adam Thomson]
Quoted 11 lines · Jonathan Cameron
Quoted 3 lines · Adam Thomson

This patch adds support for DA9150 Charger & Fuel-Gauge IC GPADC.

One last query from me.

Using the extended channel names in IIO is only really appropriate when they don't correspond to simple pins on the side of the chip. For those just drop the extname bit. Some of the channels you have here, definitely need them though.

Quoted 7 lines
Quoted 6 lines
Quoted 2 lines

Drop those first 4 or convince me otherwise and add

Have added responses below. If the comments are accepted then I'll respin and add you're 'Acked-by'. Is that ok?

Not accepted as yet :)

Yeah, that's why I added the 'if'. :)

Quoted 33 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line

+#define DA9150_GPADC_CHANNEL_PROCESSED(_id, _hw_id, _type,

_ext_name)

Quoted 21 lines
Quoted 12 lines
	\

drivers/iio/adc/da9150-gpadc.c

Quoted 6 lines
drivers/iio/adc/da9150-gpadc.c new file +6 -0
+	DA9150_GPADC_CHANNEL(_id, _hw_id, _type,			\
+			     BIT(IIO_CHAN_INFO_PROCESSED), _ext_name)
+
+/* Supported channels */
+static const struct iio_chan_spec da9150_gpadc_channels[] = {
+	DA9150_GPADC_CHANNEL_PROCESSED(GPIOA, GPIOA_6V, IIO_VOLTAGE,

"GPIOA"),

Review

Quoted 1 line
(quoted diff) +1 -0
+	DA9150_GPADC_CHANNEL_PROCESSED(GPIOB, GPIOB_6V, IIO_VOLTAGE,

"GPIOB"),

Review

Quoted 1 line
(quoted diff) +1 -0
+	DA9150_GPADC_CHANNEL_PROCESSED(GPIOC, GPIOC_6V, IIO_VOLTAGE,

"GPIOC"),

Quoted 8 lines

Review

Quoted 1 line
(quoted diff) +1 -0
+	DA9150_GPADC_CHANNEL_PROCESSED(GPIOD, GPIOD_6V, IIO_VOLTAGE,

"GPIOD"),
I'm not sure some of these really deserve extended names. Those are usually reserved for naming strange internal adc channels etc. These first 4 are presumably just for input pins? Those should just be channels 0..3 On another note, unless you want really weird sysfs attribute names, the extended names want to be lowercase.

Quoted 3 lines

I'd prefer to keep the names because the input pins are muxed with GPIOs of the chip, so thought it sensible to show that this is the case. Am happy to change to lower-case to follow convention.

Hmm. It's a bit of an oddity as the point of the naming
is about the uses, not which pins they are on. If we exposed the 'datasheet_name' parameter directly rather than just using it internally I'd suggest relying on that - but clearly you want it to be apparent in the interface. Whether that is useful is the question I'd raise here (and is the reason datasheet_name is not exposed.

Quoted 5 lines

The obvious question is does userspace care? Answer is probably not.

It cares what is being measured but this is about what pins it is on and doesn't provide any information on what is connected to them.

Surely it helps when using sysfs to access whatever is connected to one of those pins if we label the pin with something meaningful? If say you have a device connected to GPIC of the charger IC, it's easier to work out which ADC channel you need to access through sysfs if the naming is as I have now, rather than some arbitrary number which doesn't necessarily tally to the channel in the datasheet. You'd then need to look at the code and work out which channel number GPIOC actually was. Or am I just missing something here? :)

Quoted 138 lines
Quoted 138 lines
Quoted 9 lines

Review

Quoted 3 lines
(quoted diff) +1 -0
+	DA9150_GPADC_CHANNEL_PROCESSED(IBUS, IBUS_SENSE, IIO_CURRENT,

"IBUS"),

Review

Quoted 1 line
(quoted diff) +1 -0
+	DA9150_GPADC_CHANNEL_PROCESSED(VBUS, VBUS_DIV_, IIO_VOLTAGE,

"VBUS"),

drivers/iio/adc/da9150-gpadc.c line 290

Quoted 1 line
drivers/iio/adc/da9150-gpadc.c new file +1 -0
+	DA9150_GPADC_CHANNEL_RAW(ID, ID, IIO_VOLTAGE, "ID"),

You hae an identifier voltage? That's certainly unusual but if so - fair enough and it defintely needs the extname!

Thanks for pointing that out. Having checked again, this is not needed and can be dispensed with.

Quoted 125 lines

drivers/iio/adc/da9150-gpadc.c

Quoted 4 lines
drivers/iio/adc/da9150-gpadc.c new file +4 -0
+	DA9150_GPADC_CHANNEL_PROCESSED(VSYS, VSYS, IIO_VOLTAGE, "VSYS"),
+	DA9150_GPADC_CHANNEL_SCALED(VBAT, VBAT, IIO_VOLTAGE, "VBAT"),
+	DA9150_GPADC_CHANNEL_RAW(TBAT, TBAT, IIO_VOLTAGE, "TBAT"),
+	DA9150_GPADC_CHANNEL_SCALED(TJUNC_CORE, TJUNC_CORE,

IIO_TEMP,

drivers/iio/adc/da9150-gpadc.c line 295

Quoted 1 line
drivers/iio/adc/da9150-gpadc.c new file +1 -0
+				    "TJUNC_CORE"),

tjunc_core is a good use of extname ;)

Quoted 103 lines
drivers/iio/adc/da9150-gpadc.c new file +103 -0
+	DA9150_GPADC_CHANNEL_SCALED(TJUNC_OVP, TJUNC_OVP, IIO_TEMP,
+				    "TJUNC_OVP"),
+};
+
+/* Default maps used by da9150-charger */
+static struct iio_map da9150_gpadc_default_maps[] = {
+	{
+		.consumer_dev_name = "da9150-charger",
+		.consumer_channel = "CHAN_IBUS",
+		.adc_channel_label = "IBUS",
+	},
+	{
+		.consumer_dev_name = "da9150-charger",
+		.consumer_channel = "CHAN_VBUS",
+		.adc_channel_label = "VBUS",
+	},
+	{
+		.consumer_dev_name = "da9150-charger",
+		.consumer_channel = "CHAN_TJUNC",
+		.adc_channel_label = "TJUNC_CORE",
+	},
+	{
+		.consumer_dev_name = "da9150-charger",
+		.consumer_channel = "CHAN_VBAT",
+		.adc_channel_label = "VBAT",
+	},
+	{},
+};
+
+static int da9150_gpadc_probe(struct platform_device *pdev)
+{
+	struct device *dev = &pdev->dev;
+	struct da9150 *da9150 = dev_get_drvdata(dev->parent);
+	struct da9150_gpadc *gpadc;
+	struct iio_dev *indio_dev;
+	int irq, ret;
+
+	indio_dev = devm_iio_device_alloc(&pdev->dev, sizeof(*gpadc));
+	if (!indio_dev) {
+		dev_err(&pdev->dev, "Failed to allocate IIO device\n");
+		return -ENOMEM;
+	}
+	gpadc = iio_priv(indio_dev);
+
+	platform_set_drvdata(pdev, indio_dev);
+	gpadc->da9150 = da9150;
+	gpadc->dev = dev;
+	mutex_init(&gpadc->lock);
+	init_completion(&gpadc->complete);
+
+	irq = platform_get_irq_byname(pdev, "GPADC");
+	if (irq < 0) {
+		dev_err(dev, "Failed to get IRQ: %d\n", irq);
+		return irq;
+	}
+
+	ret = devm_request_threaded_irq(dev, irq, NULL, da9150_gpadc_irq,
+					IRQF_ONESHOT, "GPADC", gpadc);
+	if (ret) {
+		dev_err(dev, "Failed to request IRQ %d: %d\n", irq, ret);
+		return ret;
+	}
+
+	ret = iio_map_array_register(indio_dev, da9150_gpadc_default_maps);
+	if (ret) {
+		dev_err(dev, "Failed to register IIO maps: %d\n", ret);
+		return ret;
+	}
+
+	indio_dev->name = dev_name(dev);
+	indio_dev->dev.parent = dev;
+	indio_dev->dev.of_node = pdev->dev.of_node;
+	indio_dev->info = &da9150_gpadc_info;
+	indio_dev->modes = INDIO_DIRECT_MODE;
+	indio_dev->channels = da9150_gpadc_channels;
+	indio_dev->num_channels = ARRAY_SIZE(da9150_gpadc_channels);
+
+	ret = iio_device_register(indio_dev);
+	if (ret) {
+		dev_err(dev, "Failed to register IIO device: %d\n", ret);
+		goto iio_map_unreg;
+	}
+
+	return 0;
+
+iio_map_unreg:
+	iio_map_array_unregister(indio_dev);
+
+	return ret;
+}
+
+static int da9150_gpadc_remove(struct platform_device *pdev)
+{
+	struct iio_dev *indio_dev = platform_get_drvdata(pdev);
+
+	iio_device_unregister(indio_dev);
+	iio_map_array_unregister(indio_dev);
+
+	return 0;
+}
+
+static struct platform_driver da9150_gpadc_driver = {
+	.driver = {

drivers/iio/adc/da9150-gpadc.c

Quoted 10 lines
drivers/iio/adc/da9150-gpadc.c new file +10 -0
+		.name = "da9150-gpadc",
+	},
+	.probe = da9150_gpadc_probe,
+	.remove = da9150_gpadc_remove,
+};
+
+module_platform_driver(da9150_gpadc_driver);
+
+MODULE_DESCRIPTION("GPADC Driver for DA9150");
+MODULE_AUTHOR("Adam Thomson

<[email protected]>");

Quoted 4 lines

+MODULE_LICENSE("GPL");
--
1.9.3

maintainer
#12 lore raw

Re: [PATCH v5 3/7] iio: Add support for DA9150 GPADC

Quoted 65 lines · Opensource [Adam Thomson]
Quoted 14 lines · Jonathan Cameron
Quoted 13 lines · Opensource [Adam Thomson]
Quoted 11 lines · Jonathan Cameron
Quoted 3 lines · Adam Thomson

This patch adds support for DA9150 Charger & Fuel-Gauge IC GPADC.

One last query from me.

Using the extended channel names in IIO is only really appropriate when they don't correspond to simple pins on the side of the chip. For those just drop the extname bit. Some of the channels you have here, definitely need them though.

Quoted 7 lines
Quoted 6 lines
Quoted 2 lines

Drop those first 4 or convince me otherwise and add

Have added responses below. If the comments are accepted then I'll respin and add you're 'Acked-by'. Is that ok?

Not accepted as yet :)

Yeah, that's why I added the 'if'. :)

Quoted 33 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line

+#define DA9150_GPADC_CHANNEL_PROCESSED(_id, _hw_id, _type,

_ext_name)

Quoted 21 lines
Quoted 12 lines
	\

drivers/iio/adc/da9150-gpadc.c

Quoted 6 lines
drivers/iio/adc/da9150-gpadc.c new file +6 -0
+	DA9150_GPADC_CHANNEL(_id, _hw_id, _type,			\
+			     BIT(IIO_CHAN_INFO_PROCESSED), _ext_name)
+
+/* Supported channels */
+static const struct iio_chan_spec da9150_gpadc_channels[] = {
+	DA9150_GPADC_CHANNEL_PROCESSED(GPIOA, GPIOA_6V, IIO_VOLTAGE,

"GPIOA"),

Review

Quoted 1 line
(quoted diff) +1 -0
+	DA9150_GPADC_CHANNEL_PROCESSED(GPIOB, GPIOB_6V, IIO_VOLTAGE,

"GPIOB"),

Review

Quoted 1 line
(quoted diff) +1 -0
+	DA9150_GPADC_CHANNEL_PROCESSED(GPIOC, GPIOC_6V, IIO_VOLTAGE,

"GPIOC"),

Quoted 8 lines

Review

Quoted 1 line
(quoted diff) +1 -0
+	DA9150_GPADC_CHANNEL_PROCESSED(GPIOD, GPIOD_6V, IIO_VOLTAGE,

"GPIOD"),
I'm not sure some of these really deserve extended names. Those are usually reserved for naming strange internal adc channels etc. These first 4 are presumably just for input pins? Those should just be channels 0..3 On another note, unless you want really weird sysfs attribute names, the extended names want to be lowercase.

Quoted 3 lines

I'd prefer to keep the names because the input pins are muxed with GPIOs of the chip, so thought it sensible to show that this is the case. Am happy to change to lower-case to follow convention.

Hmm. It's a bit of an oddity as the point of the naming
is about the uses, not which pins they are on. If we exposed the 'datasheet_name' parameter directly rather than just using it internally I'd suggest relying on that - but clearly you want it to be apparent in the interface. Whether that is useful is the question I'd raise here (and is the reason datasheet_name is not exposed.

Quoted 5 lines

The obvious question is does userspace care? Answer is probably not.

It cares what is being measured but this is about what pins it is on and doesn't provide any information on what is connected to them.

Quoted 7 lines

Surely it helps when using sysfs to access whatever is connected to one of those pins if we label the pin with something meaningful? If say you have a device connected to GPIC of the charger IC, it's easier to work out which ADC channel you need to access through sysfs if the naming is as I have now, rather than some arbitrary number which doesn't necessarily tally to the channel in the datasheet. You'd then need to look at the code and work out which channel number GPIOC actually was. Or am I just missing something here? :)

Not really for the vast majority of users. They tend not to have a detailed board layout in front of them. It's more interesting if you know 'what' they are measuring (hence we do use these names when that is true - such as internal voltage measurements).

The numbers almost never tally with the datasheet, but then datasheet numbering has a habit of being inconsistent as well!

Quoted 139 lines
Quoted 139 lines
Quoted 139 lines
Quoted 10 lines

Review

Quoted 4 lines
(quoted diff) +1 -0
+	DA9150_GPADC_CHANNEL_PROCESSED(IBUS, IBUS_SENSE, IIO_CURRENT,

"IBUS"),

Review

Quoted 1 line
(quoted diff) +1 -0
+	DA9150_GPADC_CHANNEL_PROCESSED(VBUS, VBUS_DIV_, IIO_VOLTAGE,

"VBUS"),

drivers/iio/adc/da9150-gpadc.c line 290

Quoted 1 line
drivers/iio/adc/da9150-gpadc.c new file +1 -0
+	DA9150_GPADC_CHANNEL_RAW(ID, ID, IIO_VOLTAGE, "ID"),

You hae an identifier voltage? That's certainly unusual but if so - fair enough and it defintely needs the extname!

Thanks for pointing that out. Having checked again, this is not needed and can be dispensed with.

Quoted 125 lines

drivers/iio/adc/da9150-gpadc.c

Quoted 4 lines
drivers/iio/adc/da9150-gpadc.c new file +4 -0
+	DA9150_GPADC_CHANNEL_PROCESSED(VSYS, VSYS, IIO_VOLTAGE, "VSYS"),
+	DA9150_GPADC_CHANNEL_SCALED(VBAT, VBAT, IIO_VOLTAGE, "VBAT"),
+	DA9150_GPADC_CHANNEL_RAW(TBAT, TBAT, IIO_VOLTAGE, "TBAT"),
+	DA9150_GPADC_CHANNEL_SCALED(TJUNC_CORE, TJUNC_CORE,

IIO_TEMP,

drivers/iio/adc/da9150-gpadc.c line 295

Quoted 1 line
drivers/iio/adc/da9150-gpadc.c new file +1 -0
+				    "TJUNC_CORE"),

tjunc_core is a good use of extname ;)

Quoted 103 lines
drivers/iio/adc/da9150-gpadc.c new file +103 -0
+	DA9150_GPADC_CHANNEL_SCALED(TJUNC_OVP, TJUNC_OVP, IIO_TEMP,
+				    "TJUNC_OVP"),
+};
+
+/* Default maps used by da9150-charger */
+static struct iio_map da9150_gpadc_default_maps[] = {
+	{
+		.consumer_dev_name = "da9150-charger",
+		.consumer_channel = "CHAN_IBUS",
+		.adc_channel_label = "IBUS",
+	},
+	{
+		.consumer_dev_name = "da9150-charger",
+		.consumer_channel = "CHAN_VBUS",
+		.adc_channel_label = "VBUS",
+	},
+	{
+		.consumer_dev_name = "da9150-charger",
+		.consumer_channel = "CHAN_TJUNC",
+		.adc_channel_label = "TJUNC_CORE",
+	},
+	{
+		.consumer_dev_name = "da9150-charger",
+		.consumer_channel = "CHAN_VBAT",
+		.adc_channel_label = "VBAT",
+	},
+	{},
+};
+
+static int da9150_gpadc_probe(struct platform_device *pdev)
+{
+	struct device *dev = &pdev->dev;
+	struct da9150 *da9150 = dev_get_drvdata(dev->parent);
+	struct da9150_gpadc *gpadc;
+	struct iio_dev *indio_dev;
+	int irq, ret;
+
+	indio_dev = devm_iio_device_alloc(&pdev->dev, sizeof(*gpadc));
+	if (!indio_dev) {
+		dev_err(&pdev->dev, "Failed to allocate IIO device\n");
+		return -ENOMEM;
+	}
+	gpadc = iio_priv(indio_dev);
+
+	platform_set_drvdata(pdev, indio_dev);
+	gpadc->da9150 = da9150;
+	gpadc->dev = dev;
+	mutex_init(&gpadc->lock);
+	init_completion(&gpadc->complete);
+
+	irq = platform_get_irq_byname(pdev, "GPADC");
+	if (irq < 0) {
+		dev_err(dev, "Failed to get IRQ: %d\n", irq);
+		return irq;
+	}
+
+	ret = devm_request_threaded_irq(dev, irq, NULL, da9150_gpadc_irq,
+					IRQF_ONESHOT, "GPADC", gpadc);
+	if (ret) {
+		dev_err(dev, "Failed to request IRQ %d: %d\n", irq, ret);
+		return ret;
+	}
+
+	ret = iio_map_array_register(indio_dev, da9150_gpadc_default_maps);
+	if (ret) {
+		dev_err(dev, "Failed to register IIO maps: %d\n", ret);
+		return ret;
+	}
+
+	indio_dev->name = dev_name(dev);
+	indio_dev->dev.parent = dev;
+	indio_dev->dev.of_node = pdev->dev.of_node;
+	indio_dev->info = &da9150_gpadc_info;
+	indio_dev->modes = INDIO_DIRECT_MODE;
+	indio_dev->channels = da9150_gpadc_channels;
+	indio_dev->num_channels = ARRAY_SIZE(da9150_gpadc_channels);
+
+	ret = iio_device_register(indio_dev);
+	if (ret) {
+		dev_err(dev, "Failed to register IIO device: %d\n", ret);
+		goto iio_map_unreg;
+	}
+
+	return 0;
+
+iio_map_unreg:
+	iio_map_array_unregister(indio_dev);
+
+	return ret;
+}
+
+static int da9150_gpadc_remove(struct platform_device *pdev)
+{
+	struct iio_dev *indio_dev = platform_get_drvdata(pdev);
+
+	iio_device_unregister(indio_dev);
+	iio_map_array_unregister(indio_dev);
+
+	return 0;
+}
+
+static struct platform_driver da9150_gpadc_driver = {
+	.driver = {

drivers/iio/adc/da9150-gpadc.c

Quoted 10 lines
drivers/iio/adc/da9150-gpadc.c new file +10 -0
+		.name = "da9150-gpadc",
+	},
+	.probe = da9150_gpadc_probe,
+	.remove = da9150_gpadc_remove,
+};
+
+module_platform_driver(da9150_gpadc_driver);
+
+MODULE_DESCRIPTION("GPADC Driver for DA9150");
+MODULE_AUTHOR("Adam Thomson

<[email protected]>");

Quoted 4 lines

+MODULE_LICENSE("GPL");
--
1.9.3

#13 lore raw

RE: [PATCH v5 3/7] iio: Add support for DA9150 GPADC

T24gSmFudWFyeSAyMCwgMjAxNSAyMDo0OSwgSm9uYXRoYW4gQ2FtZXJvbiB3cm90ZToNCg0KPiA+ Pj4+PiArI2RlZmluZSBEQTkxNTBfR1BBRENfQ0hBTk5FTF9QUk9DRVNTRUQoX2lkLCBfaHdfaWQs IF90eXBlLA0KPiA+PiBfZXh0X25hbWUpDQo+ID4+Pj4gCVwNCj4gPj4+Pj4gKwlEQTkxNTBfR1BB RENfQ0hBTk5FTChfaWQsIF9od19pZCwgX3R5cGUsCQkJXA0KPiA+Pj4+PiArCQkJICAgICBCSVQo SUlPX0NIQU5fSU5GT19QUk9DRVNTRUQpLCBfZXh0X25hbWUpDQo+ID4+Pj4+ICsNCj4gPj4+Pj4g Ky8qIFN1cHBvcnRlZCBjaGFubmVscyAqLw0KPiA+Pj4+PiArc3RhdGljIGNvbnN0IHN0cnVjdCBp aW9fY2hhbl9zcGVjIGRhOTE1MF9ncGFkY19jaGFubmVsc1tdID0gew0KPiA+Pj4+PiArCURBOTE1 MF9HUEFEQ19DSEFOTkVMX1BST0NFU1NFRChHUElPQSwgR1BJT0FfNlYsIElJT19WT0xUQUdFLA0K PiA+Pj4+ICJHUElPQSIpLA0KPiA+Pj4+PiArCURBOTE1MF9HUEFEQ19DSEFOTkVMX1BST0NFU1NF RChHUElPQiwgR1BJT0JfNlYsIElJT19WT0xUQUdFLA0KPiA+Pj4+ICJHUElPQiIpLA0KPiA+Pj4+ PiArCURBOTE1MF9HUEFEQ19DSEFOTkVMX1BST0NFU1NFRChHUElPQywgR1BJT0NfNlYsIElJT19W T0xUQUdFLA0KPiA+Pj4+ICJHUElPQyIpLA0KPiA+Pj4+PiArCURBOTE1MF9HUEFEQ19DSEFOTkVM X1BST0NFU1NFRChHUElPRCwgR1BJT0RfNlYsIElJT19WT0xUQUdFLA0KPiA+Pj4+ICJHUElPRCIp LA0KPiA+Pj4+IEknbSBub3Qgc3VyZSBzb21lIG9mIHRoZXNlIHJlYWxseSBkZXNlcnZlIGV4dGVu ZGVkIG5hbWVzLiAgVGhvc2UgYXJlIHVzdWFsbHkNCj4gPj4+PiByZXNlcnZlZCBmb3IgbmFtaW5n IHN0cmFuZ2UgaW50ZXJuYWwgYWRjIGNoYW5uZWxzIGV0Yy4gIFRoZXNlIGZpcnN0IDQgYXJlDQo+ ID4+Pj4gcHJlc3VtYWJseSBqdXN0IGZvciBpbnB1dCBwaW5zPyAgVGhvc2Ugc2hvdWxkIGp1c3Qg YmUgY2hhbm5lbHMgMC4uMw0KPiA+Pj4+IE9uIGFub3RoZXIgbm90ZSwgdW5sZXNzIHlvdSB3YW50 IHJlYWxseSB3ZWlyZCBzeXNmcyBhdHRyaWJ1dGUgbmFtZXMsIHRoZQ0KPiA+Pj4+IGV4dGVuZGVk IG5hbWVzIHdhbnQgdG8gYmUgbG93ZXJjYXNlLg0KPiA+Pj4+DQo+ID4+Pg0KPiA+Pj4gSSdkIHBy ZWZlciB0byBrZWVwIHRoZSBuYW1lcyBiZWNhdXNlIHRoZSBpbnB1dCBwaW5zIGFyZSBtdXhlZCB3 aXRoIEdQSU9zIG9mIHRoZQ0KPiA+Pj4gY2hpcCwgc28gdGhvdWdodCBpdCBzZW5zaWJsZSB0byBz aG93IHRoYXQgdGhpcyBpcyB0aGUgY2FzZS4gQW0gaGFwcHkgdG8gY2hhbmdlDQo+ID4+PiB0byBs b3dlci1jYXNlIHRvIGZvbGxvdyBjb252ZW50aW9uLg0KPiA+PiBIbW0uICBJdCdzIGEgYml0IG9m IGFuIG9kZGl0eSBhcyB0aGUgcG9pbnQgb2YgdGhlIG5hbWluZw0KPiA+PiBpcyBhYm91dCB0aGUg dXNlcywgbm90IHdoaWNoIHBpbnMgdGhleSBhcmUgb24uICBJZiB3ZSBleHBvc2VkIHRoZQ0KPiA+ PiAnZGF0YXNoZWV0X25hbWUnIHBhcmFtZXRlciBkaXJlY3RseSByYXRoZXIgdGhhbiBqdXN0IHVz aW5nIGl0IGludGVybmFsbHkNCj4gPj4gSSdkIHN1Z2dlc3QgcmVseWluZyBvbiB0aGF0IC0gYnV0 IGNsZWFybHkgeW91IHdhbnQgaXQgdG8gYmUgYXBwYXJlbnQNCj4gPj4gaW4gdGhlIGludGVyZmFj ZS4gIFdoZXRoZXIgdGhhdCBpcyB1c2VmdWwgaXMgdGhlIHF1ZXN0aW9uIEknZCByYWlzZQ0KPiA+ PiBoZXJlIChhbmQgaXMgdGhlIHJlYXNvbiBkYXRhc2hlZXRfbmFtZSBpcyBub3QgZXhwb3NlZC4N Cj4gPj4NCj4gPj4gVGhlIG9idmlvdXMgcXVlc3Rpb24gaXMgZG9lcyB1c2Vyc3BhY2UgY2FyZT8g IEFuc3dlciBpcyBwcm9iYWJseSBub3QuDQo+ID4+DQo+ID4+IEl0IGNhcmVzIHdoYXQgaXMgYmVp bmcgbWVhc3VyZWQgYnV0IHRoaXMgaXMgYWJvdXQgd2hhdCBwaW5zIGl0IGlzDQo+ID4+IG9uIGFu ZCBkb2Vzbid0IHByb3ZpZGUgYW55IGluZm9ybWF0aW9uIG9uIHdoYXQgaXMgY29ubmVjdGVkIHRv IHRoZW0uDQo+ID4+DQo+ID4NCj4gPiBTdXJlbHkgaXQgaGVscHMgd2hlbiB1c2luZyBzeXNmcyB0 byBhY2Nlc3Mgd2hhdGV2ZXIgaXMgY29ubmVjdGVkIHRvIG9uZSBvZg0KPiA+IHRob3NlIHBpbnMg aWYgd2UgbGFiZWwgdGhlIHBpbiB3aXRoIHNvbWV0aGluZyBtZWFuaW5nZnVsPyBJZiBzYXkgeW91 IGhhdmUgYQ0KPiA+IGRldmljZSBjb25uZWN0ZWQgdG8gR1BJQyBvZiB0aGUgY2hhcmdlciBJQywg aXQncyBlYXNpZXIgdG8gd29yayBvdXQgd2hpY2ggQURDDQo+ID4gY2hhbm5lbCB5b3UgbmVlZCB0 byBhY2Nlc3MgdGhyb3VnaCBzeXNmcyBpZiB0aGUgbmFtaW5nIGlzIGFzIEkgaGF2ZSBub3csIHJh dGhlcg0KPiA+IHRoYW4gc29tZSBhcmJpdHJhcnkgbnVtYmVyIHdoaWNoIGRvZXNuJ3QgbmVjZXNz YXJpbHkgdGFsbHkgdG8gdGhlIGNoYW5uZWwgaW4gdGhlDQo+ID4gZGF0YXNoZWV0LiBZb3UnZCB0 aGVuIG5lZWQgdG8gbG9vayBhdCB0aGUgY29kZSBhbmQgd29yayBvdXQgd2hpY2ggY2hhbm5lbA0K PiBudW1iZXINCj4gPiBHUElPQyBhY3R1YWxseSB3YXMuIE9yIGFtIEkganVzdCBtaXNzaW5nIHNv bWV0aGluZyBoZXJlPyA6KQ0KPiBOb3QgcmVhbGx5IGZvciB0aGUgdmFzdCBtYWpvcml0eSBvZiB1 c2Vycy4gIFRoZXkgdGVuZCBub3QgdG8gaGF2ZSBhIGRldGFpbGVkDQo+IGJvYXJkIGxheW91dCBp biBmcm9udCBvZiB0aGVtLiAgSXQncyBtb3JlIGludGVyZXN0aW5nIGlmIHlvdSBrbm93ICd3aGF0 JyB0aGV5DQo+IGFyZSBtZWFzdXJpbmcgKGhlbmNlIHdlIGRvIHVzZSB0aGVzZSBuYW1lcyB3aGVu IHRoYXQgaXMgdHJ1ZSAtIHN1Y2ggYXMNCj4gaW50ZXJuYWwgdm9sdGFnZSBtZWFzdXJlbWVudHMp Lg0KPiANCj4gVGhlIG51bWJlcnMgYWxtb3N0IG5ldmVyIHRhbGx5IHdpdGggdGhlIGRhdGFzaGVl dCwgYnV0IHRoZW4gZGF0YXNoZWV0IG51bWJlcmluZw0KPiBoYXMgYSBoYWJpdCBvZiBiZWluZyBp bmNvbnNpc3RlbnQgYXMgd2VsbCENCg0KQ2FuJ3Qgc2F5IEkgYWdyZWUgdGhhdCB0aGlzIHdvbid0 IGJlIHVzZWZ1bC9pbmZvcm1hdGl2ZSB0byBtYW55IHVzZXJzLCBidXQgZG9uJ3QNCndhbnQgdG8g bWFrZSB0aGlzIGEgc3RpY2tpbmcgcG9pbnQgc28gd2lsbCB1cGRhdGUuDQo=
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

#14 lore raw

PATCH v5 4/7 iio: da9150: Add DT binding documentation for GPADC

In reply to Adam Thomson
---
 .../devicetree/bindings/iio/adc/da9150-gpadc.txt         | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/iio/adc/da9150-gpadc.txt
Documentation/devicetree/bindings/iio/adc/da9150-gpadc.txt new file +16 -0
new file mode 100644
index 0000000..c07228d
@@ -0,0 +1,16 @@
+Dialog Semiconductor DA9150 IIO GPADC bindings
+
+Required properties:
+- compatible: "dlg,da9150-gpadc" for DA9150 IIO GPADC
+- #io-channel-cells: Should be set to <1>
+  (See Documentation/devicetree/bindings/iio/iio-bindings.txt for further info)
+
+For further information on GPADC channels, see device datasheet.
+
+
+Example:
+
+	gpadc: da9150-gpadc {
+		compatible = "dlg,da9150-gpadc";
+		#io-channel-cells = <1>;
+	};

--
1.9.3

#15 lore raw

PATCH v5 5/7 power: Add support for DA9150 Charger

In reply to Adam Thomson

This patch adds support for DA9150 Charger & Fuel-Gauge IC Charger.

---
 drivers/power/Kconfig          |  12 +
 drivers/power/Makefile         |   1 +
 drivers/power/da9150-charger.c | 666 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 679 insertions(+)
 create mode 100644 drivers/power/da9150-charger.c
drivers/power/Kconfig +12 -0
index 0108c2a..eb79a7a 100644
@@ -192,6 +192,18 @@ config BATTERY_DA9052
 	  Say Y here to enable support for batteries charger integrated into
 	  DA9052 PMIC.
 
+config CHARGER_DA9150
+	tristate "Dialog Semiconductor DA9150 Charger support"
+	depends on MFD_DA9150
+	depends on DA9150_GPADC
+	depends on IIO
+	help
+	  Say Y here to enable support for charger unit of the DA9150
+	  Integrated Charger & Fuel-Gauge IC.
+
+	  This driver can also be built as a module. If so, the module will be
+	  called da9150-charger.
+
 config BATTERY_MAX17040
 	tristate "Maxim MAX17040 Fuel Gauge"
 	depends on I2C
drivers/power/Makefile +1 -0
index dfa8942..0c1896d 100644
@@ -31,6 +31,7 @@ obj-$(CONFIG_BATTERY_SBS)	+= sbs-battery.o
 obj-$(CONFIG_BATTERY_BQ27x00)	+= bq27x00_battery.o
 obj-$(CONFIG_BATTERY_DA9030)	+= da9030_battery.o
 obj-$(CONFIG_BATTERY_DA9052)	+= da9052-battery.o
+obj-$(CONFIG_CHARGER_DA9150)	+= da9150-charger.o
 obj-$(CONFIG_BATTERY_MAX17040)	+= max17040_battery.o
 obj-$(CONFIG_BATTERY_MAX17042)	+= max17042_battery.o
 obj-$(CONFIG_BATTERY_Z2)	+= z2_battery.o
drivers/power/da9150-charger.c new file +666 -0

666 lines not on this page · raw message

--
1.9.3

maintainer
#16 lore raw

Re: [PATCH v5 5/7] power: Add support for DA9150 Charger

Quoted 3 lines · Adam Thomson

This patch adds support for DA9150 Charger & Fuel-Gauge IC Charger.

The IIO bits look fine, but your use of devm_free * doesn't...

As a side note, looks like we could benefit from some array versions of the IIO channel getting and release functions. Would save a fair bit of boiler plate.

Jonathan

Quoted 675 lines
---
 drivers/power/Kconfig          |  12 +
 drivers/power/Makefile         |   1 +
 drivers/power/da9150-charger.c | 666 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 679 insertions(+)
 create mode 100644 drivers/power/da9150-charger.c
drivers/power/Kconfig +12 -0
index 0108c2a..eb79a7a 100644
@@ -192,6 +192,18 @@ config BATTERY_DA9052
 	  Say Y here to enable support for batteries charger integrated into
 	  DA9052 PMIC.
 
+config CHARGER_DA9150
+	tristate "Dialog Semiconductor DA9150 Charger support"
+	depends on MFD_DA9150
+	depends on DA9150_GPADC
+	depends on IIO
+	help
+	  Say Y here to enable support for charger unit of the DA9150
+	  Integrated Charger & Fuel-Gauge IC.
+
+	  This driver can also be built as a module. If so, the module will be
+	  called da9150-charger.
+
 config BATTERY_MAX17040
 	tristate "Maxim MAX17040 Fuel Gauge"
 	depends on I2C
drivers/power/Makefile +1 -0
index dfa8942..0c1896d 100644
@@ -31,6 +31,7 @@ obj-$(CONFIG_BATTERY_SBS)	+= sbs-battery.o
 obj-$(CONFIG_BATTERY_BQ27x00)	+= bq27x00_battery.o
 obj-$(CONFIG_BATTERY_DA9030)	+= da9030_battery.o
 obj-$(CONFIG_BATTERY_DA9052)	+= da9052-battery.o
+obj-$(CONFIG_CHARGER_DA9150)	+= da9150-charger.o
 obj-$(CONFIG_BATTERY_MAX17040)	+= max17040_battery.o
 obj-$(CONFIG_BATTERY_MAX17042)	+= max17042_battery.o
 obj-$(CONFIG_BATTERY_Z2)	+= z2_battery.o
drivers/power/da9150-charger.c new file +627 -0
new file mode 100644
index 0000000..9b1826d
@@ -0,0 +1,666 @@
+/*
+ * DA9150 Charger Driver
+ *
+ * Copyright (c) 2014 Dialog Semiconductor
+ *
+ * Author: Adam Thomson <[email protected]>
+ *
+ * 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.
+ */
+
+#include <linux/kernel.h>
+#include <linux/slab.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/of.h>
+#include <linux/of_platform.h>
+#include <linux/interrupt.h>
+#include <linux/power_supply.h>
+#include <linux/notifier.h>
+#include <linux/usb/phy.h>
+#include <linux/iio/consumer.h>
+#include <linux/mfd/da9150/core.h>
+#include <linux/mfd/da9150/registers.h>
+
+/* Private data */
+struct da9150_charger {
+	struct da9150 *da9150;
+	struct device *dev;
+
+	struct power_supply usb;
+	struct power_supply battery;
+	struct power_supply *supply_online;
+
+	struct usb_phy *usb_phy;
+	struct notifier_block otg_nb;
+	struct work_struct otg_work;
+	unsigned long usb_event;
+
+	struct iio_channel *ibus_chan;
+	struct iio_channel *vbus_chan;
+	struct iio_channel *tjunc_chan;
+	struct iio_channel *vbat_chan;
+};
+
+static inline int da9150_charger_supply_online(struct da9150_charger *charger,
+					       struct power_supply *psy,
+					       union power_supply_propval *val)
+{
+	val->intval = (psy == charger->supply_online) ? 1 : 0;
+
+	return 0;
+}
+
+/* Charger Properties */
+static int da9150_charger_vbus_voltage_now(struct da9150_charger *charger,
+					   union power_supply_propval *val)
+{
+	int v_val, ret;
+
+	/* Read processed value - mV units */
+	ret = iio_read_channel_processed(charger->vbus_chan, &v_val);
+	if (ret < 0)
+		return ret;
+
+	/* Convert voltage to expected uV units */
+	val->intval = v_val * 1000;
+
+	return 0;
+}
+
+static int da9150_charger_ibus_current_avg(struct da9150_charger *charger,
+					   union power_supply_propval *val)
+{
+	int i_val, ret;
+
+	/* Read processed value - mA units */
+	ret = iio_read_channel_processed(charger->ibus_chan, &i_val);
+	if (ret < 0)
+		return ret;
+
+	/* Convert current to expected uA units */
+	val->intval = i_val * 1000;
+
+	return 0;
+}
+
+static int da9150_charger_tjunc_temp(struct da9150_charger *charger,
+				     union power_supply_propval *val)
+{
+	int t_val, ret;
+
+	/* Read processed value - 0.001 degrees C units */
+	ret = iio_read_channel_processed(charger->tjunc_chan, &t_val);
+	if (ret < 0)
+		return ret;
+
+	/* Convert temp to expect 0.1 degrees C units */
+	val->intval = t_val / 100;
+
+	return 0;
+}
+
+static enum power_supply_property da9150_charger_props[] = {
+	POWER_SUPPLY_PROP_ONLINE,
+	POWER_SUPPLY_PROP_VOLTAGE_NOW,
+	POWER_SUPPLY_PROP_CURRENT_AVG,
+	POWER_SUPPLY_PROP_TEMP,
+};
+
+static int da9150_charger_get_prop(struct power_supply *psy,
+				   enum power_supply_property psp,
+				   union power_supply_propval *val)
+{
+	struct da9150_charger *charger = dev_get_drvdata(psy->dev->parent);
+	int ret;
+
+	switch (psp) {
+	case POWER_SUPPLY_PROP_ONLINE:
+		ret = da9150_charger_supply_online(charger, psy, val);
+		break;
+	case POWER_SUPPLY_PROP_VOLTAGE_NOW:
+		ret = da9150_charger_vbus_voltage_now(charger, val);
+		break;
+	case POWER_SUPPLY_PROP_CURRENT_AVG:
+		ret = da9150_charger_ibus_current_avg(charger, val);
+		break;
+	case POWER_SUPPLY_PROP_TEMP:
+		ret = da9150_charger_tjunc_temp(charger, val);
+		break;
+	default:
+		ret = -EINVAL;
+		break;
+	}
+
+	return ret;
+}
+
+/* Battery Properties */
+static int da9150_charger_battery_status(struct da9150_charger *charger,
+					 union power_supply_propval *val)
+{
+	u8 reg;
+
+	/* Check to see if battery is discharging */
+	reg = da9150_reg_read(charger->da9150, DA9150_STATUS_H);
+
+	if (((reg & DA9150_VBUS_STAT_MASK) == DA9150_VBUS_STAT_OFF) ||
+	    ((reg & DA9150_VBUS_STAT_MASK) == DA9150_VBUS_STAT_WAIT)) {
+		val->intval = POWER_SUPPLY_STATUS_DISCHARGING;
+
+		return 0;
+	}
+
+	reg = da9150_reg_read(charger->da9150, DA9150_STATUS_J);
+
+	/* Now check for other states */
+	switch (reg & DA9150_CHG_STAT_MASK) {
+	case DA9150_CHG_STAT_ACT:
+	case DA9150_CHG_STAT_PRE:
+	case DA9150_CHG_STAT_CC:
+	case DA9150_CHG_STAT_CV:
+		val->intval = POWER_SUPPLY_STATUS_CHARGING;
+		break;
+	case DA9150_CHG_STAT_OFF:
+	case DA9150_CHG_STAT_SUSP:
+	case DA9150_CHG_STAT_TEMP:
+	case DA9150_CHG_STAT_TIME:
+	case DA9150_CHG_STAT_BAT:
+		val->intval = POWER_SUPPLY_STATUS_NOT_CHARGING;
+		break;
+	case DA9150_CHG_STAT_FULL:
+		val->intval = POWER_SUPPLY_STATUS_FULL;
+		break;
+	default:
+		val->intval = POWER_SUPPLY_STATUS_UNKNOWN;
+		break;
+	}
+
+	return 0;
+}
+
+static int da9150_charger_battery_health(struct da9150_charger *charger,
+					 union power_supply_propval *val)
+{
+	u8 reg;
+
+	reg = da9150_reg_read(charger->da9150, DA9150_STATUS_J);
+
+	/* Check if temperature limit reached */
+	switch (reg & DA9150_CHG_TEMP_MASK) {
+	case DA9150_CHG_TEMP_UNDER:
+		val->intval = POWER_SUPPLY_HEALTH_COLD;
+		return 0;
+	case DA9150_CHG_TEMP_OVER:
+		val->intval = POWER_SUPPLY_HEALTH_OVERHEAT;
+		return 0;
+	default:
+		break;
+	}
+
+	/* Check for other health states */
+	switch (reg & DA9150_CHG_STAT_MASK) {
+	case DA9150_CHG_STAT_ACT:
+	case DA9150_CHG_STAT_PRE:
+		val->intval = POWER_SUPPLY_HEALTH_DEAD;
+		break;
+	case DA9150_CHG_STAT_TIME:
+		val->intval = POWER_SUPPLY_HEALTH_UNSPEC_FAILURE;
+		break;
+	default:
+		val->intval = POWER_SUPPLY_HEALTH_GOOD;
+		break;
+	}
+
+	return 0;
+}
+
+static int da9150_charger_battery_present(struct da9150_charger *charger,
+					  union power_supply_propval *val)
+{
+	u8 reg;
+
+	/* Check if battery present or removed */
+	reg = da9150_reg_read(charger->da9150, DA9150_STATUS_J);
+	if ((reg & DA9150_CHG_STAT_MASK) == DA9150_CHG_STAT_BAT)
+		val->intval = 0;
+	else
+		val->intval = 1;
+
+	return 0;
+}
+
+static int da9150_charger_battery_charge_type(struct da9150_charger *charger,
+					      union power_supply_propval *val)
+{
+	u8 reg;
+
+	reg = da9150_reg_read(charger->da9150, DA9150_STATUS_J);
+
+	switch (reg & DA9150_CHG_STAT_MASK) {
+	case DA9150_CHG_STAT_CC:
+		val->intval = POWER_SUPPLY_CHARGE_TYPE_FAST;
+		break;
+	case DA9150_CHG_STAT_ACT:
+	case DA9150_CHG_STAT_PRE:
+	case DA9150_CHG_STAT_CV:
+		val->intval = POWER_SUPPLY_CHARGE_TYPE_TRICKLE;
+		break;
+	default:
+		val->intval = POWER_SUPPLY_CHARGE_TYPE_NONE;
+		break;
+	}
+
+	return 0;
+}
+
+static int da9150_charger_battery_voltage_min(struct da9150_charger *charger,
+					      union power_supply_propval *val)
+{
+	u8 reg;
+
+	reg = da9150_reg_read(charger->da9150, DA9150_PPR_CHGCTRL_C);
+
+	/* Value starts at 2500 mV, 50 mV increments, presented in uV */
+	val->intval = ((reg & DA9150_CHG_VFAULT_MASK) * 50000) + 2500000;
+
+	return 0;
+}
+
+static int da9150_charger_battery_voltage_now(struct da9150_charger *charger,
+					      union power_supply_propval *val)
+{
+	int v_val, ret;
+
+	/* Read processed value - mV units */
+	ret = iio_read_channel_processed(charger->vbat_chan, &v_val);
+	if (ret < 0)
+		return ret;
+
+	val->intval = v_val * 1000;
+
+	return 0;
+}
+
+static int da9150_charger_battery_current_max(struct da9150_charger *charger,
+					      union power_supply_propval *val)
+{
+	int reg;
+
+	reg = da9150_reg_read(charger->da9150, DA9150_PPR_CHGCTRL_D);
+
+	/* 25mA increments */
+	val->intval = reg * 25000;
+
+	return 0;
+}
+
+static int da9150_charger_battery_voltage_max(struct da9150_charger *charger,
+					      union power_supply_propval *val)
+{
+	u8 reg;
+
+	reg = da9150_reg_read(charger->da9150, DA9150_PPR_CHGCTRL_B);
+
+	/* Value starts at 3650 mV, 25 mV increments, presented in uV */
+	val->intval = ((reg & DA9150_CHG_VBAT_MASK) * 25000) + 3650000;
+	return 0;
+}
+
+static enum power_supply_property da9150_charger_bat_props[] = {
+	POWER_SUPPLY_PROP_STATUS,
+	POWER_SUPPLY_PROP_ONLINE,
+	POWER_SUPPLY_PROP_HEALTH,
+	POWER_SUPPLY_PROP_PRESENT,
+	POWER_SUPPLY_PROP_CHARGE_TYPE,
+	POWER_SUPPLY_PROP_VOLTAGE_MIN_DESIGN,
+	POWER_SUPPLY_PROP_VOLTAGE_NOW,
+	POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT_MAX,
+	POWER_SUPPLY_PROP_CONSTANT_CHARGE_VOLTAGE_MAX,
+};
+
+static int da9150_charger_battery_get_prop(struct power_supply *psy,
+					   enum power_supply_property psp,
+					   union power_supply_propval *val)
+{
+	struct da9150_charger *charger = dev_get_drvdata(psy->dev->parent);
+	int ret;
+
+	switch (psp) {
+	case POWER_SUPPLY_PROP_STATUS:
+		ret = da9150_charger_battery_status(charger, val);
+		break;
+	case POWER_SUPPLY_PROP_ONLINE:
+		ret = da9150_charger_supply_online(charger, psy, val);
+		break;
+	case POWER_SUPPLY_PROP_HEALTH:
+		ret = da9150_charger_battery_health(charger, val);
+		break;
+	case POWER_SUPPLY_PROP_PRESENT:
+		ret = da9150_charger_battery_present(charger, val);
+		break;
+	case POWER_SUPPLY_PROP_CHARGE_TYPE:
+		ret = da9150_charger_battery_charge_type(charger, val);
+		break;
+	case POWER_SUPPLY_PROP_VOLTAGE_MIN_DESIGN:
+		ret = da9150_charger_battery_voltage_min(charger, val);
+		break;
+	case POWER_SUPPLY_PROP_VOLTAGE_NOW:
+		ret = da9150_charger_battery_voltage_now(charger, val);
+		break;
+	case POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT_MAX:
+		ret = da9150_charger_battery_current_max(charger, val);
+		break;
+	case POWER_SUPPLY_PROP_CONSTANT_CHARGE_VOLTAGE_MAX:
+		ret = da9150_charger_battery_voltage_max(charger, val);
+		break;
+	default:
+		ret = -EINVAL;
+		break;
+	}
+
+	return ret;
+}
+
+static irqreturn_t da9150_charger_chg_irq(int irq, void *data)
+{
+	struct da9150_charger *charger = data;
+
+	power_supply_changed(&charger->battery);
+
+	return IRQ_HANDLED;
+}
+
+static irqreturn_t da9150_charger_tjunc_irq(int irq, void *data)
+{
+	struct da9150_charger *charger = data;
+
+	/* Nothing we can really do except report this. */
+	dev_crit(charger->dev, "TJunc over temperature!!!\n");
+	power_supply_changed(&charger->usb);
+
+	return IRQ_HANDLED;
+}
+
+static irqreturn_t da9150_charger_vfault_irq(int irq, void *data)
+{
+	struct da9150_charger *charger = data;
+
+	/* Nothing we can really do except report this. */
+	dev_crit(charger->dev, "VSYS under voltage!!!\n");
+	power_supply_changed(&charger->usb);
+	power_supply_changed(&charger->battery);
+
+	return IRQ_HANDLED;
+}
+
+static irqreturn_t da9150_charger_vbus_irq(int irq, void *data)
+{
+	struct da9150_charger *charger = data;
+	u8 reg;
+
+	reg = da9150_reg_read(charger->da9150, DA9150_STATUS_H);
+
+	/* Charger plugged in or battery only */
+	switch (reg & DA9150_VBUS_STAT_MASK) {
+	case DA9150_VBUS_STAT_OFF:
+	case DA9150_VBUS_STAT_WAIT:
+		charger->supply_online = &charger->battery;
+		break;
+	case DA9150_VBUS_STAT_CHG:
+		charger->supply_online = &charger->usb;
+		break;
+	default:
+		dev_warn(charger->dev, "Unknown VBUS state - reg = 0x%x\n",
+			 reg);
+		charger->supply_online = NULL;
+		break;
+	}
+
+	power_supply_changed(&charger->usb);
+	power_supply_changed(&charger->battery);
+
+	return IRQ_HANDLED;
+}
+
+static void da9150_charger_otg_work(struct work_struct *data)
+{
+	struct da9150_charger *charger =
+		container_of(data, struct da9150_charger, otg_work);
+
+	switch (charger->usb_event) {
+	case USB_EVENT_ID:
+		/* Enable OTG Boost */
+		da9150_set_bits(charger->da9150, DA9150_PPR_BKCTRL_A,
+				DA9150_VBUS_MODE_MASK, DA9150_VBUS_MODE_OTG);
+		break;
+	case USB_EVENT_NONE:
+		/* Revert to charge mode */
+		power_supply_changed(&charger->usb);
+		power_supply_changed(&charger->battery);
+		da9150_set_bits(charger->da9150, DA9150_PPR_BKCTRL_A,
+				DA9150_VBUS_MODE_MASK, DA9150_VBUS_MODE_CHG);
+		break;
+	}
+}
+
+static int da9150_charger_otg_ncb(struct notifier_block *nb, unsigned long val,
+				  void *priv)
+{
+	struct da9150_charger *charger =
+		container_of(nb, struct da9150_charger, otg_nb);
+
+	dev_dbg(charger->dev, "DA9150 OTG notify %lu\n", val);
+
+	charger->usb_event = val;
+	schedule_work(&charger->otg_work);
+
+	return NOTIFY_OK;
+}
+
+static int da9150_charger_register_irq(struct platform_device *pdev,
+				       irq_handler_t handler,
+				       const char *irq_name)
+{
+	struct device *dev = &pdev->dev;
+	struct da9150_charger *charger = platform_get_drvdata(pdev);
+	int irq, ret;
+
+	irq = platform_get_irq_byname(pdev, irq_name);
+	if (irq < 0) {
+		dev_err(dev, "Failed to get IRQ CHG_STATUS: %d\n", irq);
+		return irq;
+	}
+
+	ret = devm_request_threaded_irq(dev, irq, NULL, handler, IRQF_ONESHOT,
+					irq_name, charger);
+	if (ret)
+		dev_err(dev, "Failed to request IRQ %d: %d\n", irq, ret);
+
+	return ret;
+}
+
+static int da9150_charger_probe(struct platform_device *pdev)
+{
+	struct device *dev = &pdev->dev;
+	struct da9150 *da9150 = dev_get_drvdata(dev->parent);
+	struct da9150_charger *charger;
+	struct power_supply *usb, *battery;
+	u8 reg;
+	int ret;
+
+	charger = devm_kzalloc(dev, sizeof(struct da9150_charger), GFP_KERNEL);
+	if (charger == NULL)
+		return -ENOMEM;
+
+	platform_set_drvdata(pdev, charger);
+	charger->da9150 = da9150;
+	charger->dev = dev;
+
+	/* Acquire ADC channels */
+	charger->ibus_chan = iio_channel_get(dev, "CHAN_IBUS");
+	if (IS_ERR(charger->ibus_chan)) {
+		ret = PTR_ERR(charger->ibus_chan);
+		goto ibus_chan_fail;
+	}
+
+	charger->vbus_chan = iio_channel_get(dev, "CHAN_VBUS");
+	if (IS_ERR(charger->vbus_chan)) {
+		ret = PTR_ERR(charger->vbus_chan);
+		goto vbus_chan_fail;
+	}
+
+	charger->tjunc_chan = iio_channel_get(dev, "CHAN_TJUNC");
+	if (IS_ERR(charger->tjunc_chan)) {
+		ret = PTR_ERR(charger->tjunc_chan);
+		goto tjunc_chan_fail;
+	}
+
+	charger->vbat_chan = iio_channel_get(dev, "CHAN_VBAT");
+	if (IS_ERR(charger->vbat_chan)) {
+		ret = PTR_ERR(charger->vbat_chan);
+		goto vbat_chan_fail;
+	}
+
+	/* Register power supplies */
+	usb = &charger->usb;
+	battery = &charger->battery;
+
+	usb->name = "da9150-usb",
+	usb->type = POWER_SUPPLY_TYPE_USB;
+	usb->properties = da9150_charger_props;
+	usb->num_properties = ARRAY_SIZE(da9150_charger_props);
+	usb->get_property = da9150_charger_get_prop;
+	ret = power_supply_register(dev, usb);
+	if (ret)
+		goto usb_fail;
+
+	battery->name = "da9150-battery";
+	battery->type = POWER_SUPPLY_TYPE_BATTERY;
+	battery->properties = da9150_charger_bat_props;
+	battery->num_properties = ARRAY_SIZE(da9150_charger_bat_props);
+	battery->get_property = da9150_charger_battery_get_prop;
+	ret = power_supply_register(dev, battery);
+	if (ret)
+		goto battery_fail;
+
+	/* Get initial online supply */
+	reg = da9150_reg_read(da9150, DA9150_STATUS_H);
+
+	switch (reg & DA9150_VBUS_STAT_MASK) {
+	case DA9150_VBUS_STAT_OFF:
+	case DA9150_VBUS_STAT_WAIT:
+		charger->supply_online = &charger->battery;
+		break;
+	case DA9150_VBUS_STAT_CHG:
+		charger->supply_online = &charger->usb;
+		break;
+	default:
+		dev_warn(dev, "Unknown VBUS state - reg = 0x%x\n", reg);
+		charger->supply_online = NULL;
+		break;
+	}
+
+	/* Setup OTG reporting & configuration */
+	charger->usb_phy = devm_usb_get_phy(dev, USB_PHY_TYPE_USB2);
+	if (!IS_ERR_OR_NULL(charger->usb_phy)) {
+		INIT_WORK(&charger->otg_work, da9150_charger_otg_work);
+		charger->otg_nb.notifier_call = da9150_charger_otg_ncb;
+		usb_register_notifier(charger->usb_phy, &charger->otg_nb);
+	}
+
+	/* Register IRQs */
+	ret = da9150_charger_register_irq(pdev, da9150_charger_chg_irq,
+					  "CHG_STATUS");
+	if (ret < 0)
+		goto irq_fail;
+
+	ret = da9150_charger_register_irq(pdev, da9150_charger_tjunc_irq,
+					  "CHG_TJUNC");
+	if (ret < 0)
+		goto irq_fail;
+
+	ret = da9150_charger_register_irq(pdev, da9150_charger_vfault_irq,
+					  "CHG_VFAULT");
+	if (ret < 0)
+		goto irq_fail;
+
+	ret = da9150_charger_register_irq(pdev, da9150_charger_vbus_irq,
+					  "CHG_VBUS");
+	if (ret < 0)
+		goto irq_fail;
+
+	return 0;
+
+irq_fail:
+	if (!IS_ERR_OR_NULL(charger->usb_phy))
+		usb_unregister_notifier(charger->usb_phy, &charger->otg_nb);
+battery_fail:
+	power_supply_unregister(usb);
+
+usb_fail:
+	iio_channel_release(charger->vbat_chan);
+
+vbat_chan_fail:
+	iio_channel_release(charger->tjunc_chan);
+
+tjunc_chan_fail:
+	iio_channel_release(charger->vbus_chan);
+
+vbus_chan_fail:
+	iio_channel_release(charger->ibus_chan);
+
+ibus_chan_fail:
+	return ret;
+}
+
+static int da9150_charger_remove(struct platform_device *pdev)
+{
+	struct device *dev = &pdev->dev;
+	struct da9150_charger *charger = platform_get_drvdata(pdev);
+	int irq;
+
+	/* Make sure IRQs are released before unregistering power supplies */
+	irq = platform_get_irq_byname(pdev, "CHG_VBUS");

drivers/power/da9150-charger.c line 637

Quoted 10 lines
drivers/power/da9150-charger.c new file +10 -0
+	devm_free_irq(dev, irq, charger);
+
+	irq = platform_get_irq_byname(pdev, "CHG_VFAULT");
+	devm_free_irq(dev, irq, charger);
+
+	irq = platform_get_irq_byname(pdev, "CHG_TJUNC");
+	devm_free_irq(dev, irq, charger);
+
+	irq = platform_get_irq_byname(pdev, "CHG_STATUS");
+	devm_free_irq(dev, irq, charger);

If you have used a devm allocation, you generally don't need to free them explicitly. That will happen when the device is freed.

If you do need to free them here (to maintain ordering etc) then you don't want to be using the devm interfaces in the first place.

Quoted 32 lines
drivers/power/da9150-charger.c new file +29 -1
+
+	if (!IS_ERR_OR_NULL(charger->usb_phy))
+		usb_unregister_notifier(charger->usb_phy, &charger->otg_nb);
+
+	power_supply_unregister(&charger->battery);
+	power_supply_unregister(&charger->usb);
+
+	/* Release ADC channels */
+	iio_channel_release(charger->ibus_chan);
+	iio_channel_release(charger->vbus_chan);
+	iio_channel_release(charger->tjunc_chan);
+	iio_channel_release(charger->vbat_chan);
+
+	return 0;
+}
+
+static struct platform_driver da9150_charger_driver = {
+	.driver = {
+		.name = "da9150-charger",
+	},
+	.probe = da9150_charger_probe,
+	.remove = da9150_charger_remove,
+};
+
+module_platform_driver(da9150_charger_driver);
+
+MODULE_DESCRIPTION("Charger Driver for DA9150");
+MODULE_AUTHOR("Adam Thomson <[email protected]>");
+MODULE_LICENSE("GPL");
--

1.9.3

#17 lore raw

RE: [PATCH v5 5/7] power: Add support for DA9150 Charger

T24gSmFudWFyeSA0LCAyMDE1IDE3OjI2LCBKb25hdGhhbiBDYW1lcm9uIHdyb3RlOg0KDQo+IE9u IDIyLzEyLzE0IDE2OjUxLCBBZGFtIFRob21zb24gd3JvdGU6DQo+ID4gVGhpcyBwYXRjaCBhZGRz IHN1cHBvcnQgZm9yIERBOTE1MCBDaGFyZ2VyICYgRnVlbC1HYXVnZSBJQyBDaGFyZ2VyLg0KPiA+ DQo+ID4gU2lnbmVkLW9mZi1ieTogQWRhbSBUaG9tc29uIDxBZGFtLlRob21zb24uT3BlbnNvdXJj ZUBkaWFzZW1pLmNvbT4NCj4gVGhlIElJTyBiaXRzIGxvb2sgZmluZSwgYnV0IHlvdXIgdXNlIG9m IGRldm1fZnJlZSAqIGRvZXNuJ3QuLi4NCj4NCj4gQXMgYSBzaWRlIG5vdGUsIGxvb2tzIGxpa2Ug d2UgY291bGQgYmVuZWZpdCBmcm9tIHNvbWUgYXJyYXkgdmVyc2lvbnMNCj4gb2YgdGhlIElJTyBj aGFubmVsIGdldHRpbmcgYW5kIHJlbGVhc2UgZnVuY3Rpb25zLiAgV291bGQgc2F2ZSBhIGZhaXIg Yml0DQo+IG9mIGJvaWxlciBwbGF0ZS4NCg0KWWVzLCBJIGd1ZXNzIHdoZW4gbW9yZSBkcml2ZXJz IGNvbWUgYWxvbmcgd2hpY2ggbmVlZCBtdWx0aXBsZSBjaGFubmVscyB0aGVuDQpzb21ldGhpbmcg bGlrZSB5b3Ugc3VnZ2VzdCB3b3VsZCBtYWtlIHNlbnNlIHRvIGhlbHAgcmVkdWNlIGNvZGUgZHVw bGljYXRpb24uDQpBbHNvIGRldm1fKiBmdW5jdGlvbnMgY291bGQgYmUgZ29vZCB0b28uDQoNCj4g DQo+IEpvbmF0aGFuDQo+ID4gLS0tDQo+ID4gIGRyaXZlcnMvcG93ZXIvS2NvbmZpZyAgICAgICAg ICB8ICAxMiArDQo+ID4gIGRyaXZlcnMvcG93ZXIvTWFrZWZpbGUgICAgICAgICB8ICAgMSArDQo+ ID4gIGRyaXZlcnMvcG93ZXIvZGE5MTUwLWNoYXJnZXIuYyB8IDY2Ng0KPiArKysrKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrKw0KPiA+ICAzIGZpbGVzIGNoYW5nZWQsIDY3OSBp bnNlcnRpb25zKCspDQo+ID4gIGNyZWF0ZSBtb2RlIDEwMDY0NCBkcml2ZXJzL3Bvd2VyL2RhOTE1 MC1jaGFyZ2VyLmMNCj4gPg0KPiA+IGRpZmYgLS1naXQgYS9kcml2ZXJzL3Bvd2VyL0tjb25maWcg Yi9kcml2ZXJzL3Bvd2VyL0tjb25maWcNCj4gPiBpbmRleCAwMTA4YzJhLi5lYjc5YTdhIDEwMDY0 NA0KPiA+IC0tLSBhL2RyaXZlcnMvcG93ZXIvS2NvbmZpZw0KPiA+ICsrKyBiL2RyaXZlcnMvcG93 ZXIvS2NvbmZpZw0KPiA+IEBAIC0xOTIsNiArMTkyLDE4IEBAIGNvbmZpZyBCQVRURVJZX0RBOTA1 Mg0KPiA+ICAJICBTYXkgWSBoZXJlIHRvIGVuYWJsZSBzdXBwb3J0IGZvciBiYXR0ZXJpZXMgY2hh cmdlciBpbnRlZ3JhdGVkIGludG8NCj4gPiAgCSAgREE5MDUyIFBNSUMuDQo+ID4NCj4gPiArY29u ZmlnIENIQVJHRVJfREE5MTUwDQo+ID4gKwl0cmlzdGF0ZSAiRGlhbG9nIFNlbWljb25kdWN0b3Ig REE5MTUwIENoYXJnZXIgc3VwcG9ydCINCj4gPiArCWRlcGVuZHMgb24gTUZEX0RBOTE1MA0KPiA+ ICsJZGVwZW5kcyBvbiBEQTkxNTBfR1BBREMNCj4gPiArCWRlcGVuZHMgb24gSUlPDQo+ID4gKwlo ZWxwDQo+ID4gKwkgIFNheSBZIGhlcmUgdG8gZW5hYmxlIHN1cHBvcnQgZm9yIGNoYXJnZXIgdW5p dCBvZiB0aGUgREE5MTUwDQo+ID4gKwkgIEludGVncmF0ZWQgQ2hhcmdlciAmIEZ1ZWwtR2F1Z2Ug SUMuDQo+ID4gKw0KPiA+ICsJICBUaGlzIGRyaXZlciBjYW4gYWxzbyBiZSBidWlsdCBhcyBhIG1v ZHVsZS4gSWYgc28sIHRoZSBtb2R1bGUgd2lsbCBiZQ0KPiA+ICsJICBjYWxsZWQgZGE5MTUwLWNo YXJnZXIuDQo+ID4gKw0KPiA+ICBjb25maWcgQkFUVEVSWV9NQVgxNzA0MA0KPiA+ICAJdHJpc3Rh dGUgIk1heGltIE1BWDE3MDQwIEZ1ZWwgR2F1Z2UiDQo+ID4gIAlkZXBlbmRzIG9uIEkyQw0KPiA+ IGRpZmYgLS1naXQgYS9kcml2ZXJzL3Bvd2VyL01ha2VmaWxlIGIvZHJpdmVycy9wb3dlci9NYWtl ZmlsZQ0KPiA+IGluZGV4IGRmYTg5NDIuLjBjMTg5NmQgMTAwNjQ0DQo+ID4gLS0tIGEvZHJpdmVy cy9wb3dlci9NYWtlZmlsZQ0KPiA+ICsrKyBiL2RyaXZlcnMvcG93ZXIvTWFrZWZpbGUNCj4gPiBA QCAtMzEsNiArMzEsNyBAQCBvYmotJChDT05GSUdfQkFUVEVSWV9TQlMpCSs9IHNicy1iYXR0ZXJ5 Lm8NCj4gPiAgb2JqLSQoQ09ORklHX0JBVFRFUllfQlEyN3gwMCkJKz0gYnEyN3gwMF9iYXR0ZXJ5 Lm8NCj4gPiAgb2JqLSQoQ09ORklHX0JBVFRFUllfREE5MDMwKQkrPSBkYTkwMzBfYmF0dGVyeS5v DQo+ID4gIG9iai0kKENPTkZJR19CQVRURVJZX0RBOTA1MikJKz0gZGE5MDUyLWJhdHRlcnkubw0K PiA+ICtvYmotJChDT05GSUdfQ0hBUkdFUl9EQTkxNTApCSs9IGRhOTE1MC1jaGFyZ2VyLm8NCj4g PiAgb2JqLSQoQ09ORklHX0JBVFRFUllfTUFYMTcwNDApCSs9IG1heDE3MDQwX2JhdHRlcnkubw0K PiA+ICBvYmotJChDT05GSUdfQkFUVEVSWV9NQVgxNzA0MikJKz0gbWF4MTcwNDJfYmF0dGVyeS5v DQo+ID4gIG9iai0kKENPTkZJR19CQVRURVJZX1oyKQkrPSB6Ml9iYXR0ZXJ5Lm8NCj4gPiBkaWZm IC0tZ2l0IGEvZHJpdmVycy9wb3dlci9kYTkxNTAtY2hhcmdlci5jIGIvZHJpdmVycy9wb3dlci9k YTkxNTAtY2hhcmdlci5jDQo+ID4gbmV3IGZpbGUgbW9kZSAxMDA2NDQNCj4gPiBpbmRleCAwMDAw MDAwLi45YjE4MjZkDQo+ID4gLS0tIC9kZXYvbnVsbA0KPiA+ICsrKyBiL2RyaXZlcnMvcG93ZXIv ZGE5MTUwLWNoYXJnZXIuYw0KPiA+IEBAIC0wLDAgKzEsNjY2IEBADQo+ID4gKy8qDQo+ID4gKyAq IERBOTE1MCBDaGFyZ2VyIERyaXZlcg0KPiA+ICsgKg0KPiA+ICsgKiBDb3B5cmlnaHQgKGMpIDIw MTQgRGlhbG9nIFNlbWljb25kdWN0b3INCj4gPiArICoNCj4gPiArICogQXV0aG9yOiBBZGFtIFRo b21zb24gPEFkYW0uVGhvbXNvbi5PcGVuc291cmNlQGRpYXNlbWkuY29tPg0KPiA+ICsgKg0KPiA+ ICsgKiBUaGlzIHByb2dyYW0gaXMgZnJlZSBzb2Z0d2FyZTsgeW91IGNhbiByZWRpc3RyaWJ1dGUg IGl0IGFuZC9vciBtb2RpZnkgaXQNCj4gPiArICogdW5kZXIgIHRoZSB0ZXJtcyBvZiAgdGhlIEdO VSBHZW5lcmFsICBQdWJsaWMgTGljZW5zZSBhcyBwdWJsaXNoZWQgYnkgdGhlDQo+ID4gKyAqIEZy ZWUgU29mdHdhcmUgRm91bmRhdGlvbjsgIGVpdGhlciB2ZXJzaW9uIDIgb2YgdGhlICBMaWNlbnNl LCBvciAoYXQgeW91cg0KPiA+ICsgKiBvcHRpb24pIGFueSBsYXRlciB2ZXJzaW9uLg0KPiA+ICsg Ki8NCj4gPiArDQo+ID4gKyNpbmNsdWRlIDxsaW51eC9rZXJuZWwuaD4NCj4gPiArI2luY2x1ZGUg PGxpbnV4L3NsYWIuaD4NCj4gPiArI2luY2x1ZGUgPGxpbnV4L21vZHVsZS5oPg0KPiA+ICsjaW5j bHVkZSA8bGludXgvcGxhdGZvcm1fZGV2aWNlLmg+DQo+ID4gKyNpbmNsdWRlIDxsaW51eC9vZi5o Pg0KPiA+ICsjaW5jbHVkZSA8bGludXgvb2ZfcGxhdGZvcm0uaD4NCj4gPiArI2luY2x1ZGUgPGxp bnV4L2ludGVycnVwdC5oPg0KPiA+ICsjaW5jbHVkZSA8bGludXgvcG93ZXJfc3VwcGx5Lmg+DQo+ ID4gKyNpbmNsdWRlIDxsaW51eC9ub3RpZmllci5oPg0KPiA+ICsjaW5jbHVkZSA8bGludXgvdXNi L3BoeS5oPg0KPiA+ICsjaW5jbHVkZSA8bGludXgvaWlvL2NvbnN1bWVyLmg+DQo+ID4gKyNpbmNs dWRlIDxsaW51eC9tZmQvZGE5MTUwL2NvcmUuaD4NCj4gPiArI2luY2x1ZGUgPGxpbnV4L21mZC9k YTkxNTAvcmVnaXN0ZXJzLmg+DQo+ID4gKw0KPiA+ICsvKiBQcml2YXRlIGRhdGEgKi8NCj4gPiAr c3RydWN0IGRhOTE1MF9jaGFyZ2VyIHsNCj4gPiArCXN0cnVjdCBkYTkxNTAgKmRhOTE1MDsNCj4g PiArCXN0cnVjdCBkZXZpY2UgKmRldjsNCj4gPiArDQo+ID4gKwlzdHJ1Y3QgcG93ZXJfc3VwcGx5 IHVzYjsNCj4gPiArCXN0cnVjdCBwb3dlcl9zdXBwbHkgYmF0dGVyeTsNCj4gPiArCXN0cnVjdCBw b3dlcl9zdXBwbHkgKnN1cHBseV9vbmxpbmU7DQo+ID4gKw0KPiA+ICsJc3RydWN0IHVzYl9waHkg KnVzYl9waHk7DQo+ID4gKwlzdHJ1Y3Qgbm90aWZpZXJfYmxvY2sgb3RnX25iOw0KPiA+ICsJc3Ry dWN0IHdvcmtfc3RydWN0IG90Z193b3JrOw0KPiA+ICsJdW5zaWduZWQgbG9uZyB1c2JfZXZlbnQ7 DQo+ID4gKw0KPiA+ICsJc3RydWN0IGlpb19jaGFubmVsICppYnVzX2NoYW47DQo+ID4gKwlzdHJ1 Y3QgaWlvX2NoYW5uZWwgKnZidXNfY2hhbjsNCj4gPiArCXN0cnVjdCBpaW9fY2hhbm5lbCAqdGp1 bmNfY2hhbjsNCj4gPiArCXN0cnVjdCBpaW9fY2hhbm5lbCAqdmJhdF9jaGFuOw0KPiA+ICt9Ow0K PiA+ICsNCj4gPiArc3RhdGljIGlubGluZSBpbnQgZGE5MTUwX2NoYXJnZXJfc3VwcGx5X29ubGlu ZShzdHJ1Y3QgZGE5MTUwX2NoYXJnZXIgKmNoYXJnZXIsDQo+ID4gKwkJCQkJICAgICAgIHN0cnVj dCBwb3dlcl9zdXBwbHkgKnBzeSwNCj4gPiArCQkJCQkgICAgICAgdW5pb24gcG93ZXJfc3VwcGx5 X3Byb3B2YWwgKnZhbCkNCj4gPiArew0KPiA+ICsJdmFsLT5pbnR2YWwgPSAocHN5ID09IGNoYXJn ZXItPnN1cHBseV9vbmxpbmUpID8gMSA6IDA7DQo+ID4gKw0KPiA+ICsJcmV0dXJuIDA7DQo+ID4g K30NCj4gPiArDQo+ID4gKy8qIENoYXJnZXIgUHJvcGVydGllcyAqLw0KPiA+ICtzdGF0aWMgaW50 IGRhOTE1MF9jaGFyZ2VyX3ZidXNfdm9sdGFnZV9ub3coc3RydWN0IGRhOTE1MF9jaGFyZ2VyICpj aGFyZ2VyLA0KPiA+ICsJCQkJCSAgIHVuaW9uIHBvd2VyX3N1cHBseV9wcm9wdmFsICp2YWwpDQo+ ID4gK3sNCj4gPiArCWludCB2X3ZhbCwgcmV0Ow0KPiA+ICsNCj4gPiArCS8qIFJlYWQgcHJvY2Vz c2VkIHZhbHVlIC0gbVYgdW5pdHMgKi8NCj4gPiArCXJldCA9IGlpb19yZWFkX2NoYW5uZWxfcHJv Y2Vzc2VkKGNoYXJnZXItPnZidXNfY2hhbiwgJnZfdmFsKTsNCj4gPiArCWlmIChyZXQgPCAwKQ0K PiA+ICsJCXJldHVybiByZXQ7DQo+ID4gKw0KPiA+ICsJLyogQ29udmVydCB2b2x0YWdlIHRvIGV4 cGVjdGVkIHVWIHVuaXRzICovDQo+ID4gKwl2YWwtPmludHZhbCA9IHZfdmFsICogMTAwMDsNCj4g PiArDQo+ID4gKwlyZXR1cm4gMDsNCj4gPiArfQ0KPiA+ICsNCj4gPiArc3RhdGljIGludCBkYTkx NTBfY2hhcmdlcl9pYnVzX2N1cnJlbnRfYXZnKHN0cnVjdCBkYTkxNTBfY2hhcmdlciAqY2hhcmdl ciwNCj4gPiArCQkJCQkgICB1bmlvbiBwb3dlcl9zdXBwbHlfcHJvcHZhbCAqdmFsKQ0KPiA+ICt7 DQo+ID4gKwlpbnQgaV92YWwsIHJldDsNCj4gPiArDQo+ID4gKwkvKiBSZWFkIHByb2Nlc3NlZCB2 YWx1ZSAtIG1BIHVuaXRzICovDQo+ID4gKwlyZXQgPSBpaW9fcmVhZF9jaGFubmVsX3Byb2Nlc3Nl ZChjaGFyZ2VyLT5pYnVzX2NoYW4sICZpX3ZhbCk7DQo+ID4gKwlpZiAocmV0IDwgMCkNCj4gPiAr CQlyZXR1cm4gcmV0Ow0KPiA+ICsNCj4gPiArCS8qIENvbnZlcnQgY3VycmVudCB0byBleHBlY3Rl ZCB1QSB1bml0cyAqLw0KPiA+ICsJdmFsLT5pbnR2YWwgPSBpX3ZhbCAqIDEwMDA7DQo+ID4gKw0K PiA+ICsJcmV0dXJuIDA7DQo+ID4gK30NCj4gPiArDQo+ID4gK3N0YXRpYyBpbnQgZGE5MTUwX2No YXJnZXJfdGp1bmNfdGVtcChzdHJ1Y3QgZGE5MTUwX2NoYXJnZXIgKmNoYXJnZXIsDQo+ID4gKwkJ CQkgICAgIHVuaW9uIHBvd2VyX3N1cHBseV9wcm9wdmFsICp2YWwpDQo+ID4gK3sNCj4gPiArCWlu dCB0X3ZhbCwgcmV0Ow0KPiA+ICsNCj4gPiArCS8qIFJlYWQgcHJvY2Vzc2VkIHZhbHVlIC0gMC4w MDEgZGVncmVlcyBDIHVuaXRzICovDQo+ID4gKwlyZXQgPSBpaW9fcmVhZF9jaGFubmVsX3Byb2Nl c3NlZChjaGFyZ2VyLT50anVuY19jaGFuLCAmdF92YWwpOw0KPiA+ICsJaWYgKHJldCA8IDApDQo+ ID4gKwkJcmV0dXJuIHJldDsNCj4gPiArDQo+ID4gKwkvKiBDb252ZXJ0IHRlbXAgdG8gZXhwZWN0 IDAuMSBkZWdyZWVzIEMgdW5pdHMgKi8NCj4gPiArCXZhbC0+aW50dmFsID0gdF92YWwgLyAxMDA7 DQo+ID4gKw0KPiA+ICsJcmV0dXJuIDA7DQo+ID4gK30NCj4gPiArDQo+ID4gK3N0YXRpYyBlbnVt IHBvd2VyX3N1cHBseV9wcm9wZXJ0eSBkYTkxNTBfY2hhcmdlcl9wcm9wc1tdID0gew0KPiA+ICsJ UE9XRVJfU1VQUExZX1BST1BfT05MSU5FLA0KPiA+ICsJUE9XRVJfU1VQUExZX1BST1BfVk9MVEFH RV9OT1csDQo+ID4gKwlQT1dFUl9TVVBQTFlfUFJPUF9DVVJSRU5UX0FWRywNCj4gPiArCVBPV0VS X1NVUFBMWV9QUk9QX1RFTVAsDQo+ID4gK307DQo+ID4gKw0KPiA+ICtzdGF0aWMgaW50IGRhOTE1 MF9jaGFyZ2VyX2dldF9wcm9wKHN0cnVjdCBwb3dlcl9zdXBwbHkgKnBzeSwNCj4gPiArCQkJCSAg IGVudW0gcG93ZXJfc3VwcGx5X3Byb3BlcnR5IHBzcCwNCj4gPiArCQkJCSAgIHVuaW9uIHBvd2Vy X3N1cHBseV9wcm9wdmFsICp2YWwpDQo+ID4gK3sNCj4gPiArCXN0cnVjdCBkYTkxNTBfY2hhcmdl ciAqY2hhcmdlciA9IGRldl9nZXRfZHJ2ZGF0YShwc3ktPmRldi0+cGFyZW50KTsNCj4gPiArCWlu dCByZXQ7DQo+ID4gKw0KPiA+ICsJc3dpdGNoIChwc3ApIHsNCj4gPiArCWNhc2UgUE9XRVJfU1VQ UExZX1BST1BfT05MSU5FOg0KPiA+ICsJCXJldCA9IGRhOTE1MF9jaGFyZ2VyX3N1cHBseV9vbmxp bmUoY2hhcmdlciwgcHN5LCB2YWwpOw0KPiA+ICsJCWJyZWFrOw0KPiA+ICsJY2FzZSBQT1dFUl9T VVBQTFlfUFJPUF9WT0xUQUdFX05PVzoNCj4gPiArCQlyZXQgPSBkYTkxNTBfY2hhcmdlcl92YnVz X3ZvbHRhZ2Vfbm93KGNoYXJnZXIsIHZhbCk7DQo+ID4gKwkJYnJlYWs7DQo+ID4gKwljYXNlIFBP V0VSX1NVUFBMWV9QUk9QX0NVUlJFTlRfQVZHOg0KPiA+ICsJCXJldCA9IGRhOTE1MF9jaGFyZ2Vy X2lidXNfY3VycmVudF9hdmcoY2hhcmdlciwgdmFsKTsNCj4gPiArCQlicmVhazsNCj4gPiArCWNh c2UgUE9XRVJfU1VQUExZX1BST1BfVEVNUDoNCj4gPiArCQlyZXQgPSBkYTkxNTBfY2hhcmdlcl90 anVuY190ZW1wKGNoYXJnZXIsIHZhbCk7DQo+ID4gKwkJYnJlYWs7DQo+ID4gKwlkZWZhdWx0Og0K PiA+ICsJCXJldCA9IC1FSU5WQUw7DQo+ID4gKwkJYnJlYWs7DQo+ID4gKwl9DQo+ID4gKw0KPiA+ ICsJcmV0dXJuIHJldDsNCj4gPiArfQ0KPiA+ICsNCj4gPiArLyogQmF0dGVyeSBQcm9wZXJ0aWVz ICovDQo+ID4gK3N0YXRpYyBpbnQgZGE5MTUwX2NoYXJnZXJfYmF0dGVyeV9zdGF0dXMoc3RydWN0 IGRhOTE1MF9jaGFyZ2VyICpjaGFyZ2VyLA0KPiA+ICsJCQkJCSB1bmlvbiBwb3dlcl9zdXBwbHlf cHJvcHZhbCAqdmFsKQ0KPiA+ICt7DQo+ID4gKwl1OCByZWc7DQo+ID4gKw0KPiA+ICsJLyogQ2hl Y2sgdG8gc2VlIGlmIGJhdHRlcnkgaXMgZGlzY2hhcmdpbmcgKi8NCj4gPiArCXJlZyA9IGRhOTE1 MF9yZWdfcmVhZChjaGFyZ2VyLT5kYTkxNTAsIERBOTE1MF9TVEFUVVNfSCk7DQo+ID4gKw0KPiA+ ICsJaWYgKCgocmVnICYgREE5MTUwX1ZCVVNfU1RBVF9NQVNLKSA9PSBEQTkxNTBfVkJVU19TVEFU X09GRikgfHwNCj4gPiArCSAgICAoKHJlZyAmIERBOTE1MF9WQlVTX1NUQVRfTUFTSykgPT0gREE5 MTUwX1ZCVVNfU1RBVF9XQUlUKSkgew0KPiA+ICsJCXZhbC0+aW50dmFsID0gUE9XRVJfU1VQUExZ X1NUQVRVU19ESVNDSEFSR0lORzsNCj4gPiArDQo+ID4gKwkJcmV0dXJuIDA7DQo+ID4gKwl9DQo+ ID4gKw0KPiA+ICsJcmVnID0gZGE5MTUwX3JlZ19yZWFkKGNoYXJnZXItPmRhOTE1MCwgREE5MTUw X1NUQVRVU19KKTsNCj4gPiArDQo+ID4gKwkvKiBOb3cgY2hlY2sgZm9yIG90aGVyIHN0YXRlcyAq Lw0KPiA+ICsJc3dpdGNoIChyZWcgJiBEQTkxNTBfQ0hHX1NUQVRfTUFTSykgew0KPiA+ICsJY2Fz ZSBEQTkxNTBfQ0hHX1NUQVRfQUNUOg0KPiA+ICsJY2FzZSBEQTkxNTBfQ0hHX1NUQVRfUFJFOg0K PiA+ICsJY2FzZSBEQTkxNTBfQ0hHX1NUQVRfQ0M6DQo+ID4gKwljYXNlIERBOTE1MF9DSEdfU1RB VF9DVjoNCj4gPiArCQl2YWwtPmludHZhbCA9IFBPV0VSX1NVUFBMWV9TVEFUVVNfQ0hBUkdJTkc7 DQo+ID4gKwkJYnJlYWs7DQo+ID4gKwljYXNlIERBOTE1MF9DSEdfU1RBVF9PRkY6DQo+ID4gKwlj YXNlIERBOTE1MF9DSEdfU1RBVF9TVVNQOg0KPiA+ICsJY2FzZSBEQTkxNTBfQ0hHX1NUQVRfVEVN UDoNCj4gPiArCWNhc2UgREE5MTUwX0NIR19TVEFUX1RJTUU6DQo+ID4gKwljYXNlIERBOTE1MF9D SEdfU1RBVF9CQVQ6DQo+ID4gKwkJdmFsLT5pbnR2YWwgPSBQT1dFUl9TVVBQTFlfU1RBVFVTX05P VF9DSEFSR0lORzsNCj4gPiArCQlicmVhazsNCj4gPiArCWNhc2UgREE5MTUwX0NIR19TVEFUX0ZV TEw6DQo+ID4gKwkJdmFsLT5pbnR2YWwgPSBQT1dFUl9TVVBQTFlfU1RBVFVTX0ZVTEw7DQo+ID4g KwkJYnJlYWs7DQo+ID4gKwlkZWZhdWx0Og0KPiA+ICsJCXZhbC0+aW50dmFsID0gUE9XRVJfU1VQ UExZX1NUQVRVU19VTktOT1dOOw0KPiA+ICsJCWJyZWFrOw0KPiA+ICsJfQ0KPiA+ICsNCj4gPiAr CXJldHVybiAwOw0KPiA+ICt9DQo+ID4gKw0KPiA+ICtzdGF0aWMgaW50IGRhOTE1MF9jaGFyZ2Vy X2JhdHRlcnlfaGVhbHRoKHN0cnVjdCBkYTkxNTBfY2hhcmdlciAqY2hhcmdlciwNCj4gPiArCQkJ CQkgdW5pb24gcG93ZXJfc3VwcGx5X3Byb3B2YWwgKnZhbCkNCj4gPiArew0KPiA+ICsJdTggcmVn Ow0KPiA+ICsNCj4gPiArCXJlZyA9IGRhOTE1MF9yZWdfcmVhZChjaGFyZ2VyLT5kYTkxNTAsIERB OTE1MF9TVEFUVVNfSik7DQo+ID4gKw0KPiA+ICsJLyogQ2hlY2sgaWYgdGVtcGVyYXR1cmUgbGlt aXQgcmVhY2hlZCAqLw0KPiA+ICsJc3dpdGNoIChyZWcgJiBEQTkxNTBfQ0hHX1RFTVBfTUFTSykg ew0KPiA+ICsJY2FzZSBEQTkxNTBfQ0hHX1RFTVBfVU5ERVI6DQo+ID4gKwkJdmFsLT5pbnR2YWwg PSBQT1dFUl9TVVBQTFlfSEVBTFRIX0NPTEQ7DQo+ID4gKwkJcmV0dXJuIDA7DQo+ID4gKwljYXNl IERBOTE1MF9DSEdfVEVNUF9PVkVSOg0KPiA+ICsJCXZhbC0+aW50dmFsID0gUE9XRVJfU1VQUExZ X0hFQUxUSF9PVkVSSEVBVDsNCj4gPiArCQlyZXR1cm4gMDsNCj4gPiArCWRlZmF1bHQ6DQo+ID4g KwkJYnJlYWs7DQo+ID4gKwl9DQo+ID4gKw0KPiA+ICsJLyogQ2hlY2sgZm9yIG90aGVyIGhlYWx0 aCBzdGF0ZXMgKi8NCj4gPiArCXN3aXRjaCAocmVnICYgREE5MTUwX0NIR19TVEFUX01BU0spIHsN Cj4gPiArCWNhc2UgREE5MTUwX0NIR19TVEFUX0FDVDoNCj4gPiArCWNhc2UgREE5MTUwX0NIR19T VEFUX1BSRToNCj4gPiArCQl2YWwtPmludHZhbCA9IFBPV0VSX1NVUFBMWV9IRUFMVEhfREVBRDsN Cj4gPiArCQlicmVhazsNCj4gPiArCWNhc2UgREE5MTUwX0NIR19TVEFUX1RJTUU6DQo+ID4gKwkJ dmFsLT5pbnR2YWwgPSBQT1dFUl9TVVBQTFlfSEVBTFRIX1VOU1BFQ19GQUlMVVJFOw0KPiA+ICsJ CWJyZWFrOw0KPiA+ICsJZGVmYXVsdDoNCj4gPiArCQl2YWwtPmludHZhbCA9IFBPV0VSX1NVUFBM WV9IRUFMVEhfR09PRDsNCj4gPiArCQlicmVhazsNCj4gPiArCX0NCj4gPiArDQo+ID4gKwlyZXR1 cm4gMDsNCj4gPiArfQ0KPiA+ICsNCj4gPiArc3RhdGljIGludCBkYTkxNTBfY2hhcmdlcl9iYXR0 ZXJ5X3ByZXNlbnQoc3RydWN0IGRhOTE1MF9jaGFyZ2VyICpjaGFyZ2VyLA0KPiA+ICsJCQkJCSAg dW5pb24gcG93ZXJfc3VwcGx5X3Byb3B2YWwgKnZhbCkNCj4gPiArew0KPiA+ICsJdTggcmVnOw0K PiA+ICsNCj4gPiArCS8qIENoZWNrIGlmIGJhdHRlcnkgcHJlc2VudCBvciByZW1vdmVkICovDQo+ ID4gKwlyZWcgPSBkYTkxNTBfcmVnX3JlYWQoY2hhcmdlci0+ZGE5MTUwLCBEQTkxNTBfU1RBVFVT X0opOw0KPiA+ICsJaWYgKChyZWcgJiBEQTkxNTBfQ0hHX1NUQVRfTUFTSykgPT0gREE5MTUwX0NI R19TVEFUX0JBVCkNCj4gPiArCQl2YWwtPmludHZhbCA9IDA7DQo+ID4gKwllbHNlDQo+ID4gKwkJ dmFsLT5pbnR2YWwgPSAxOw0KPiA+ICsNCj4gPiArCXJldHVybiAwOw0KPiA+ICt9DQo+ID4gKw0K PiA+ICtzdGF0aWMgaW50IGRhOTE1MF9jaGFyZ2VyX2JhdHRlcnlfY2hhcmdlX3R5cGUoc3RydWN0 IGRhOTE1MF9jaGFyZ2VyICpjaGFyZ2VyLA0KPiA+ICsJCQkJCSAgICAgIHVuaW9uIHBvd2VyX3N1 cHBseV9wcm9wdmFsICp2YWwpDQo+ID4gK3sNCj4gPiArCXU4IHJlZzsNCj4gPiArDQo+ID4gKwly ZWcgPSBkYTkxNTBfcmVnX3JlYWQoY2hhcmdlci0+ZGE5MTUwLCBEQTkxNTBfU1RBVFVTX0opOw0K PiA+ICsNCj4gPiArCXN3aXRjaCAocmVnICYgREE5MTUwX0NIR19TVEFUX01BU0spIHsNCj4gPiAr CWNhc2UgREE5MTUwX0NIR19TVEFUX0NDOg0KPiA+ICsJCXZhbC0+aW50dmFsID0gUE9XRVJfU1VQ UExZX0NIQVJHRV9UWVBFX0ZBU1Q7DQo+ID4gKwkJYnJlYWs7DQo+ID4gKwljYXNlIERBOTE1MF9D SEdfU1RBVF9BQ1Q6DQo+ID4gKwljYXNlIERBOTE1MF9DSEdfU1RBVF9QUkU6DQo+ID4gKwljYXNl IERBOTE1MF9DSEdfU1RBVF9DVjoNCj4gPiArCQl2YWwtPmludHZhbCA9IFBPV0VSX1NVUFBMWV9D SEFSR0VfVFlQRV9UUklDS0xFOw0KPiA+ICsJCWJyZWFrOw0KPiA+ICsJZGVmYXVsdDoNCj4gPiAr CQl2YWwtPmludHZhbCA9IFBPV0VSX1NVUFBMWV9DSEFSR0VfVFlQRV9OT05FOw0KPiA+ICsJCWJy ZWFrOw0KPiA+ICsJfQ0KPiA+ICsNCj4gPiArCXJldHVybiAwOw0KPiA+ICt9DQo+ID4gKw0KPiA+ ICtzdGF0aWMgaW50IGRhOTE1MF9jaGFyZ2VyX2JhdHRlcnlfdm9sdGFnZV9taW4oc3RydWN0IGRh OTE1MF9jaGFyZ2VyICpjaGFyZ2VyLA0KPiA+ICsJCQkJCSAgICAgIHVuaW9uIHBvd2VyX3N1cHBs eV9wcm9wdmFsICp2YWwpDQo+ID4gK3sNCj4gPiArCXU4IHJlZzsNCj4gPiArDQo+ID4gKwlyZWcg PSBkYTkxNTBfcmVnX3JlYWQoY2hhcmdlci0+ZGE5MTUwLCBEQTkxNTBfUFBSX0NIR0NUUkxfQyk7 DQo+ID4gKw0KPiA+ICsJLyogVmFsdWUgc3RhcnRzIGF0IDI1MDAgbVYsIDUwIG1WIGluY3JlbWVu dHMsIHByZXNlbnRlZCBpbiB1ViAqLw0KPiA+ICsJdmFsLT5pbnR2YWwgPSAoKHJlZyAmIERBOTE1 MF9DSEdfVkZBVUxUX01BU0spICogNTAwMDApICsgMjUwMDAwMDsNCj4gPiArDQo+ID4gKwlyZXR1 cm4gMDsNCj4gPiArfQ0KPiA+ICsNCj4gPiArc3RhdGljIGludCBkYTkxNTBfY2hhcmdlcl9iYXR0 ZXJ5X3ZvbHRhZ2Vfbm93KHN0cnVjdCBkYTkxNTBfY2hhcmdlciAqY2hhcmdlciwNCj4gPiArCQkJ CQkgICAgICB1bmlvbiBwb3dlcl9zdXBwbHlfcHJvcHZhbCAqdmFsKQ0KPiA+ICt7DQo+ID4gKwlp bnQgdl92YWwsIHJldDsNCj4gPiArDQo+ID4gKwkvKiBSZWFkIHByb2Nlc3NlZCB2YWx1ZSAtIG1W IHVuaXRzICovDQo+ID4gKwlyZXQgPSBpaW9fcmVhZF9jaGFubmVsX3Byb2Nlc3NlZChjaGFyZ2Vy LT52YmF0X2NoYW4sICZ2X3ZhbCk7DQo+ID4gKwlpZiAocmV0IDwgMCkNCj4gPiArCQlyZXR1cm4g cmV0Ow0KPiA+ICsNCj4gPiArCXZhbC0+aW50dmFsID0gdl92YWwgKiAxMDAwOw0KPiA+ICsNCj4g PiArCXJldHVybiAwOw0KPiA+ICt9DQo+ID4gKw0KPiA+ICtzdGF0aWMgaW50IGRhOTE1MF9jaGFy Z2VyX2JhdHRlcnlfY3VycmVudF9tYXgoc3RydWN0IGRhOTE1MF9jaGFyZ2VyICpjaGFyZ2VyLA0K PiA+ICsJCQkJCSAgICAgIHVuaW9uIHBvd2VyX3N1cHBseV9wcm9wdmFsICp2YWwpDQo+ID4gK3sN Cj4gPiArCWludCByZWc7DQo+ID4gKw0KPiA+ICsJcmVnID0gZGE5MTUwX3JlZ19yZWFkKGNoYXJn ZXItPmRhOTE1MCwgREE5MTUwX1BQUl9DSEdDVFJMX0QpOw0KPiA+ICsNCj4gPiArCS8qIDI1bUEg aW5jcmVtZW50cyAqLw0KPiA+ICsJdmFsLT5pbnR2YWwgPSByZWcgKiAyNTAwMDsNCj4gPiArDQo+ ID4gKwlyZXR1cm4gMDsNCj4gPiArfQ0KPiA+ICsNCj4gPiArc3RhdGljIGludCBkYTkxNTBfY2hh cmdlcl9iYXR0ZXJ5X3ZvbHRhZ2VfbWF4KHN0cnVjdCBkYTkxNTBfY2hhcmdlciAqY2hhcmdlciwN Cj4gPiArCQkJCQkgICAgICB1bmlvbiBwb3dlcl9zdXBwbHlfcHJvcHZhbCAqdmFsKQ0KPiA+ICt7 DQo+ID4gKwl1OCByZWc7DQo+ID4gKw0KPiA+ICsJcmVnID0gZGE5MTUwX3JlZ19yZWFkKGNoYXJn ZXItPmRhOTE1MCwgREE5MTUwX1BQUl9DSEdDVFJMX0IpOw0KPiA+ICsNCj4gPiArCS8qIFZhbHVl IHN0YXJ0cyBhdCAzNjUwIG1WLCAyNSBtViBpbmNyZW1lbnRzLCBwcmVzZW50ZWQgaW4gdVYgKi8N Cj4gPiArCXZhbC0+aW50dmFsID0gKChyZWcgJiBEQTkxNTBfQ0hHX1ZCQVRfTUFTSykgKiAyNTAw MCkgKyAzNjUwMDAwOw0KPiA+ICsJcmV0dXJuIDA7DQo+ID4gK30NCj4gPiArDQo+ID4gK3N0YXRp YyBlbnVtIHBvd2VyX3N1cHBseV9wcm9wZXJ0eSBkYTkxNTBfY2hhcmdlcl9iYXRfcHJvcHNbXSA9 IHsNCj4gPiArCVBPV0VSX1NVUFBMWV9QUk9QX1NUQVRVUywNCj4gPiArCVBPV0VSX1NVUFBMWV9Q Uk9QX09OTElORSwNCj4gPiArCVBPV0VSX1NVUFBMWV9QUk9QX0hFQUxUSCwNCj4gPiArCVBPV0VS X1NVUFBMWV9QUk9QX1BSRVNFTlQsDQo+ID4gKwlQT1dFUl9TVVBQTFlfUFJPUF9DSEFSR0VfVFlQ RSwNCj4gPiArCVBPV0VSX1NVUFBMWV9QUk9QX1ZPTFRBR0VfTUlOX0RFU0lHTiwNCj4gPiArCVBP V0VSX1NVUFBMWV9QUk9QX1ZPTFRBR0VfTk9XLA0KPiA+ICsJUE9XRVJfU1VQUExZX1BST1BfQ09O U1RBTlRfQ0hBUkdFX0NVUlJFTlRfTUFYLA0KPiA+ICsJUE9XRVJfU1VQUExZX1BST1BfQ09OU1RB TlRfQ0hBUkdFX1ZPTFRBR0VfTUFYLA0KPiA+ICt9Ow0KPiA+ICsNCj4gPiArc3RhdGljIGludCBk YTkxNTBfY2hhcmdlcl9iYXR0ZXJ5X2dldF9wcm9wKHN0cnVjdCBwb3dlcl9zdXBwbHkgKnBzeSwN Cj4gPiArCQkJCQkgICBlbnVtIHBvd2VyX3N1cHBseV9wcm9wZXJ0eSBwc3AsDQo+ID4gKwkJCQkJ ICAgdW5pb24gcG93ZXJfc3VwcGx5X3Byb3B2YWwgKnZhbCkNCj4gPiArew0KPiA+ICsJc3RydWN0 IGRhOTE1MF9jaGFyZ2VyICpjaGFyZ2VyID0gZGV2X2dldF9kcnZkYXRhKHBzeS0+ZGV2LT5wYXJl bnQpOw0KPiA+ICsJaW50IHJldDsNCj4gPiArDQo+ID4gKwlzd2l0Y2ggKHBzcCkgew0KPiA+ICsJ Y2FzZSBQT1dFUl9TVVBQTFlfUFJPUF9TVEFUVVM6DQo+ID4gKwkJcmV0ID0gZGE5MTUwX2NoYXJn ZXJfYmF0dGVyeV9zdGF0dXMoY2hhcmdlciwgdmFsKTsNCj4gPiArCQlicmVhazsNCj4gPiArCWNh c2UgUE9XRVJfU1VQUExZX1BST1BfT05MSU5FOg0KPiA+ICsJCXJldCA9IGRhOTE1MF9jaGFyZ2Vy X3N1cHBseV9vbmxpbmUoY2hhcmdlciwgcHN5LCB2YWwpOw0KPiA+ICsJCWJyZWFrOw0KPiA+ICsJ Y2FzZSBQT1dFUl9TVVBQTFlfUFJPUF9IRUFMVEg6DQo+ID4gKwkJcmV0ID0gZGE5MTUwX2NoYXJn ZXJfYmF0dGVyeV9oZWFsdGgoY2hhcmdlciwgdmFsKTsNCj4gPiArCQlicmVhazsNCj4gPiArCWNh c2UgUE9XRVJfU1VQUExZX1BST1BfUFJFU0VOVDoNCj4gPiArCQlyZXQgPSBkYTkxNTBfY2hhcmdl cl9iYXR0ZXJ5X3ByZXNlbnQoY2hhcmdlciwgdmFsKTsNCj4gPiArCQlicmVhazsNCj4gPiArCWNh c2UgUE9XRVJfU1VQUExZX1BST1BfQ0hBUkdFX1RZUEU6DQo+ID4gKwkJcmV0ID0gZGE5MTUwX2No YXJnZXJfYmF0dGVyeV9jaGFyZ2VfdHlwZShjaGFyZ2VyLCB2YWwpOw0KPiA+ICsJCWJyZWFrOw0K PiA+ICsJY2FzZSBQT1dFUl9TVVBQTFlfUFJPUF9WT0xUQUdFX01JTl9ERVNJR046DQo+ID4gKwkJ cmV0ID0gZGE5MTUwX2NoYXJnZXJfYmF0dGVyeV92b2x0YWdlX21pbihjaGFyZ2VyLCB2YWwpOw0K PiA+ICsJCWJyZWFrOw0KPiA+ICsJY2FzZSBQT1dFUl9TVVBQTFlfUFJPUF9WT0xUQUdFX05PVzoN Cj4gPiArCQlyZXQgPSBkYTkxNTBfY2hhcmdlcl9iYXR0ZXJ5X3ZvbHRhZ2Vfbm93KGNoYXJnZXIs IHZhbCk7DQo+ID4gKwkJYnJlYWs7DQo+ID4gKwljYXNlIFBPV0VSX1NVUFBMWV9QUk9QX0NPTlNU QU5UX0NIQVJHRV9DVVJSRU5UX01BWDoNCj4gPiArCQlyZXQgPSBkYTkxNTBfY2hhcmdlcl9iYXR0 ZXJ5X2N1cnJlbnRfbWF4KGNoYXJnZXIsIHZhbCk7DQo+ID4gKwkJYnJlYWs7DQo+ID4gKwljYXNl IFBPV0VSX1NVUFBMWV9QUk9QX0NPTlNUQU5UX0NIQVJHRV9WT0xUQUdFX01BWDoNCj4gPiArCQly ZXQgPSBkYTkxNTBfY2hhcmdlcl9iYXR0ZXJ5X3ZvbHRhZ2VfbWF4KGNoYXJnZXIsIHZhbCk7DQo+ ID4gKwkJYnJlYWs7DQo+ID4gKwlkZWZhdWx0Og0KPiA+ICsJCXJldCA9IC1FSU5WQUw7DQo+ID4g KwkJYnJlYWs7DQo+ID4gKwl9DQo+ID4gKw0KPiA+ICsJcmV0dXJuIHJldDsNCj4gPiArfQ0KPiA+ ICsNCj4gPiArc3RhdGljIGlycXJldHVybl90IGRhOTE1MF9jaGFyZ2VyX2NoZ19pcnEoaW50IGly cSwgdm9pZCAqZGF0YSkNCj4gPiArew0KPiA+ICsJc3RydWN0IGRhOTE1MF9jaGFyZ2VyICpjaGFy Z2VyID0gZGF0YTsNCj4gPiArDQo+ID4gKwlwb3dlcl9zdXBwbHlfY2hhbmdlZCgmY2hhcmdlci0+ YmF0dGVyeSk7DQo+ID4gKw0KPiA+ICsJcmV0dXJuIElSUV9IQU5ETEVEOw0KPiA+ICt9DQo+ID4g Kw0KPiA+ICtzdGF0aWMgaXJxcmV0dXJuX3QgZGE5MTUwX2NoYXJnZXJfdGp1bmNfaXJxKGludCBp cnEsIHZvaWQgKmRhdGEpDQo+ID4gK3sNCj4gPiArCXN0cnVjdCBkYTkxNTBfY2hhcmdlciAqY2hh cmdlciA9IGRhdGE7DQo+ID4gKw0KPiA+ICsJLyogTm90aGluZyB3ZSBjYW4gcmVhbGx5IGRvIGV4 Y2VwdCByZXBvcnQgdGhpcy4gKi8NCj4gPiArCWRldl9jcml0KGNoYXJnZXItPmRldiwgIlRKdW5j IG92ZXIgdGVtcGVyYXR1cmUhISFcbiIpOw0KPiA+ICsJcG93ZXJfc3VwcGx5X2NoYW5nZWQoJmNo YXJnZXItPnVzYik7DQo+ID4gKw0KPiA+ICsJcmV0dXJuIElSUV9IQU5ETEVEOw0KPiA+ICt9DQo+ ID4gKw0KPiA+ICtzdGF0aWMgaXJxcmV0dXJuX3QgZGE5MTUwX2NoYXJnZXJfdmZhdWx0X2lycShp bnQgaXJxLCB2b2lkICpkYXRhKQ0KPiA+ICt7DQo+ID4gKwlzdHJ1Y3QgZGE5MTUwX2NoYXJnZXIg KmNoYXJnZXIgPSBkYXRhOw0KPiA+ICsNCj4gPiArCS8qIE5vdGhpbmcgd2UgY2FuIHJlYWxseSBk byBleGNlcHQgcmVwb3J0IHRoaXMuICovDQo+ID4gKwlkZXZfY3JpdChjaGFyZ2VyLT5kZXYsICJW U1lTIHVuZGVyIHZvbHRhZ2UhISFcbiIpOw0KPiA+ICsJcG93ZXJfc3VwcGx5X2NoYW5nZWQoJmNo YXJnZXItPnVzYik7DQo+ID4gKwlwb3dlcl9zdXBwbHlfY2hhbmdlZCgmY2hhcmdlci0+YmF0dGVy eSk7DQo+ID4gKw0KPiA+ICsJcmV0dXJuIElSUV9IQU5ETEVEOw0KPiA+ICt9DQo+ID4gKw0KPiA+ ICtzdGF0aWMgaXJxcmV0dXJuX3QgZGE5MTUwX2NoYXJnZXJfdmJ1c19pcnEoaW50IGlycSwgdm9p ZCAqZGF0YSkNCj4gPiArew0KPiA+ICsJc3RydWN0IGRhOTE1MF9jaGFyZ2VyICpjaGFyZ2VyID0g ZGF0YTsNCj4gPiArCXU4IHJlZzsNCj4gPiArDQo+ID4gKwlyZWcgPSBkYTkxNTBfcmVnX3JlYWQo Y2hhcmdlci0+ZGE5MTUwLCBEQTkxNTBfU1RBVFVTX0gpOw0KPiA+ICsNCj4gPiArCS8qIENoYXJn ZXIgcGx1Z2dlZCBpbiBvciBiYXR0ZXJ5IG9ubHkgKi8NCj4gPiArCXN3aXRjaCAocmVnICYgREE5 MTUwX1ZCVVNfU1RBVF9NQVNLKSB7DQo+ID4gKwljYXNlIERBOTE1MF9WQlVTX1NUQVRfT0ZGOg0K PiA+ICsJY2FzZSBEQTkxNTBfVkJVU19TVEFUX1dBSVQ6DQo+ID4gKwkJY2hhcmdlci0+c3VwcGx5 X29ubGluZSA9ICZjaGFyZ2VyLT5iYXR0ZXJ5Ow0KPiA+ICsJCWJyZWFrOw0KPiA+ICsJY2FzZSBE QTkxNTBfVkJVU19TVEFUX0NIRzoNCj4gPiArCQljaGFyZ2VyLT5zdXBwbHlfb25saW5lID0gJmNo YXJnZXItPnVzYjsNCj4gPiArCQlicmVhazsNCj4gPiArCWRlZmF1bHQ6DQo+ID4gKwkJZGV2X3dh cm4oY2hhcmdlci0+ZGV2LCAiVW5rbm93biBWQlVTIHN0YXRlIC0gcmVnID0gMHgleFxuIiwNCj4g PiArCQkJIHJlZyk7DQo+ID4gKwkJY2hhcmdlci0+c3VwcGx5X29ubGluZSA9IE5VTEw7DQo+ID4g KwkJYnJlYWs7DQo+ID4gKwl9DQo+ID4gKw0KPiA+ICsJcG93ZXJfc3VwcGx5X2NoYW5nZWQoJmNo YXJnZXItPnVzYik7DQo+ID4gKwlwb3dlcl9zdXBwbHlfY2hhbmdlZCgmY2hhcmdlci0+YmF0dGVy eSk7DQo+ID4gKw0KPiA+ICsJcmV0dXJuIElSUV9IQU5ETEVEOw0KPiA+ICt9DQo+ID4gKw0KPiA+ ICtzdGF0aWMgdm9pZCBkYTkxNTBfY2hhcmdlcl9vdGdfd29yayhzdHJ1Y3Qgd29ya19zdHJ1Y3Qg KmRhdGEpDQo+ID4gK3sNCj4gPiArCXN0cnVjdCBkYTkxNTBfY2hhcmdlciAqY2hhcmdlciA9DQo+ ID4gKwkJY29udGFpbmVyX29mKGRhdGEsIHN0cnVjdCBkYTkxNTBfY2hhcmdlciwgb3RnX3dvcmsp Ow0KPiA+ICsNCj4gPiArCXN3aXRjaCAoY2hhcmdlci0+dXNiX2V2ZW50KSB7DQo+ID4gKwljYXNl IFVTQl9FVkVOVF9JRDoNCj4gPiArCQkvKiBFbmFibGUgT1RHIEJvb3N0ICovDQo+ID4gKwkJZGE5 MTUwX3NldF9iaXRzKGNoYXJnZXItPmRhOTE1MCwgREE5MTUwX1BQUl9CS0NUUkxfQSwNCj4gPiAr CQkJCURBOTE1MF9WQlVTX01PREVfTUFTSywNCj4gREE5MTUwX1ZCVVNfTU9ERV9PVEcpOw0KPiA+ ICsJCWJyZWFrOw0KPiA+ICsJY2FzZSBVU0JfRVZFTlRfTk9ORToNCj4gPiArCQkvKiBSZXZlcnQg dG8gY2hhcmdlIG1vZGUgKi8NCj4gPiArCQlwb3dlcl9zdXBwbHlfY2hhbmdlZCgmY2hhcmdlci0+ dXNiKTsNCj4gPiArCQlwb3dlcl9zdXBwbHlfY2hhbmdlZCgmY2hhcmdlci0+YmF0dGVyeSk7DQo+ ID4gKwkJZGE5MTUwX3NldF9iaXRzKGNoYXJnZXItPmRhOTE1MCwgREE5MTUwX1BQUl9CS0NUUkxf QSwNCj4gPiArCQkJCURBOTE1MF9WQlVTX01PREVfTUFTSywNCj4gREE5MTUwX1ZCVVNfTU9ERV9D SEcpOw0KPiA+ICsJCWJyZWFrOw0KPiA+ICsJfQ0KPiA+ICt9DQo+ID4gKw0KPiA+ICtzdGF0aWMg aW50IGRhOTE1MF9jaGFyZ2VyX290Z19uY2Ioc3RydWN0IG5vdGlmaWVyX2Jsb2NrICpuYiwgdW5z aWduZWQgbG9uZyB2YWwsDQo+ID4gKwkJCQkgIHZvaWQgKnByaXYpDQo+ID4gK3sNCj4gPiArCXN0 cnVjdCBkYTkxNTBfY2hhcmdlciAqY2hhcmdlciA9DQo+ID4gKwkJY29udGFpbmVyX29mKG5iLCBz dHJ1Y3QgZGE5MTUwX2NoYXJnZXIsIG90Z19uYik7DQo+ID4gKw0KPiA+ICsJZGV2X2RiZyhjaGFy Z2VyLT5kZXYsICJEQTkxNTAgT1RHIG5vdGlmeSAlbHVcbiIsIHZhbCk7DQo+ID4gKw0KPiA+ICsJ Y2hhcmdlci0+dXNiX2V2ZW50ID0gdmFsOw0KPiA+ICsJc2NoZWR1bGVfd29yaygmY2hhcmdlci0+ b3RnX3dvcmspOw0KPiA+ICsNCj4gPiArCXJldHVybiBOT1RJRllfT0s7DQo+ID4gK30NCj4gPiAr DQo+ID4gK3N0YXRpYyBpbnQgZGE5MTUwX2NoYXJnZXJfcmVnaXN0ZXJfaXJxKHN0cnVjdCBwbGF0 Zm9ybV9kZXZpY2UgKnBkZXYsDQo+ID4gKwkJCQkgICAgICAgaXJxX2hhbmRsZXJfdCBoYW5kbGVy LA0KPiA+ICsJCQkJICAgICAgIGNvbnN0IGNoYXIgKmlycV9uYW1lKQ0KPiA+ICt7DQo+ID4gKwlz dHJ1Y3QgZGV2aWNlICpkZXYgPSAmcGRldi0+ZGV2Ow0KPiA+ICsJc3RydWN0IGRhOTE1MF9jaGFy Z2VyICpjaGFyZ2VyID0gcGxhdGZvcm1fZ2V0X2RydmRhdGEocGRldik7DQo+ID4gKwlpbnQgaXJx LCByZXQ7DQo+ID4gKw0KPiA+ICsJaXJxID0gcGxhdGZvcm1fZ2V0X2lycV9ieW5hbWUocGRldiwg aXJxX25hbWUpOw0KPiA+ICsJaWYgKGlycSA8IDApIHsNCj4gPiArCQlkZXZfZXJyKGRldiwgIkZh aWxlZCB0byBnZXQgSVJRIENIR19TVEFUVVM6ICVkXG4iLCBpcnEpOw0KPiA+ICsJCXJldHVybiBp cnE7DQo+ID4gKwl9DQo+ID4gKw0KPiA+ICsJcmV0ID0gZGV2bV9yZXF1ZXN0X3RocmVhZGVkX2ly cShkZXYsIGlycSwgTlVMTCwgaGFuZGxlciwgSVJRRl9PTkVTSE9ULA0KPiA+ICsJCQkJCWlycV9u YW1lLCBjaGFyZ2VyKTsNCj4gPiArCWlmIChyZXQpDQo+ID4gKwkJZGV2X2VycihkZXYsICJGYWls ZWQgdG8gcmVxdWVzdCBJUlEgJWQ6ICVkXG4iLCBpcnEsIHJldCk7DQo+ID4gKw0KPiA+ICsJcmV0 dXJuIHJldDsNCj4gPiArfQ0KPiA+ICsNCj4gPiArc3RhdGljIGludCBkYTkxNTBfY2hhcmdlcl9w cm9iZShzdHJ1Y3QgcGxhdGZvcm1fZGV2aWNlICpwZGV2KQ0KPiA+ICt7DQo+ID4gKwlzdHJ1Y3Qg ZGV2aWNlICpkZXYgPSAmcGRldi0+ZGV2Ow0KPiA+ICsJc3RydWN0IGRhOTE1MCAqZGE5MTUwID0g ZGV2X2dldF9kcnZkYXRhKGRldi0+cGFyZW50KTsNCj4gPiArCXN0cnVjdCBkYTkxNTBfY2hhcmdl ciAqY2hhcmdlcjsNCj4gPiArCXN0cnVjdCBwb3dlcl9zdXBwbHkgKnVzYiwgKmJhdHRlcnk7DQo+ ID4gKwl1OCByZWc7DQo+ID4gKwlpbnQgcmV0Ow0KPiA+ICsNCj4gPiArCWNoYXJnZXIgPSBkZXZt X2t6YWxsb2MoZGV2LCBzaXplb2Yoc3RydWN0IGRhOTE1MF9jaGFyZ2VyKSwgR0ZQX0tFUk5FTCk7 DQo+ID4gKwlpZiAoY2hhcmdlciA9PSBOVUxMKQ0KPiA+ICsJCXJldHVybiAtRU5PTUVNOw0KPiA+ ICsNCj4gPiArCXBsYXRmb3JtX3NldF9kcnZkYXRhKHBkZXYsIGNoYXJnZXIpOw0KPiA+ICsJY2hh cmdlci0+ZGE5MTUwID0gZGE5MTUwOw0KPiA+ICsJY2hhcmdlci0+ZGV2ID0gZGV2Ow0KPiA+ICsN Cj4gPiArCS8qIEFjcXVpcmUgQURDIGNoYW5uZWxzICovDQo+ID4gKwljaGFyZ2VyLT5pYnVzX2No YW4gPSBpaW9fY2hhbm5lbF9nZXQoZGV2LCAiQ0hBTl9JQlVTIik7DQo+ID4gKwlpZiAoSVNfRVJS KGNoYXJnZXItPmlidXNfY2hhbikpIHsNCj4gPiArCQlyZXQgPSBQVFJfRVJSKGNoYXJnZXItPmli dXNfY2hhbik7DQo+ID4gKwkJZ290byBpYnVzX2NoYW5fZmFpbDsNCj4gPiArCX0NCj4gPiArDQo+ ID4gKwljaGFyZ2VyLT52YnVzX2NoYW4gPSBpaW9fY2hhbm5lbF9nZXQoZGV2LCAiQ0hBTl9WQlVT Iik7DQo+ID4gKwlpZiAoSVNfRVJSKGNoYXJnZXItPnZidXNfY2hhbikpIHsNCj4gPiArCQlyZXQg PSBQVFJfRVJSKGNoYXJnZXItPnZidXNfY2hhbik7DQo+ID4gKwkJZ290byB2YnVzX2NoYW5fZmFp bDsNCj4gPiArCX0NCj4gPiArDQo+ID4gKwljaGFyZ2VyLT50anVuY19jaGFuID0gaWlvX2NoYW5u ZWxfZ2V0KGRldiwgIkNIQU5fVEpVTkMiKTsNCj4gPiArCWlmIChJU19FUlIoY2hhcmdlci0+dGp1 bmNfY2hhbikpIHsNCj4gPiArCQlyZXQgPSBQVFJfRVJSKGNoYXJnZXItPnRqdW5jX2NoYW4pOw0K PiA+ICsJCWdvdG8gdGp1bmNfY2hhbl9mYWlsOw0KPiA+ICsJfQ0KPiA+ICsNCj4gPiArCWNoYXJn ZXItPnZiYXRfY2hhbiA9IGlpb19jaGFubmVsX2dldChkZXYsICJDSEFOX1ZCQVQiKTsNCj4gPiAr CWlmIChJU19FUlIoY2hhcmdlci0+dmJhdF9jaGFuKSkgew0KPiA+ICsJCXJldCA9IFBUUl9FUlIo Y2hhcmdlci0+dmJhdF9jaGFuKTsNCj4gPiArCQlnb3RvIHZiYXRfY2hhbl9mYWlsOw0KPiA+ICsJ fQ0KPiA+ICsNCj4gPiArCS8qIFJlZ2lzdGVyIHBvd2VyIHN1cHBsaWVzICovDQo+ID4gKwl1c2Ig PSAmY2hhcmdlci0+dXNiOw0KPiA+ICsJYmF0dGVyeSA9ICZjaGFyZ2VyLT5iYXR0ZXJ5Ow0KPiA+ ICsNCj4gPiArCXVzYi0+bmFtZSA9ICJkYTkxNTAtdXNiIiwNCj4gPiArCXVzYi0+dHlwZSA9IFBP V0VSX1NVUFBMWV9UWVBFX1VTQjsNCj4gPiArCXVzYi0+cHJvcGVydGllcyA9IGRhOTE1MF9jaGFy Z2VyX3Byb3BzOw0KPiA+ICsJdXNiLT5udW1fcHJvcGVydGllcyA9IEFSUkFZX1NJWkUoZGE5MTUw X2NoYXJnZXJfcHJvcHMpOw0KPiA+ICsJdXNiLT5nZXRfcHJvcGVydHkgPSBkYTkxNTBfY2hhcmdl cl9nZXRfcHJvcDsNCj4gPiArCXJldCA9IHBvd2VyX3N1cHBseV9yZWdpc3RlcihkZXYsIHVzYik7 DQo+ID4gKwlpZiAocmV0KQ0KPiA+ICsJCWdvdG8gdXNiX2ZhaWw7DQo+ID4gKw0KPiA+ICsJYmF0 dGVyeS0+bmFtZSA9ICJkYTkxNTAtYmF0dGVyeSI7DQo+ID4gKwliYXR0ZXJ5LT50eXBlID0gUE9X RVJfU1VQUExZX1RZUEVfQkFUVEVSWTsNCj4gPiArCWJhdHRlcnktPnByb3BlcnRpZXMgPSBkYTkx NTBfY2hhcmdlcl9iYXRfcHJvcHM7DQo+ID4gKwliYXR0ZXJ5LT5udW1fcHJvcGVydGllcyA9IEFS UkFZX1NJWkUoZGE5MTUwX2NoYXJnZXJfYmF0X3Byb3BzKTsNCj4gPiArCWJhdHRlcnktPmdldF9w cm9wZXJ0eSA9IGRhOTE1MF9jaGFyZ2VyX2JhdHRlcnlfZ2V0X3Byb3A7DQo+ID4gKwlyZXQgPSBw b3dlcl9zdXBwbHlfcmVnaXN0ZXIoZGV2LCBiYXR0ZXJ5KTsNCj4gPiArCWlmIChyZXQpDQo+ID4g KwkJZ290byBiYXR0ZXJ5X2ZhaWw7DQo+ID4gKw0KPiA+ICsJLyogR2V0IGluaXRpYWwgb25saW5l IHN1cHBseSAqLw0KPiA+ICsJcmVnID0gZGE5MTUwX3JlZ19yZWFkKGRhOTE1MCwgREE5MTUwX1NU QVRVU19IKTsNCj4gPiArDQo+ID4gKwlzd2l0Y2ggKHJlZyAmIERBOTE1MF9WQlVTX1NUQVRfTUFT Sykgew0KPiA+ICsJY2FzZSBEQTkxNTBfVkJVU19TVEFUX09GRjoNCj4gPiArCWNhc2UgREE5MTUw X1ZCVVNfU1RBVF9XQUlUOg0KPiA+ICsJCWNoYXJnZXItPnN1cHBseV9vbmxpbmUgPSAmY2hhcmdl ci0+YmF0dGVyeTsNCj4gPiArCQlicmVhazsNCj4gPiArCWNhc2UgREE5MTUwX1ZCVVNfU1RBVF9D SEc6DQo+ID4gKwkJY2hhcmdlci0+c3VwcGx5X29ubGluZSA9ICZjaGFyZ2VyLT51c2I7DQo+ID4g KwkJYnJlYWs7DQo+ID4gKwlkZWZhdWx0Og0KPiA+ICsJCWRldl93YXJuKGRldiwgIlVua25vd24g VkJVUyBzdGF0ZSAtIHJlZyA9IDB4JXhcbiIsIHJlZyk7DQo+ID4gKwkJY2hhcmdlci0+c3VwcGx5 X29ubGluZSA9IE5VTEw7DQo+ID4gKwkJYnJlYWs7DQo+ID4gKwl9DQo+ID4gKw0KPiA+ICsJLyog U2V0dXAgT1RHIHJlcG9ydGluZyAmIGNvbmZpZ3VyYXRpb24gKi8NCj4gPiArCWNoYXJnZXItPnVz Yl9waHkgPSBkZXZtX3VzYl9nZXRfcGh5KGRldiwgVVNCX1BIWV9UWVBFX1VTQjIpOw0KPiA+ICsJ aWYgKCFJU19FUlJfT1JfTlVMTChjaGFyZ2VyLT51c2JfcGh5KSkgew0KPiA+ICsJCUlOSVRfV09S SygmY2hhcmdlci0+b3RnX3dvcmssIGRhOTE1MF9jaGFyZ2VyX290Z193b3JrKTsNCj4gPiArCQlj aGFyZ2VyLT5vdGdfbmIubm90aWZpZXJfY2FsbCA9IGRhOTE1MF9jaGFyZ2VyX290Z19uY2I7DQo+ ID4gKwkJdXNiX3JlZ2lzdGVyX25vdGlmaWVyKGNoYXJnZXItPnVzYl9waHksICZjaGFyZ2VyLT5v dGdfbmIpOw0KPiA+ICsJfQ0KPiA+ICsNCj4gPiArCS8qIFJlZ2lzdGVyIElSUXMgKi8NCj4gPiAr CXJldCA9IGRhOTE1MF9jaGFyZ2VyX3JlZ2lzdGVyX2lycShwZGV2LCBkYTkxNTBfY2hhcmdlcl9j aGdfaXJxLA0KPiA+ICsJCQkJCSAgIkNIR19TVEFUVVMiKTsNCj4gPiArCWlmIChyZXQgPCAwKQ0K PiA+ICsJCWdvdG8gaXJxX2ZhaWw7DQo+ID4gKw0KPiA+ICsJcmV0ID0gZGE5MTUwX2NoYXJnZXJf cmVnaXN0ZXJfaXJxKHBkZXYsIGRhOTE1MF9jaGFyZ2VyX3RqdW5jX2lycSwNCj4gPiArCQkJCQkg ICJDSEdfVEpVTkMiKTsNCj4gPiArCWlmIChyZXQgPCAwKQ0KPiA+ICsJCWdvdG8gaXJxX2ZhaWw7 DQo+ID4gKw0KPiA+ICsJcmV0ID0gZGE5MTUwX2NoYXJnZXJfcmVnaXN0ZXJfaXJxKHBkZXYsIGRh OTE1MF9jaGFyZ2VyX3ZmYXVsdF9pcnEsDQo+ID4gKwkJCQkJICAiQ0hHX1ZGQVVMVCIpOw0KPiA+ ICsJaWYgKHJldCA8IDApDQo+ID4gKwkJZ290byBpcnFfZmFpbDsNCj4gPiArDQo+ID4gKwlyZXQg PSBkYTkxNTBfY2hhcmdlcl9yZWdpc3Rlcl9pcnEocGRldiwgZGE5MTUwX2NoYXJnZXJfdmJ1c19p cnEsDQo+ID4gKwkJCQkJICAiQ0hHX1ZCVVMiKTsNCj4gPiArCWlmIChyZXQgPCAwKQ0KPiA+ICsJ CWdvdG8gaXJxX2ZhaWw7DQo+ID4gKw0KPiA+ICsJcmV0dXJuIDA7DQo+ID4gKw0KPiA+ICtpcnFf ZmFpbDoNCj4gPiArCWlmICghSVNfRVJSX09SX05VTEwoY2hhcmdlci0+dXNiX3BoeSkpDQo+ID4g KwkJdXNiX3VucmVnaXN0ZXJfbm90aWZpZXIoY2hhcmdlci0+dXNiX3BoeSwgJmNoYXJnZXItPm90 Z19uYik7DQo+ID4gK2JhdHRlcnlfZmFpbDoNCj4gPiArCXBvd2VyX3N1cHBseV91bnJlZ2lzdGVy KHVzYik7DQo+ID4gKw0KPiA+ICt1c2JfZmFpbDoNCj4gPiArCWlpb19jaGFubmVsX3JlbGVhc2Uo Y2hhcmdlci0+dmJhdF9jaGFuKTsNCj4gPiArDQo+ID4gK3ZiYXRfY2hhbl9mYWlsOg0KPiA+ICsJ aWlvX2NoYW5uZWxfcmVsZWFzZShjaGFyZ2VyLT50anVuY19jaGFuKTsNCj4gPiArDQo+ID4gK3Rq dW5jX2NoYW5fZmFpbDoNCj4gPiArCWlpb19jaGFubmVsX3JlbGVhc2UoY2hhcmdlci0+dmJ1c19j aGFuKTsNCj4gPiArDQo+ID4gK3ZidXNfY2hhbl9mYWlsOg0KPiA+ICsJaWlvX2NoYW5uZWxfcmVs ZWFzZShjaGFyZ2VyLT5pYnVzX2NoYW4pOw0KPiA+ICsNCj4gPiAraWJ1c19jaGFuX2ZhaWw6DQo+ ID4gKwlyZXR1cm4gcmV0Ow0KPiA+ICt9DQo+ID4gKw0KPiA+ICtzdGF0aWMgaW50IGRhOTE1MF9j aGFyZ2VyX3JlbW92ZShzdHJ1Y3QgcGxhdGZvcm1fZGV2aWNlICpwZGV2KQ0KPiA+ICt7DQo+ID4g KwlzdHJ1Y3QgZGV2aWNlICpkZXYgPSAmcGRldi0+ZGV2Ow0KPiA+ICsJc3RydWN0IGRhOTE1MF9j aGFyZ2VyICpjaGFyZ2VyID0gcGxhdGZvcm1fZ2V0X2RydmRhdGEocGRldik7DQo+ID4gKwlpbnQg aXJxOw0KPiA+ICsNCj4gPiArCS8qIE1ha2Ugc3VyZSBJUlFzIGFyZSByZWxlYXNlZCBiZWZvcmUg dW5yZWdpc3RlcmluZyBwb3dlciBzdXBwbGllcyAqLw0KPiA+ICsJaXJxID0gcGxhdGZvcm1fZ2V0 X2lycV9ieW5hbWUocGRldiwgIkNIR19WQlVTIik7DQo+ID4gKwlkZXZtX2ZyZWVfaXJxKGRldiwg aXJxLCBjaGFyZ2VyKTsNCj4gPiArDQo+ID4gKwlpcnEgPSBwbGF0Zm9ybV9nZXRfaXJxX2J5bmFt ZShwZGV2LCAiQ0hHX1ZGQVVMVCIpOw0KPiA+ICsJZGV2bV9mcmVlX2lycShkZXYsIGlycSwgY2hh cmdlcik7DQo+ID4gKw0KPiA+ICsJaXJxID0gcGxhdGZvcm1fZ2V0X2lycV9ieW5hbWUocGRldiwg IkNIR19USlVOQyIpOw0KPiA+ICsJZGV2bV9mcmVlX2lycShkZXYsIGlycSwgY2hhcmdlcik7DQo+ ID4gKw0KPiA+ICsJaXJxID0gcGxhdGZvcm1fZ2V0X2lycV9ieW5hbWUocGRldiwgIkNIR19TVEFU VVMiKTsNCj4gPiArCWRldm1fZnJlZV9pcnEoZGV2LCBpcnEsIGNoYXJnZXIpOw0KPiBJZiB5b3Ug aGF2ZSB1c2VkIGEgZGV2bSBhbGxvY2F0aW9uLCB5b3UgZ2VuZXJhbGx5IGRvbid0IG5lZWQgdG8N Cj4gZnJlZSB0aGVtIGV4cGxpY2l0bHkuIFRoYXQgd2lsbCBoYXBwZW4gd2hlbiB0aGUgZGV2aWNl IGlzIGZyZWVkLg0KPiANCj4gSWYgeW91IGRvIG5lZWQgdG8gZnJlZSB0aGVtIGhlcmUgKHRvIG1h aW50YWluIG9yZGVyaW5nIGV0YykgdGhlbiB5b3UNCj4gZG9uJ3Qgd2FudCB0byBiZSB1c2luZyB0 aGUgZGV2bSBpbnRlcmZhY2VzIGluIHRoZSBmaXJzdCBwbGFjZS4NCg0KVGhlIG9yZGVyaW5nIG9u IHJlbGVhc2UgaXMgaW1wb3J0YW50IGFzIHBvd2VyX3N1cHBseV9jaGFuZ2VkKCkgaXMgY2FsbGVk IGJ5IElSUQ0KdGhyZWFkIGZ1bmN0aW9ucywgc28gdGhlIElSUXMgbmVlZCByZWxlYXNpbmcgZmly c3QgYmVmb3JlIHVucmVnaXN0ZXJpbmcgcG93ZXINCnN1cHBseSBjbGFzc2VzLiBUaGUgb3JpZ2lu YWwgaW50ZW50aW9uIHdpdGggdXNpbmcgZGV2bSBoZXJlIHdhcyB0byBrZWVwIHRoZQ0KY2xlYW51 cCBvbiBmYWlsdXJlIHNpbXBsZSBmb3IgdGhlIHByb2JlIGZ1bmN0aW9uIHdpdGggcmVnYXJkcyB0 byBJUlFzLCBidXQNCmxvb2tpbmcgYXQgaXQgYWdhaW4gdGhhdCdzIG5vdCBnb2luZyB0byB3b3Jr IHNvIEkgbmVlZCB0byBkcm9wIGJhY2sgdG8gdGhlDQpub24gZGV2bV8qIHZlcnNpb25zIGluc3Rl YWQuIFRoYW5rcyBmb3IgcG9pbnRpbmcgdG8gaXQuDQoNCj4gPiArDQo+ID4gKwlpZiAoIUlTX0VS Ul9PUl9OVUxMKGNoYXJnZXItPnVzYl9waHkpKQ0KPiA+ICsJCXVzYl91bnJlZ2lzdGVyX25vdGlm aWVyKGNoYXJnZXItPnVzYl9waHksICZjaGFyZ2VyLT5vdGdfbmIpOw0KPiA+ICsNCj4gPiArCXBv d2VyX3N1cHBseV91bnJlZ2lzdGVyKCZjaGFyZ2VyLT5iYXR0ZXJ5KTsNCj4gPiArCXBvd2VyX3N1 cHBseV91bnJlZ2lzdGVyKCZjaGFyZ2VyLT51c2IpOw0KPiA+ICsNCj4gPiArCS8qIFJlbGVhc2Ug QURDIGNoYW5uZWxzICovDQo+ID4gKwlpaW9fY2hhbm5lbF9yZWxlYXNlKGNoYXJnZXItPmlidXNf Y2hhbik7DQo+ID4gKwlpaW9fY2hhbm5lbF9yZWxlYXNlKGNoYXJnZXItPnZidXNfY2hhbik7DQo+ ID4gKwlpaW9fY2hhbm5lbF9yZWxlYXNlKGNoYXJnZXItPnRqdW5jX2NoYW4pOw0KPiA+ICsJaWlv X2NoYW5uZWxfcmVsZWFzZShjaGFyZ2VyLT52YmF0X2NoYW4pOw0KPiA+ICsNCj4gPiArCXJldHVy biAwOw0KPiA+ICt9DQo+ID4gKw0KPiA+ICtzdGF0aWMgc3RydWN0IHBsYXRmb3JtX2RyaXZlciBk YTkxNTBfY2hhcmdlcl9kcml2ZXIgPSB7DQo+ID4gKwkuZHJpdmVyID0gew0KPiA+ICsJCS5uYW1l ID0gImRhOTE1MC1jaGFyZ2VyIiwNCj4gPiArCX0sDQo+ID4gKwkucHJvYmUgPSBkYTkxNTBfY2hh cmdlcl9wcm9iZSwNCj4gPiArCS5yZW1vdmUgPSBkYTkxNTBfY2hhcmdlcl9yZW1vdmUsDQo+ID4g K307DQo+ID4gKw0KPiA+ICttb2R1bGVfcGxhdGZvcm1fZHJpdmVyKGRhOTE1MF9jaGFyZ2VyX2Ry aXZlcik7DQo+ID4gKw0KPiA+ICtNT0RVTEVfREVTQ1JJUFRJT04oIkNoYXJnZXIgRHJpdmVyIGZv ciBEQTkxNTAiKTsNCj4gPiArTU9EVUxFX0FVVEhPUigiQWRhbSBUaG9tc29uDQo+IDxBZGFtLlRo b21zb24uT3BlbnNvdXJjZUBkaWFzZW1pLmNvbT4iKTsNCj4gPiArTU9EVUxFX0xJQ0VOU0UoIkdQ TCIpOw0KPiA+IC0tDQo+ID4gMS45LjMNCj4gPg0K
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

#18 lore raw

PATCH v5 6/7 power: da9150: Add DT binding documentation for charger

In reply to Adam Thomson
---
 .../devicetree/bindings/power/da9150-charger.txt   | 26 ++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/power/da9150-charger.txt
Documentation/devicetree/bindings/power/da9150-charger.txt new file +26 -0
new file mode 100644
index 0000000..f390666
@@ -0,0 +1,26 @@
+Dialog Semiconductor DA9150 Charger Power Supply bindings
+
+Required properties:
+- compatible: "dlg,da9150-charger" for DA9150 Charger Power Supply
+
+Optional properties:
+- io-channels: List of phandle and IIO specifier pairs
+- io-channel-names: List of channel names used by charger
+      ["CHAN_IBUS", "CHAN_VBUS", "CHAN_TJUNC", "CHAN_VBAT"]
+  (See Documentation/devicetree/bindings/iio/iio-bindings.txt for further info)
+
+
+Example:
+
+	da9150-charger {
+		compatible = "dlg,da9150-charger";
+
+		io-channels = <&gpadc 0>,
+			      <&gpadc 2>,
+			      <&gpadc 8>,
+			      <&gpadc 5>;
+		io-channel-names = "CHAN_IBUS",
+				   "CHAN_VBUS",
+				   "CHAN_TJUNC",
+				   "CHAN_VBAT";
+	};

--
1.9.3

#19 lore raw

PATCH v5 7/7 MAINTAINERS: Include DA9150 files in Dialog Semiconductor support list.

In reply to Adam Thomson
---
 MAINTAINERS | 4 ++++
 1 file changed, 4 insertions(+)
MAINTAINERS +4 -0
index ddb9ac8..bd83dfc 100644
@@ -3084,12 +3084,15 @@ S:	Supported
 F:	Documentation/hwmon/da90??
 F:	drivers/gpio/gpio-da90??.c
 F:	drivers/hwmon/da90??-hwmon.c
+F:	drivers/iio/adc/da91??-*.c
 F:	drivers/input/misc/da90??_onkey.c
 F:	drivers/input/touchscreen/da9052_tsi.c
 F:	drivers/leds/leds-da90??.c
 F:	drivers/mfd/da903x.c
 F:	drivers/mfd/da90??-*.c
+F:	drivers/mfd/da91??-*.c
 F:	drivers/power/da9052-battery.c
+F:	drivers/power/da91??-*.c
 F:	drivers/regulator/da903x.c
 F:	drivers/regulator/da9???-regulator.[ch]
 F:	drivers/rtc/rtc-da90??.c
@@ -3099,6 +3102,7 @@ F:	include/linux/mfd/da903x.h
 F:	include/linux/mfd/da9052/
 F:	include/linux/mfd/da9055/
 F:	include/linux/mfd/da9063/
+F:	include/linux/mfd/da9150/
 F:	include/sound/da[79]*.h
 F:	sound/soc/codecs/da[79]*.[ch]
 

--
1.9.3