[PATCH v3 1/2] power: supply: ltc3651-charger: Fix device name

[PATCH v3 1/2] power: supply: ltc3651-charger: Fix device name

[michael.hennerich]

From: Michael Hennerich <michael.hennerich@analog.com>

There never was a device called LTC3651, it always was just LT3651.
This circumstance makes it pretty difficult to identify what this
driver is meant to control.channges since

Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>

---
Changes in v2:
 - Mark erroneous compatible strings as deprecated
 - Change patch title
 - Rename all occurrences of ltc3651
 - Rename kconfig name
 - Rename files

Changes in v3:
 - Regenerate patchset with rename detection
---
 .../bindings/power/supply/ltc3651-charger.txt      |  10 +-
 drivers/power/supply/Kconfig                       |   8 +-
 drivers/power/supply/Makefile                      |   2 +-
 drivers/power/supply/ltc3651-charger.c             | 123 ++++++++++-----------
 4 files changed, 71 insertions(+), 72 deletions(-)

diff --git a/Documentation/devicetree/bindings/power/supply/ltc3651-charger.txt b/Documentation/devicetree/bindings/power/supply/ltc3651-charger.txt
index 71f2840..40811ff 100644
--- a/Documentation/devicetree/bindings/power/supply/ltc3651-charger.txt
+++ b/Documentation/devicetree/bindings/power/supply/ltc3651-charger.txt
@@ -1,14 +1,16 @@
-ltc3651-charger
+Analog Devices LT3651 Charger Power Supply bindings: lt3651-charger
 
 Required properties:
- - compatible: "lltc,ltc3651-charger"
+- compatible: Should contain one of the following:
+ * "lltc,ltc3651-charger", (DEPRECATED: Use "lltc,lt3651-charger")
+ * "lltc,lt3651-charger"
  - lltc,acpr-gpios: Connect to ACPR output. See remark below.
 
 Optional properties:
  - lltc,fault-gpios: Connect to FAULT output. See remark below.
  - lltc,chrg-gpios: Connect to CHRG output. See remark below.
 
-The ltc3651 outputs are open-drain type and active low. The driver assumes the
+The lt3651 outputs are open-drain type and active low. The driver assumes the
 GPIO reports "active" when the output is asserted, so if the pins have been
 connected directly, the GPIO flags should be set to active low also.
 
@@ -20,7 +22,7 @@ attributes to detect changes.
 Example:
 
 	charger: battery-charger {
-		compatible = "lltc,ltc3651-charger";
+		compatible = "lltc,lt3651-charger";
 		lltc,acpr-gpios = <&gpio0 68 GPIO_ACTIVE_LOW>;
 		lltc,fault-gpios = <&gpio0 64 GPIO_ACTIVE_LOW>;
 		lltc,chrg-gpios = <&gpio0 63 GPIO_ACTIVE_LOW>;
diff --git a/drivers/power/supply/Kconfig b/drivers/power/supply/Kconfig
index e901b9879..e907521 100644
--- a/drivers/power/supply/Kconfig
+++ b/drivers/power/supply/Kconfig
@@ -475,12 +475,12 @@ config CHARGER_MANAGER
           runtime and in suspend-to-RAM by waking up the system periodically
           with help of suspend_again support.
 
-config CHARGER_LTC3651
-	tristate "LTC3651 charger"
+config CHARGER_LT3651
+	tristate "Analog Devices LT3651 charger"
 	depends on GPIOLIB
 	help
-	  Say Y to include support for the LTC3651 battery charger which reports
-	  its status via GPIO lines.
+	  Say Y to include support for the Analog Devices (Linear Technology)
+	  LT3651 battery charger which reports its status via GPIO lines.
 
 config CHARGER_MAX14577
 	tristate "Maxim MAX14577/77836 battery charger driver"
diff --git a/drivers/power/supply/Makefile b/drivers/power/supply/Makefile
index b731c2a..714c602 100644
--- a/drivers/power/supply/Makefile
+++ b/drivers/power/supply/Makefile
@@ -67,7 +67,7 @@ obj-$(CONFIG_CHARGER_LP8727)	+= lp8727_charger.o
 obj-$(CONFIG_CHARGER_LP8788)	+= lp8788-charger.o
 obj-$(CONFIG_CHARGER_GPIO)	+= gpio-charger.o
 obj-$(CONFIG_CHARGER_MANAGER)	+= charger-manager.o
-obj-$(CONFIG_CHARGER_LTC3651)	+= ltc3651-charger.o
+obj-$(CONFIG_CHARGER_LT3651)	+= ltc3651-charger.o
 obj-$(CONFIG_CHARGER_MAX14577)	+= max14577_charger.o
 obj-$(CONFIG_CHARGER_DETECTOR_MAX14656)	+= max14656_charger_detector.o
 obj-$(CONFIG_CHARGER_MAX77693)	+= max77693_charger.o
diff --git a/drivers/power/supply/ltc3651-charger.c b/drivers/power/supply/ltc3651-charger.c
index eea63ff..8de500f 100644
--- a/drivers/power/supply/ltc3651-charger.c
+++ b/drivers/power/supply/ltc3651-charger.c
@@ -1,11 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
+ *  Driver for Analog Devices (Linear Technology) LT3651 charger IC.
  *  Copyright (C) 2017, Topic Embedded Products
- *  Driver for LTC3651 charger IC.
- *
- *  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/device.h>
@@ -19,7 +15,7 @@
 #include <linux/slab.h>
 #include <linux/of.h>
 
-struct ltc3651_charger {
+struct lt3651_charger {
 	struct power_supply *charger;
 	struct power_supply_desc charger_desc;
 	struct gpio_desc *acpr_gpio;
@@ -27,7 +23,7 @@ struct ltc3651_charger {
 	struct gpio_desc *chrg_gpio;
 };
 
-static irqreturn_t ltc3651_charger_irq(int irq, void *devid)
+static irqreturn_t lt3651_charger_irq(int irq, void *devid)
 {
 	struct power_supply *charger = devid;
 
@@ -36,37 +32,37 @@ static irqreturn_t ltc3651_charger_irq(int irq, void *devid)
 	return IRQ_HANDLED;
 }
 
-static inline struct ltc3651_charger *psy_to_ltc3651_charger(
+static inline struct lt3651_charger *psy_to_lt3651_charger(
 	struct power_supply *psy)
 {
 	return power_supply_get_drvdata(psy);
 }
 
-static int ltc3651_charger_get_property(struct power_supply *psy,
+static int lt3651_charger_get_property(struct power_supply *psy,
 		enum power_supply_property psp, union power_supply_propval *val)
 {
-	struct ltc3651_charger *ltc3651_charger = psy_to_ltc3651_charger(psy);
+	struct lt3651_charger *lt3651_charger = psy_to_lt3651_charger(psy);
 
 	switch (psp) {
 	case POWER_SUPPLY_PROP_STATUS:
-		if (!ltc3651_charger->chrg_gpio) {
+		if (!lt3651_charger->chrg_gpio) {
 			val->intval = POWER_SUPPLY_STATUS_UNKNOWN;
 			break;
 		}
-		if (gpiod_get_value(ltc3651_charger->chrg_gpio))
+		if (gpiod_get_value(lt3651_charger->chrg_gpio))
 			val->intval = POWER_SUPPLY_STATUS_CHARGING;
 		else
 			val->intval = POWER_SUPPLY_STATUS_NOT_CHARGING;
 		break;
 	case POWER_SUPPLY_PROP_ONLINE:
-		val->intval = gpiod_get_value(ltc3651_charger->acpr_gpio);
+		val->intval = gpiod_get_value(lt3651_charger->acpr_gpio);
 		break;
 	case POWER_SUPPLY_PROP_HEALTH:
-		if (!ltc3651_charger->fault_gpio) {
+		if (!lt3651_charger->fault_gpio) {
 			val->intval = POWER_SUPPLY_HEALTH_UNKNOWN;
 			break;
 		}
-		if (!gpiod_get_value(ltc3651_charger->fault_gpio)) {
+		if (!gpiod_get_value(lt3651_charger->fault_gpio)) {
 			val->intval = POWER_SUPPLY_HEALTH_GOOD;
 			break;
 		}
@@ -74,11 +70,11 @@ static int ltc3651_charger_get_property(struct power_supply *psy,
 		 * If the fault pin is active, the chrg pin explains the type
 		 * of failure.
 		 */
-		if (!ltc3651_charger->chrg_gpio) {
+		if (!lt3651_charger->chrg_gpio) {
 			val->intval = POWER_SUPPLY_HEALTH_UNSPEC_FAILURE;
 			break;
 		}
-		val->intval = gpiod_get_value(ltc3651_charger->chrg_gpio) ?
+		val->intval = gpiod_get_value(lt3651_charger->chrg_gpio) ?
 				POWER_SUPPLY_HEALTH_OVERHEAT :
 				POWER_SUPPLY_HEALTH_DEAD;
 		break;
@@ -89,59 +85,59 @@ static int ltc3651_charger_get_property(struct power_supply *psy,
 	return 0;
 }
 
-static enum power_supply_property ltc3651_charger_properties[] = {
+static enum power_supply_property lt3651_charger_properties[] = {
 	POWER_SUPPLY_PROP_STATUS,
 	POWER_SUPPLY_PROP_ONLINE,
 	POWER_SUPPLY_PROP_HEALTH,
 };
 
-static int ltc3651_charger_probe(struct platform_device *pdev)
+static int lt3651_charger_probe(struct platform_device *pdev)
 {
 	struct power_supply_config psy_cfg = {};
-	struct ltc3651_charger *ltc3651_charger;
+	struct lt3651_charger *lt3651_charger;
 	struct power_supply_desc *charger_desc;
 	int ret;
 
-	ltc3651_charger = devm_kzalloc(&pdev->dev, sizeof(*ltc3651_charger),
+	lt3651_charger = devm_kzalloc(&pdev->dev, sizeof(*lt3651_charger),
 					GFP_KERNEL);
-	if (!ltc3651_charger)
+	if (!lt3651_charger)
 		return -ENOMEM;
 
-	ltc3651_charger->acpr_gpio = devm_gpiod_get(&pdev->dev,
+	lt3651_charger->acpr_gpio = devm_gpiod_get(&pdev->dev,
 					"lltc,acpr", GPIOD_IN);
-	if (IS_ERR(ltc3651_charger->acpr_gpio)) {
-		ret = PTR_ERR(ltc3651_charger->acpr_gpio);
+	if (IS_ERR(lt3651_charger->acpr_gpio)) {
+		ret = PTR_ERR(lt3651_charger->acpr_gpio);
 		dev_err(&pdev->dev, "Failed to acquire acpr GPIO: %d\n", ret);
 		return ret;
 	}
-	ltc3651_charger->fault_gpio = devm_gpiod_get_optional(&pdev->dev,
+	lt3651_charger->fault_gpio = devm_gpiod_get_optional(&pdev->dev,
 					"lltc,fault", GPIOD_IN);
-	if (IS_ERR(ltc3651_charger->fault_gpio)) {
-		ret = PTR_ERR(ltc3651_charger->fault_gpio);
+	if (IS_ERR(lt3651_charger->fault_gpio)) {
+		ret = PTR_ERR(lt3651_charger->fault_gpio);
 		dev_err(&pdev->dev, "Failed to acquire fault GPIO: %d\n", ret);
 		return ret;
 	}
-	ltc3651_charger->chrg_gpio = devm_gpiod_get_optional(&pdev->dev,
+	lt3651_charger->chrg_gpio = devm_gpiod_get_optional(&pdev->dev,
 					"lltc,chrg", GPIOD_IN);
-	if (IS_ERR(ltc3651_charger->chrg_gpio)) {
-		ret = PTR_ERR(ltc3651_charger->chrg_gpio);
+	if (IS_ERR(lt3651_charger->chrg_gpio)) {
+		ret = PTR_ERR(lt3651_charger->chrg_gpio);
 		dev_err(&pdev->dev, "Failed to acquire chrg GPIO: %d\n", ret);
 		return ret;
 	}
 
-	charger_desc = &ltc3651_charger->charger_desc;
+	charger_desc = &lt3651_charger->charger_desc;
 	charger_desc->name = pdev->dev.of_node->name;
 	charger_desc->type = POWER_SUPPLY_TYPE_MAINS;
-	charger_desc->properties = ltc3651_charger_properties;
-	charger_desc->num_properties = ARRAY_SIZE(ltc3651_charger_properties);
-	charger_desc->get_property = ltc3651_charger_get_property;
+	charger_desc->properties = lt3651_charger_properties;
+	charger_desc->num_properties = ARRAY_SIZE(lt3651_charger_properties);
+	charger_desc->get_property = lt3651_charger_get_property;
 	psy_cfg.of_node = pdev->dev.of_node;
-	psy_cfg.drv_data = ltc3651_charger;
+	psy_cfg.drv_data = lt3651_charger;
 
-	ltc3651_charger->charger = devm_power_supply_register(&pdev->dev,
+	lt3651_charger->charger = devm_power_supply_register(&pdev->dev,
 						      charger_desc, &psy_cfg);
-	if (IS_ERR(ltc3651_charger->charger)) {
-		ret = PTR_ERR(ltc3651_charger->charger);
+	if (IS_ERR(lt3651_charger->charger)) {
+		ret = PTR_ERR(lt3651_charger->charger);
 		dev_err(&pdev->dev, "Failed to register power supply: %d\n",
 			ret);
 		return ret;
@@ -152,59 +148,60 @@ static int ltc3651_charger_probe(struct platform_device *pdev)
 	 * support IRQs on these pins, userspace will have to poll the sysfs
 	 * files manually.
 	 */
-	if (ltc3651_charger->acpr_gpio) {
-		ret = gpiod_to_irq(ltc3651_charger->acpr_gpio);
+	if (lt3651_charger->acpr_gpio) {
+		ret = gpiod_to_irq(lt3651_charger->acpr_gpio);
 		if (ret >= 0)
 			ret = devm_request_any_context_irq(&pdev->dev, ret,
-				ltc3651_charger_irq,
+				lt3651_charger_irq,
 				IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
-				dev_name(&pdev->dev), ltc3651_charger->charger);
+				dev_name(&pdev->dev), lt3651_charger->charger);
 		if (ret < 0)
 			dev_warn(&pdev->dev, "Failed to request acpr irq\n");
 	}
-	if (ltc3651_charger->fault_gpio) {
-		ret = gpiod_to_irq(ltc3651_charger->fault_gpio);
+	if (lt3651_charger->fault_gpio) {
+		ret = gpiod_to_irq(lt3651_charger->fault_gpio);
 		if (ret >= 0)
 			ret = devm_request_any_context_irq(&pdev->dev, ret,
-				ltc3651_charger_irq,
+				lt3651_charger_irq,
 				IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
-				dev_name(&pdev->dev), ltc3651_charger->charger);
+				dev_name(&pdev->dev), lt3651_charger->charger);
 		if (ret < 0)
 			dev_warn(&pdev->dev, "Failed to request fault irq\n");
 	}
-	if (ltc3651_charger->chrg_gpio) {
-		ret = gpiod_to_irq(ltc3651_charger->chrg_gpio);
+	if (lt3651_charger->chrg_gpio) {
+		ret = gpiod_to_irq(lt3651_charger->chrg_gpio);
 		if (ret >= 0)
 			ret = devm_request_any_context_irq(&pdev->dev, ret,
-				ltc3651_charger_irq,
+				lt3651_charger_irq,
 				IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
-				dev_name(&pdev->dev), ltc3651_charger->charger);
+				dev_name(&pdev->dev), lt3651_charger->charger);
 		if (ret < 0)
 			dev_warn(&pdev->dev, "Failed to request chrg irq\n");
 	}
 
-	platform_set_drvdata(pdev, ltc3651_charger);
+	platform_set_drvdata(pdev, lt3651_charger);
 
 	return 0;
 }
 
-static const struct of_device_id ltc3651_charger_match[] = {
-	{ .compatible = "lltc,ltc3651-charger" },
+static const struct of_device_id lt3651_charger_match[] = {
+	{ .compatible = "lltc,ltc3651-charger" }, /* DEPRECATED */
+	{ .compatible = "lltc,lt3651-charger" },
 	{ }
 };
-MODULE_DEVICE_TABLE(of, ltc3651_charger_match);
+MODULE_DEVICE_TABLE(of, lt3651_charger_match);
 
-static struct platform_driver ltc3651_charger_driver = {
-	.probe = ltc3651_charger_probe,
+static struct platform_driver lt3651_charger_driver = {
+	.probe = lt3651_charger_probe,
 	.driver = {
-		.name = "ltc3651-charger",
-		.of_match_table = ltc3651_charger_match,
+		.name = "lt3651-charger",
+		.of_match_table = lt3651_charger_match,
 	},
 };
 
-module_platform_driver(ltc3651_charger_driver);
+module_platform_driver(lt3651_charger_driver);
 
 MODULE_AUTHOR("Mike Looijmans <mike.looijmans@topic.nl>");
-MODULE_DESCRIPTION("Driver for LTC3651 charger");
+MODULE_DESCRIPTION("Driver for LT3651 charger");
 MODULE_LICENSE("GPL");
-MODULE_ALIAS("platform:ltc3651-charger");
+MODULE_ALIAS("platform:lt3651-charger");
-- 
2.7.4

[PATCH v3 2/2] power: supply: ltc3651-charger: Fix device name (rename files)

[michael.hennerich]

From: Michael Hennerich <michael.hennerich@analog.com>

rename only - no functional changes

Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
---
 .../bindings/power/supply/{ltc3651-charger.txt => lt3651-charger.txt}   | 0
 drivers/power/supply/Makefile                                           | 2 +-
 drivers/power/supply/{ltc3651-charger.c => lt3651-charger.c}            | 0
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename Documentation/devicetree/bindings/power/supply/{ltc3651-charger.txt => lt3651-charger.txt} (100%)
 rename drivers/power/supply/{ltc3651-charger.c => lt3651-charger.c} (100%)

diff --git a/Documentation/devicetree/bindings/power/supply/ltc3651-charger.txt b/Documentation/devicetree/bindings/power/supply/lt3651-charger.txt
similarity index 100%
rename from Documentation/devicetree/bindings/power/supply/ltc3651-charger.txt
rename to Documentation/devicetree/bindings/power/supply/lt3651-charger.txt
diff --git a/drivers/power/supply/Makefile b/drivers/power/supply/Makefile
index 714c602..a2b3ab1 100644
--- a/drivers/power/supply/Makefile
+++ b/drivers/power/supply/Makefile
@@ -67,7 +67,7 @@ obj-$(CONFIG_CHARGER_LP8727)	+= lp8727_charger.o
 obj-$(CONFIG_CHARGER_LP8788)	+= lp8788-charger.o
 obj-$(CONFIG_CHARGER_GPIO)	+= gpio-charger.o
 obj-$(CONFIG_CHARGER_MANAGER)	+= charger-manager.o
-obj-$(CONFIG_CHARGER_LT3651)	+= ltc3651-charger.o
+obj-$(CONFIG_CHARGER_LT3651)	+= lt3651-charger.o
 obj-$(CONFIG_CHARGER_MAX14577)	+= max14577_charger.o
 obj-$(CONFIG_CHARGER_DETECTOR_MAX14656)	+= max14656_charger_detector.o
 obj-$(CONFIG_CHARGER_MAX77693)	+= max77693_charger.o
diff --git a/drivers/power/supply/ltc3651-charger.c b/drivers/power/supply/lt3651-charger.c
similarity index 100%
rename from drivers/power/supply/ltc3651-charger.c
rename to drivers/power/supply/lt3651-charger.c
-- 
2.7.4

Re: [PATCH v3 1/2] power: supply: ltc3651-charger: Fix device name

[Sebastian Reichel]

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

Hi,

On Tue, Apr 09, 2019 at 08:24:40AM +0200, michael.hennerich@analog.com wrote:
> From: Michael Hennerich <michael.hennerich@analog.com>
> 
> There never was a device called LTC3651, it always was just LT3651.
> This circumstance makes it pretty difficult to identify what this
> driver is meant to control.channges since
> 
> Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
> 
> ---

Thanks, queued.

-- Sebastian

> Changes in v2:
>  - Mark erroneous compatible strings as deprecated
>  - Change patch title
>  - Rename all occurrences of ltc3651
>  - Rename kconfig name
>  - Rename files
> 
> Changes in v3:
>  - Regenerate patchset with rename detection
> ---
>  .../bindings/power/supply/ltc3651-charger.txt      |  10 +-
>  drivers/power/supply/Kconfig                       |   8 +-
>  drivers/power/supply/Makefile                      |   2 +-
>  drivers/power/supply/ltc3651-charger.c             | 123 ++++++++++-----------
>  4 files changed, 71 insertions(+), 72 deletions(-)
> 
> diff --git a/Documentation/devicetree/bindings/power/supply/ltc3651-charger.txt b/Documentation/devicetree/bindings/power/supply/ltc3651-charger.txt
> index 71f2840..40811ff 100644
> --- a/Documentation/devicetree/bindings/power/supply/ltc3651-charger.txt
> +++ b/Documentation/devicetree/bindings/power/supply/ltc3651-charger.txt
> @@ -1,14 +1,16 @@
> -ltc3651-charger
> +Analog Devices LT3651 Charger Power Supply bindings: lt3651-charger
>  
>  Required properties:
> - - compatible: "lltc,ltc3651-charger"
> +- compatible: Should contain one of the following:
> + * "lltc,ltc3651-charger", (DEPRECATED: Use "lltc,lt3651-charger")
> + * "lltc,lt3651-charger"
>   - lltc,acpr-gpios: Connect to ACPR output. See remark below.
>  
>  Optional properties:
>   - lltc,fault-gpios: Connect to FAULT output. See remark below.
>   - lltc,chrg-gpios: Connect to CHRG output. See remark below.
>  
> -The ltc3651 outputs are open-drain type and active low. The driver assumes the
> +The lt3651 outputs are open-drain type and active low. The driver assumes the
>  GPIO reports "active" when the output is asserted, so if the pins have been
>  connected directly, the GPIO flags should be set to active low also.
>  
> @@ -20,7 +22,7 @@ attributes to detect changes.
>  Example:
>  
>  	charger: battery-charger {
> -		compatible = "lltc,ltc3651-charger";
> +		compatible = "lltc,lt3651-charger";
>  		lltc,acpr-gpios = <&gpio0 68 GPIO_ACTIVE_LOW>;
>  		lltc,fault-gpios = <&gpio0 64 GPIO_ACTIVE_LOW>;
>  		lltc,chrg-gpios = <&gpio0 63 GPIO_ACTIVE_LOW>;
> diff --git a/drivers/power/supply/Kconfig b/drivers/power/supply/Kconfig
> index e901b9879..e907521 100644
> --- a/drivers/power/supply/Kconfig
> +++ b/drivers/power/supply/Kconfig
> @@ -475,12 +475,12 @@ config CHARGER_MANAGER
>            runtime and in suspend-to-RAM by waking up the system periodically
>            with help of suspend_again support.
>  
> -config CHARGER_LTC3651
> -	tristate "LTC3651 charger"
> +config CHARGER_LT3651
> +	tristate "Analog Devices LT3651 charger"
>  	depends on GPIOLIB
>  	help
> -	  Say Y to include support for the LTC3651 battery charger which reports
> -	  its status via GPIO lines.
> +	  Say Y to include support for the Analog Devices (Linear Technology)
> +	  LT3651 battery charger which reports its status via GPIO lines.
>  
>  config CHARGER_MAX14577
>  	tristate "Maxim MAX14577/77836 battery charger driver"
> diff --git a/drivers/power/supply/Makefile b/drivers/power/supply/Makefile
> index b731c2a..714c602 100644
> --- a/drivers/power/supply/Makefile
> +++ b/drivers/power/supply/Makefile
> @@ -67,7 +67,7 @@ obj-$(CONFIG_CHARGER_LP8727)	+= lp8727_charger.o
>  obj-$(CONFIG_CHARGER_LP8788)	+= lp8788-charger.o
>  obj-$(CONFIG_CHARGER_GPIO)	+= gpio-charger.o
>  obj-$(CONFIG_CHARGER_MANAGER)	+= charger-manager.o
> -obj-$(CONFIG_CHARGER_LTC3651)	+= ltc3651-charger.o
> +obj-$(CONFIG_CHARGER_LT3651)	+= ltc3651-charger.o
>  obj-$(CONFIG_CHARGER_MAX14577)	+= max14577_charger.o
>  obj-$(CONFIG_CHARGER_DETECTOR_MAX14656)	+= max14656_charger_detector.o
>  obj-$(CONFIG_CHARGER_MAX77693)	+= max77693_charger.o
> diff --git a/drivers/power/supply/ltc3651-charger.c b/drivers/power/supply/ltc3651-charger.c
> index eea63ff..8de500f 100644
> --- a/drivers/power/supply/ltc3651-charger.c
> +++ b/drivers/power/supply/ltc3651-charger.c
> @@ -1,11 +1,7 @@
> +// SPDX-License-Identifier: GPL-2.0+
>  /*
> + *  Driver for Analog Devices (Linear Technology) LT3651 charger IC.
>   *  Copyright (C) 2017, Topic Embedded Products
> - *  Driver for LTC3651 charger IC.
> - *
> - *  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/device.h>
> @@ -19,7 +15,7 @@
>  #include <linux/slab.h>
>  #include <linux/of.h>
>  
> -struct ltc3651_charger {
> +struct lt3651_charger {
>  	struct power_supply *charger;
>  	struct power_supply_desc charger_desc;
>  	struct gpio_desc *acpr_gpio;
> @@ -27,7 +23,7 @@ struct ltc3651_charger {
>  	struct gpio_desc *chrg_gpio;
>  };
>  
> -static irqreturn_t ltc3651_charger_irq(int irq, void *devid)
> +static irqreturn_t lt3651_charger_irq(int irq, void *devid)
>  {
>  	struct power_supply *charger = devid;
>  
> @@ -36,37 +32,37 @@ static irqreturn_t ltc3651_charger_irq(int irq, void *devid)
>  	return IRQ_HANDLED;
>  }
>  
> -static inline struct ltc3651_charger *psy_to_ltc3651_charger(
> +static inline struct lt3651_charger *psy_to_lt3651_charger(
>  	struct power_supply *psy)
>  {
>  	return power_supply_get_drvdata(psy);
>  }
>  
> -static int ltc3651_charger_get_property(struct power_supply *psy,
> +static int lt3651_charger_get_property(struct power_supply *psy,
>  		enum power_supply_property psp, union power_supply_propval *val)
>  {
> -	struct ltc3651_charger *ltc3651_charger = psy_to_ltc3651_charger(psy);
> +	struct lt3651_charger *lt3651_charger = psy_to_lt3651_charger(psy);
>  
>  	switch (psp) {
>  	case POWER_SUPPLY_PROP_STATUS:
> -		if (!ltc3651_charger->chrg_gpio) {
> +		if (!lt3651_charger->chrg_gpio) {
>  			val->intval = POWER_SUPPLY_STATUS_UNKNOWN;
>  			break;
>  		}
> -		if (gpiod_get_value(ltc3651_charger->chrg_gpio))
> +		if (gpiod_get_value(lt3651_charger->chrg_gpio))
>  			val->intval = POWER_SUPPLY_STATUS_CHARGING;
>  		else
>  			val->intval = POWER_SUPPLY_STATUS_NOT_CHARGING;
>  		break;
>  	case POWER_SUPPLY_PROP_ONLINE:
> -		val->intval = gpiod_get_value(ltc3651_charger->acpr_gpio);
> +		val->intval = gpiod_get_value(lt3651_charger->acpr_gpio);
>  		break;
>  	case POWER_SUPPLY_PROP_HEALTH:
> -		if (!ltc3651_charger->fault_gpio) {
> +		if (!lt3651_charger->fault_gpio) {
>  			val->intval = POWER_SUPPLY_HEALTH_UNKNOWN;
>  			break;
>  		}
> -		if (!gpiod_get_value(ltc3651_charger->fault_gpio)) {
> +		if (!gpiod_get_value(lt3651_charger->fault_gpio)) {
>  			val->intval = POWER_SUPPLY_HEALTH_GOOD;
>  			break;
>  		}
> @@ -74,11 +70,11 @@ static int ltc3651_charger_get_property(struct power_supply *psy,
>  		 * If the fault pin is active, the chrg pin explains the type
>  		 * of failure.
>  		 */
> -		if (!ltc3651_charger->chrg_gpio) {
> +		if (!lt3651_charger->chrg_gpio) {
>  			val->intval = POWER_SUPPLY_HEALTH_UNSPEC_FAILURE;
>  			break;
>  		}
> -		val->intval = gpiod_get_value(ltc3651_charger->chrg_gpio) ?
> +		val->intval = gpiod_get_value(lt3651_charger->chrg_gpio) ?
>  				POWER_SUPPLY_HEALTH_OVERHEAT :
>  				POWER_SUPPLY_HEALTH_DEAD;
>  		break;
> @@ -89,59 +85,59 @@ static int ltc3651_charger_get_property(struct power_supply *psy,
>  	return 0;
>  }
>  
> -static enum power_supply_property ltc3651_charger_properties[] = {
> +static enum power_supply_property lt3651_charger_properties[] = {
>  	POWER_SUPPLY_PROP_STATUS,
>  	POWER_SUPPLY_PROP_ONLINE,
>  	POWER_SUPPLY_PROP_HEALTH,
>  };
>  
> -static int ltc3651_charger_probe(struct platform_device *pdev)
> +static int lt3651_charger_probe(struct platform_device *pdev)
>  {
>  	struct power_supply_config psy_cfg = {};
> -	struct ltc3651_charger *ltc3651_charger;
> +	struct lt3651_charger *lt3651_charger;
>  	struct power_supply_desc *charger_desc;
>  	int ret;
>  
> -	ltc3651_charger = devm_kzalloc(&pdev->dev, sizeof(*ltc3651_charger),
> +	lt3651_charger = devm_kzalloc(&pdev->dev, sizeof(*lt3651_charger),
>  					GFP_KERNEL);
> -	if (!ltc3651_charger)
> +	if (!lt3651_charger)
>  		return -ENOMEM;
>  
> -	ltc3651_charger->acpr_gpio = devm_gpiod_get(&pdev->dev,
> +	lt3651_charger->acpr_gpio = devm_gpiod_get(&pdev->dev,
>  					"lltc,acpr", GPIOD_IN);
> -	if (IS_ERR(ltc3651_charger->acpr_gpio)) {
> -		ret = PTR_ERR(ltc3651_charger->acpr_gpio);
> +	if (IS_ERR(lt3651_charger->acpr_gpio)) {
> +		ret = PTR_ERR(lt3651_charger->acpr_gpio);
>  		dev_err(&pdev->dev, "Failed to acquire acpr GPIO: %d\n", ret);
>  		return ret;
>  	}
> -	ltc3651_charger->fault_gpio = devm_gpiod_get_optional(&pdev->dev,
> +	lt3651_charger->fault_gpio = devm_gpiod_get_optional(&pdev->dev,
>  					"lltc,fault", GPIOD_IN);
> -	if (IS_ERR(ltc3651_charger->fault_gpio)) {
> -		ret = PTR_ERR(ltc3651_charger->fault_gpio);
> +	if (IS_ERR(lt3651_charger->fault_gpio)) {
> +		ret = PTR_ERR(lt3651_charger->fault_gpio);
>  		dev_err(&pdev->dev, "Failed to acquire fault GPIO: %d\n", ret);
>  		return ret;
>  	}
> -	ltc3651_charger->chrg_gpio = devm_gpiod_get_optional(&pdev->dev,
> +	lt3651_charger->chrg_gpio = devm_gpiod_get_optional(&pdev->dev,
>  					"lltc,chrg", GPIOD_IN);
> -	if (IS_ERR(ltc3651_charger->chrg_gpio)) {
> -		ret = PTR_ERR(ltc3651_charger->chrg_gpio);
> +	if (IS_ERR(lt3651_charger->chrg_gpio)) {
> +		ret = PTR_ERR(lt3651_charger->chrg_gpio);
>  		dev_err(&pdev->dev, "Failed to acquire chrg GPIO: %d\n", ret);
>  		return ret;
>  	}
>  
> -	charger_desc = &ltc3651_charger->charger_desc;
> +	charger_desc = &lt3651_charger->charger_desc;
>  	charger_desc->name = pdev->dev.of_node->name;
>  	charger_desc->type = POWER_SUPPLY_TYPE_MAINS;
> -	charger_desc->properties = ltc3651_charger_properties;
> -	charger_desc->num_properties = ARRAY_SIZE(ltc3651_charger_properties);
> -	charger_desc->get_property = ltc3651_charger_get_property;
> +	charger_desc->properties = lt3651_charger_properties;
> +	charger_desc->num_properties = ARRAY_SIZE(lt3651_charger_properties);
> +	charger_desc->get_property = lt3651_charger_get_property;
>  	psy_cfg.of_node = pdev->dev.of_node;
> -	psy_cfg.drv_data = ltc3651_charger;
> +	psy_cfg.drv_data = lt3651_charger;
>  
> -	ltc3651_charger->charger = devm_power_supply_register(&pdev->dev,
> +	lt3651_charger->charger = devm_power_supply_register(&pdev->dev,
>  						      charger_desc, &psy_cfg);
> -	if (IS_ERR(ltc3651_charger->charger)) {
> -		ret = PTR_ERR(ltc3651_charger->charger);
> +	if (IS_ERR(lt3651_charger->charger)) {
> +		ret = PTR_ERR(lt3651_charger->charger);
>  		dev_err(&pdev->dev, "Failed to register power supply: %d\n",
>  			ret);
>  		return ret;
> @@ -152,59 +148,60 @@ static int ltc3651_charger_probe(struct platform_device *pdev)
>  	 * support IRQs on these pins, userspace will have to poll the sysfs
>  	 * files manually.
>  	 */
> -	if (ltc3651_charger->acpr_gpio) {
> -		ret = gpiod_to_irq(ltc3651_charger->acpr_gpio);
> +	if (lt3651_charger->acpr_gpio) {
> +		ret = gpiod_to_irq(lt3651_charger->acpr_gpio);
>  		if (ret >= 0)
>  			ret = devm_request_any_context_irq(&pdev->dev, ret,
> -				ltc3651_charger_irq,
> +				lt3651_charger_irq,
>  				IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
> -				dev_name(&pdev->dev), ltc3651_charger->charger);
> +				dev_name(&pdev->dev), lt3651_charger->charger);
>  		if (ret < 0)
>  			dev_warn(&pdev->dev, "Failed to request acpr irq\n");
>  	}
> -	if (ltc3651_charger->fault_gpio) {
> -		ret = gpiod_to_irq(ltc3651_charger->fault_gpio);
> +	if (lt3651_charger->fault_gpio) {
> +		ret = gpiod_to_irq(lt3651_charger->fault_gpio);
>  		if (ret >= 0)
>  			ret = devm_request_any_context_irq(&pdev->dev, ret,
> -				ltc3651_charger_irq,
> +				lt3651_charger_irq,
>  				IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
> -				dev_name(&pdev->dev), ltc3651_charger->charger);
> +				dev_name(&pdev->dev), lt3651_charger->charger);
>  		if (ret < 0)
>  			dev_warn(&pdev->dev, "Failed to request fault irq\n");
>  	}
> -	if (ltc3651_charger->chrg_gpio) {
> -		ret = gpiod_to_irq(ltc3651_charger->chrg_gpio);
> +	if (lt3651_charger->chrg_gpio) {
> +		ret = gpiod_to_irq(lt3651_charger->chrg_gpio);
>  		if (ret >= 0)
>  			ret = devm_request_any_context_irq(&pdev->dev, ret,
> -				ltc3651_charger_irq,
> +				lt3651_charger_irq,
>  				IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
> -				dev_name(&pdev->dev), ltc3651_charger->charger);
> +				dev_name(&pdev->dev), lt3651_charger->charger);
>  		if (ret < 0)
>  			dev_warn(&pdev->dev, "Failed to request chrg irq\n");
>  	}
>  
> -	platform_set_drvdata(pdev, ltc3651_charger);
> +	platform_set_drvdata(pdev, lt3651_charger);
>  
>  	return 0;
>  }
>  
> -static const struct of_device_id ltc3651_charger_match[] = {
> -	{ .compatible = "lltc,ltc3651-charger" },
> +static const struct of_device_id lt3651_charger_match[] = {
> +	{ .compatible = "lltc,ltc3651-charger" }, /* DEPRECATED */
> +	{ .compatible = "lltc,lt3651-charger" },
>  	{ }
>  };
> -MODULE_DEVICE_TABLE(of, ltc3651_charger_match);
> +MODULE_DEVICE_TABLE(of, lt3651_charger_match);
>  
> -static struct platform_driver ltc3651_charger_driver = {
> -	.probe = ltc3651_charger_probe,
> +static struct platform_driver lt3651_charger_driver = {
> +	.probe = lt3651_charger_probe,
>  	.driver = {
> -		.name = "ltc3651-charger",
> -		.of_match_table = ltc3651_charger_match,
> +		.name = "lt3651-charger",
> +		.of_match_table = lt3651_charger_match,
>  	},
>  };
>  
> -module_platform_driver(ltc3651_charger_driver);
> +module_platform_driver(lt3651_charger_driver);
>  
>  MODULE_AUTHOR("Mike Looijmans <mike.looijmans@topic.nl>");
> -MODULE_DESCRIPTION("Driver for LTC3651 charger");
> +MODULE_DESCRIPTION("Driver for LT3651 charger");
>  MODULE_LICENSE("GPL");
> -MODULE_ALIAS("platform:ltc3651-charger");
> +MODULE_ALIAS("platform:lt3651-charger");
> -- 
> 2.7.4
> 

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [PATCH v3 2/2] power: supply: ltc3651-charger: Fix device name (rename files)

[Sebastian Reichel]

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

Hi,

On Tue, Apr 09, 2019 at 08:24:41AM +0200, michael.hennerich@analog.com wrote:
> From: Michael Hennerich <michael.hennerich@analog.com>
> 
> rename only - no functional changes
> 
> Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
> ---

Thanks, queued.

-- Sebastian

>  .../bindings/power/supply/{ltc3651-charger.txt => lt3651-charger.txt}   | 0
>  drivers/power/supply/Makefile                                           | 2 +-
>  drivers/power/supply/{ltc3651-charger.c => lt3651-charger.c}            | 0
>  3 files changed, 1 insertion(+), 1 deletion(-)
>  rename Documentation/devicetree/bindings/power/supply/{ltc3651-charger.txt => lt3651-charger.txt} (100%)
>  rename drivers/power/supply/{ltc3651-charger.c => lt3651-charger.c} (100%)
> 
> diff --git a/Documentation/devicetree/bindings/power/supply/ltc3651-charger.txt b/Documentation/devicetree/bindings/power/supply/lt3651-charger.txt
> similarity index 100%
> rename from Documentation/devicetree/bindings/power/supply/ltc3651-charger.txt
> rename to Documentation/devicetree/bindings/power/supply/lt3651-charger.txt
> diff --git a/drivers/power/supply/Makefile b/drivers/power/supply/Makefile
> index 714c602..a2b3ab1 100644
> --- a/drivers/power/supply/Makefile
> +++ b/drivers/power/supply/Makefile
> @@ -67,7 +67,7 @@ obj-$(CONFIG_CHARGER_LP8727)	+= lp8727_charger.o
>  obj-$(CONFIG_CHARGER_LP8788)	+= lp8788-charger.o
>  obj-$(CONFIG_CHARGER_GPIO)	+= gpio-charger.o
>  obj-$(CONFIG_CHARGER_MANAGER)	+= charger-manager.o
> -obj-$(CONFIG_CHARGER_LT3651)	+= ltc3651-charger.o
> +obj-$(CONFIG_CHARGER_LT3651)	+= lt3651-charger.o
>  obj-$(CONFIG_CHARGER_MAX14577)	+= max14577_charger.o
>  obj-$(CONFIG_CHARGER_DETECTOR_MAX14656)	+= max14656_charger_detector.o
>  obj-$(CONFIG_CHARGER_MAX77693)	+= max77693_charger.o
> diff --git a/drivers/power/supply/ltc3651-charger.c b/drivers/power/supply/lt3651-charger.c
> similarity index 100%
> rename from drivers/power/supply/ltc3651-charger.c
> rename to drivers/power/supply/lt3651-charger.c
> -- 
> 2.7.4
> 

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]