Re: [RFC PATCH 2/5] power: generic-adc-battery: Parse more properties from DT

[Sebastian Reichel]

Hi,

On Tue, Aug 01, 2017 at 10:55:23PM +0200, Marek Belisko wrote:
> From: Marek Belisko 
> 
> Signed-off-by: Marek Belisko 

This should use the infrastructure described here:

Documentation/devicetree/bindings/power/supply/battery.txt

-- Sebastian

> ---
>  drivers/power/supply/generic-adc-battery.c | 68 
> ++
>  1 file changed, 68 insertions(+)
> 
> diff --git a/drivers/power/supply/generic-adc-battery.c 
> b/drivers/power/supply/generic-adc-battery.c
> index b5e9208..d4daa6a 100644
> --- a/drivers/power/supply/generic-adc-battery.c
> +++ b/drivers/power/supply/generic-adc-battery.c
> @@ -23,6 +23,7 @@
>  #include 
>  #include 
>  #include 
> +#include 
>  
>  #define JITTER_DEFAULT 10 /* hope 10ms is enough */
>  
> @@ -241,6 +242,69 @@ static irqreturn_t gab_charged(int irq, void *dev_id)
>   return IRQ_HANDLED;
>  }
>  
> +#ifdef CONFIG_OF
> +static struct gab_platform_data *gab_dt_probe(struct platform_device *pdev)
> +{
> + struct gab_platform_data *pdata;
> + struct device_node *np = pdev->dev.of_node;
> + const char *name;
> + u32 val;
> + int err;
> +
> + pdata = devm_kzalloc(>dev,
> + sizeof(struct gab_platform_data),
> + GFP_KERNEL);
> + if (!pdata)
> + return ERR_PTR(-ENOMEM);
> +
> + pdata->gpio_charge_finished  = of_get_gpio(np, 0);
> +
> + /* parse and fill power_supply_info struct */
> + err = of_property_read_u32(np, "technology", );
> + if (err) {
> + dev_info(>dev, "Battery technology unknown\n");
> + val = 0;
> + }
> + pdata->battery_info.technology = val;
> +
> + err = of_property_read_string(np, "battery-name", );
> + if (err) {
> + dev_info(>dev, "Battery name empty, setting default\n");
> + }
> + pdata->battery_info.name = name;
> +
> + val = 0;
> + err = of_property_read_u32(np, "charge_empty_design", );
> + pdata->battery_info.charge_empty_design = val;
> +
> + val = 0;
> + err = of_property_read_u32(np, "charge_full_design", );
> + pdata->battery_info.charge_full_design = val;
> +
> + val = 0;
> + err = of_property_read_u32(np, "voltage_min_design", );
> + pdata->battery_info.voltage_min_design = val;
> +
> + val = 0;
> + err = of_property_read_u32(np, "voltage_max-design", );
> + pdata->battery_info.voltage_max_design = val;
> +
> + return pdata;
> +}
> +
> +static const struct of_device_id of_gab_match[] = {
> + { .compatible = "linux,generic-adc-battery", },
> + {},
> +};
> +MODULE_DEVICE_TABLE(of, of_gab_match);
> +
> +#else
> +static struct gab_platform_data gab_dt_probe(struct platform_device *pdev)
> +{
> + ERR_PTR(-ENODEV);
> +}
> +#endif
> +
>  static int gab_probe(struct platform_device *pdev)
>  {
>   struct gab *adc_bat;
> @@ -258,6 +322,9 @@ static int gab_probe(struct platform_device *pdev)
>   return -ENOMEM;
>   }
>  
> + if (pdata == NULL)
> + pdata = gab_dt_probe(pdev);
> +
>   psy_cfg.drv_data = adc_bat;
>   psy_desc = _bat->psy_desc;
>   psy_desc->name = "generic-adc-batt";//pdata->battery_info.name;
> @@ -418,6 +485,7 @@ static struct platform_driver gab_driver = {
>   .driver = {
>   .name   = "generic-adc-battery",
>   .pm = _pm_ops,
> + .of_match_table = of_gab_match,
>   },
>   .probe  = gab_probe,
>   .remove = gab_remove,
> -- 
> 2.7.4
> 


signature.asc
Description: PGP signature

Re: [RFC PATCH 2/5] power: generic-adc-battery: Parse more properties from DT

[Sebastian Reichel]

Hi,

On Tue, Aug 01, 2017 at 10:55:23PM +0200, Marek Belisko wrote:
> From: Marek Belisko 
> 
> Signed-off-by: Marek Belisko 

This should use the infrastructure described here:

Documentation/devicetree/bindings/power/supply/battery.txt

-- Sebastian

> ---
>  drivers/power/supply/generic-adc-battery.c | 68 
> ++
>  1 file changed, 68 insertions(+)
> 
> diff --git a/drivers/power/supply/generic-adc-battery.c 
> b/drivers/power/supply/generic-adc-battery.c
> index b5e9208..d4daa6a 100644
> --- a/drivers/power/supply/generic-adc-battery.c
> +++ b/drivers/power/supply/generic-adc-battery.c
> @@ -23,6 +23,7 @@
>  #include 
>  #include 
>  #include 
> +#include 
>  
>  #define JITTER_DEFAULT 10 /* hope 10ms is enough */
>  
> @@ -241,6 +242,69 @@ static irqreturn_t gab_charged(int irq, void *dev_id)
>   return IRQ_HANDLED;
>  }
>  
> +#ifdef CONFIG_OF
> +static struct gab_platform_data *gab_dt_probe(struct platform_device *pdev)
> +{
> + struct gab_platform_data *pdata;
> + struct device_node *np = pdev->dev.of_node;
> + const char *name;
> + u32 val;
> + int err;
> +
> + pdata = devm_kzalloc(>dev,
> + sizeof(struct gab_platform_data),
> + GFP_KERNEL);
> + if (!pdata)
> + return ERR_PTR(-ENOMEM);
> +
> + pdata->gpio_charge_finished  = of_get_gpio(np, 0);
> +
> + /* parse and fill power_supply_info struct */
> + err = of_property_read_u32(np, "technology", );
> + if (err) {
> + dev_info(>dev, "Battery technology unknown\n");
> + val = 0;
> + }
> + pdata->battery_info.technology = val;
> +
> + err = of_property_read_string(np, "battery-name", );
> + if (err) {
> + dev_info(>dev, "Battery name empty, setting default\n");
> + }
> + pdata->battery_info.name = name;
> +
> + val = 0;
> + err = of_property_read_u32(np, "charge_empty_design", );
> + pdata->battery_info.charge_empty_design = val;
> +
> + val = 0;
> + err = of_property_read_u32(np, "charge_full_design", );
> + pdata->battery_info.charge_full_design = val;
> +
> + val = 0;
> + err = of_property_read_u32(np, "voltage_min_design", );
> + pdata->battery_info.voltage_min_design = val;
> +
> + val = 0;
> + err = of_property_read_u32(np, "voltage_max-design", );
> + pdata->battery_info.voltage_max_design = val;
> +
> + return pdata;
> +}
> +
> +static const struct of_device_id of_gab_match[] = {
> + { .compatible = "linux,generic-adc-battery", },
> + {},
> +};
> +MODULE_DEVICE_TABLE(of, of_gab_match);
> +
> +#else
> +static struct gab_platform_data gab_dt_probe(struct platform_device *pdev)
> +{
> + ERR_PTR(-ENODEV);
> +}
> +#endif
> +
>  static int gab_probe(struct platform_device *pdev)
>  {
>   struct gab *adc_bat;
> @@ -258,6 +322,9 @@ static int gab_probe(struct platform_device *pdev)
>   return -ENOMEM;
>   }
>  
> + if (pdata == NULL)
> + pdata = gab_dt_probe(pdev);
> +
>   psy_cfg.drv_data = adc_bat;
>   psy_desc = _bat->psy_desc;
>   psy_desc->name = "generic-adc-batt";//pdata->battery_info.name;
> @@ -418,6 +485,7 @@ static struct platform_driver gab_driver = {
>   .driver = {
>   .name   = "generic-adc-battery",
>   .pm = _pm_ops,
> + .of_match_table = of_gab_match,
>   },
>   .probe  = gab_probe,
>   .remove = gab_remove,
> -- 
> 2.7.4
> 


signature.asc
Description: PGP signature

Re: [RFC PATCH 2/5] power: generic-adc-battery: Parse more properties from DT

[Belisko Marek]

Hi Pavel,

On Wed, Aug 2, 2017 at 1:56 PM, Pavel Machek  wrote:
> Hi!
>
>> +#ifdef CONFIG_OF
>> +static struct gab_platform_data *gab_dt_probe(struct platform_device *pdev)
>> +{
>> + struct gab_platform_data *pdata;
>> + struct device_node *np = pdev->dev.of_node;
>> + const char *name;
>> + u32 val;
>> + int err;
>> +
>> + pdata = devm_kzalloc(>dev,
>> + sizeof(struct gab_platform_data),
>> + GFP_KERNEL);
>> + if (!pdata)
>> + return ERR_PTR(-ENOMEM);
>> +
>> + pdata->gpio_charge_finished  = of_get_gpio(np, 0);
>> +
>> + /* parse and fill power_supply_info struct */
>> + err = of_property_read_u32(np, "technology", );
>> + if (err) {
>> + dev_info(>dev, "Battery technology unknown\n");
>> + val = 0;
>> + }
>> + pdata->battery_info.technology = val;
>> +
>> + err = of_property_read_string(np, "battery-name", );
>> + if (err) {
>> + dev_info(>dev, "Battery name empty, setting default\n");
>> + }
>> + pdata->battery_info.name = name;
>
> Actually ... looking at this once more. These are new properties,
> right?
>
> They'll need to be documented:
>
> pavel@duo:/data/l/linux$ grep -ri battery-name Documentation/devicetree/
>
> shows empty.
You're right. I'll add bindings documentation. Thanks.
> Pavel
> --
> (english) http://www.livejournal.com/~pavelmachek
> (cesky, pictures) 
> http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

BR,

marek

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

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

Re: [RFC PATCH 2/5] power: generic-adc-battery: Parse more properties from DT

[Belisko Marek]

Hi Pavel,

On Wed, Aug 2, 2017 at 1:56 PM, Pavel Machek  wrote:
> Hi!
>
>> +#ifdef CONFIG_OF
>> +static struct gab_platform_data *gab_dt_probe(struct platform_device *pdev)
>> +{
>> + struct gab_platform_data *pdata;
>> + struct device_node *np = pdev->dev.of_node;
>> + const char *name;
>> + u32 val;
>> + int err;
>> +
>> + pdata = devm_kzalloc(>dev,
>> + sizeof(struct gab_platform_data),
>> + GFP_KERNEL);
>> + if (!pdata)
>> + return ERR_PTR(-ENOMEM);
>> +
>> + pdata->gpio_charge_finished  = of_get_gpio(np, 0);
>> +
>> + /* parse and fill power_supply_info struct */
>> + err = of_property_read_u32(np, "technology", );
>> + if (err) {
>> + dev_info(>dev, "Battery technology unknown\n");
>> + val = 0;
>> + }
>> + pdata->battery_info.technology = val;
>> +
>> + err = of_property_read_string(np, "battery-name", );
>> + if (err) {
>> + dev_info(>dev, "Battery name empty, setting default\n");
>> + }
>> + pdata->battery_info.name = name;
>
> Actually ... looking at this once more. These are new properties,
> right?
>
> They'll need to be documented:
>
> pavel@duo:/data/l/linux$ grep -ri battery-name Documentation/devicetree/
>
> shows empty.
You're right. I'll add bindings documentation. Thanks.
> Pavel
> --
> (english) http://www.livejournal.com/~pavelmachek
> (cesky, pictures) 
> http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

BR,

marek

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

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

Re: [RFC PATCH 2/5] power: generic-adc-battery: Parse more properties from DT

[Pavel Machek]

Hi!

> +#ifdef CONFIG_OF
> +static struct gab_platform_data *gab_dt_probe(struct platform_device *pdev)
> +{
> + struct gab_platform_data *pdata;
> + struct device_node *np = pdev->dev.of_node;
> + const char *name;
> + u32 val;
> + int err;
> +
> + pdata = devm_kzalloc(>dev,
> + sizeof(struct gab_platform_data),
> + GFP_KERNEL);
> + if (!pdata)
> + return ERR_PTR(-ENOMEM);
> +
> + pdata->gpio_charge_finished  = of_get_gpio(np, 0);
> +
> + /* parse and fill power_supply_info struct */
> + err = of_property_read_u32(np, "technology", );
> + if (err) {
> + dev_info(>dev, "Battery technology unknown\n");
> + val = 0;
> + }
> + pdata->battery_info.technology = val;
> +
> + err = of_property_read_string(np, "battery-name", );
> + if (err) {
> + dev_info(>dev, "Battery name empty, setting default\n");
> + }
> + pdata->battery_info.name = name;

Actually ... looking at this once more. These are new properties,
right?

They'll need to be documented:

pavel@duo:/data/l/linux$ grep -ri battery-name Documentation/devicetree/

shows empty.
Pavel
-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) 
http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html


signature.asc
Description: Digital signature

Re: [RFC PATCH 2/5] power: generic-adc-battery: Parse more properties from DT

[Pavel Machek]

Hi!

> +#ifdef CONFIG_OF
> +static struct gab_platform_data *gab_dt_probe(struct platform_device *pdev)
> +{
> + struct gab_platform_data *pdata;
> + struct device_node *np = pdev->dev.of_node;
> + const char *name;
> + u32 val;
> + int err;
> +
> + pdata = devm_kzalloc(>dev,
> + sizeof(struct gab_platform_data),
> + GFP_KERNEL);
> + if (!pdata)
> + return ERR_PTR(-ENOMEM);
> +
> + pdata->gpio_charge_finished  = of_get_gpio(np, 0);
> +
> + /* parse and fill power_supply_info struct */
> + err = of_property_read_u32(np, "technology", );
> + if (err) {
> + dev_info(>dev, "Battery technology unknown\n");
> + val = 0;
> + }
> + pdata->battery_info.technology = val;
> +
> + err = of_property_read_string(np, "battery-name", );
> + if (err) {
> + dev_info(>dev, "Battery name empty, setting default\n");
> + }
> + pdata->battery_info.name = name;

Actually ... looking at this once more. These are new properties,
right?

They'll need to be documented:

pavel@duo:/data/l/linux$ grep -ri battery-name Documentation/devicetree/

shows empty.
Pavel
-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) 
http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html


signature.asc
Description: Digital signature

[RFC PATCH 2/5] power: generic-adc-battery: Parse more properties from DT

[Marek Belisko]

From: Marek Belisko 

Signed-off-by: Marek Belisko 
---
 drivers/power/supply/generic-adc-battery.c | 68 ++
 1 file changed, 68 insertions(+)

diff --git a/drivers/power/supply/generic-adc-battery.c 
b/drivers/power/supply/generic-adc-battery.c
index b5e9208..d4daa6a 100644
--- a/drivers/power/supply/generic-adc-battery.c
+++ b/drivers/power/supply/generic-adc-battery.c
@@ -23,6 +23,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #define JITTER_DEFAULT 10 /* hope 10ms is enough */
 
@@ -241,6 +242,69 @@ static irqreturn_t gab_charged(int irq, void *dev_id)
return IRQ_HANDLED;
 }
 
+#ifdef CONFIG_OF
+static struct gab_platform_data *gab_dt_probe(struct platform_device *pdev)
+{
+   struct gab_platform_data *pdata;
+   struct device_node *np = pdev->dev.of_node;
+   const char *name;
+   u32 val;
+   int err;
+
+   pdata = devm_kzalloc(>dev,
+   sizeof(struct gab_platform_data),
+   GFP_KERNEL);
+   if (!pdata)
+   return ERR_PTR(-ENOMEM);
+
+   pdata->gpio_charge_finished  = of_get_gpio(np, 0);
+
+   /* parse and fill power_supply_info struct */
+   err = of_property_read_u32(np, "technology", );
+   if (err) {
+   dev_info(>dev, "Battery technology unknown\n");
+   val = 0;
+   }
+   pdata->battery_info.technology = val;
+
+   err = of_property_read_string(np, "battery-name", );
+   if (err) {
+   dev_info(>dev, "Battery name empty, setting default\n");
+   }
+   pdata->battery_info.name = name;
+
+   val = 0;
+   err = of_property_read_u32(np, "charge_empty_design", );
+   pdata->battery_info.charge_empty_design = val;
+
+   val = 0;
+   err = of_property_read_u32(np, "charge_full_design", );
+   pdata->battery_info.charge_full_design = val;
+
+   val = 0;
+   err = of_property_read_u32(np, "voltage_min_design", );
+   pdata->battery_info.voltage_min_design = val;
+
+   val = 0;
+   err = of_property_read_u32(np, "voltage_max-design", );
+   pdata->battery_info.voltage_max_design = val;
+
+   return pdata;
+}
+
+static const struct of_device_id of_gab_match[] = {
+   { .compatible = "linux,generic-adc-battery", },
+   {},
+};
+MODULE_DEVICE_TABLE(of, of_gab_match);
+
+#else
+static struct gab_platform_data gab_dt_probe(struct platform_device *pdev)
+{
+   ERR_PTR(-ENODEV);
+}
+#endif
+
 static int gab_probe(struct platform_device *pdev)
 {
struct gab *adc_bat;
@@ -258,6 +322,9 @@ static int gab_probe(struct platform_device *pdev)
return -ENOMEM;
}
 
+   if (pdata == NULL)
+   pdata = gab_dt_probe(pdev);
+
psy_cfg.drv_data = adc_bat;
psy_desc = _bat->psy_desc;
psy_desc->name = "generic-adc-batt";//pdata->battery_info.name;
@@ -418,6 +485,7 @@ static struct platform_driver gab_driver = {
.driver = {
.name   = "generic-adc-battery",
.pm = _pm_ops,
+   .of_match_table = of_gab_match,
},
.probe  = gab_probe,
.remove = gab_remove,
-- 
2.7.4

[RFC PATCH 2/5] power: generic-adc-battery: Parse more properties from DT

[Marek Belisko]

From: Marek Belisko 

Signed-off-by: Marek Belisko 
---
 drivers/power/supply/generic-adc-battery.c | 68 ++
 1 file changed, 68 insertions(+)

diff --git a/drivers/power/supply/generic-adc-battery.c 
b/drivers/power/supply/generic-adc-battery.c
index b5e9208..d4daa6a 100644
--- a/drivers/power/supply/generic-adc-battery.c
+++ b/drivers/power/supply/generic-adc-battery.c
@@ -23,6 +23,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #define JITTER_DEFAULT 10 /* hope 10ms is enough */
 
@@ -241,6 +242,69 @@ static irqreturn_t gab_charged(int irq, void *dev_id)
return IRQ_HANDLED;
 }
 
+#ifdef CONFIG_OF
+static struct gab_platform_data *gab_dt_probe(struct platform_device *pdev)
+{
+   struct gab_platform_data *pdata;
+   struct device_node *np = pdev->dev.of_node;
+   const char *name;
+   u32 val;
+   int err;
+
+   pdata = devm_kzalloc(>dev,
+   sizeof(struct gab_platform_data),
+   GFP_KERNEL);
+   if (!pdata)
+   return ERR_PTR(-ENOMEM);
+
+   pdata->gpio_charge_finished  = of_get_gpio(np, 0);
+
+   /* parse and fill power_supply_info struct */
+   err = of_property_read_u32(np, "technology", );
+   if (err) {
+   dev_info(>dev, "Battery technology unknown\n");
+   val = 0;
+   }
+   pdata->battery_info.technology = val;
+
+   err = of_property_read_string(np, "battery-name", );
+   if (err) {
+   dev_info(>dev, "Battery name empty, setting default\n");
+   }
+   pdata->battery_info.name = name;
+
+   val = 0;
+   err = of_property_read_u32(np, "charge_empty_design", );
+   pdata->battery_info.charge_empty_design = val;
+
+   val = 0;
+   err = of_property_read_u32(np, "charge_full_design", );
+   pdata->battery_info.charge_full_design = val;
+
+   val = 0;
+   err = of_property_read_u32(np, "voltage_min_design", );
+   pdata->battery_info.voltage_min_design = val;
+
+   val = 0;
+   err = of_property_read_u32(np, "voltage_max-design", );
+   pdata->battery_info.voltage_max_design = val;
+
+   return pdata;
+}
+
+static const struct of_device_id of_gab_match[] = {
+   { .compatible = "linux,generic-adc-battery", },
+   {},
+};
+MODULE_DEVICE_TABLE(of, of_gab_match);
+
+#else
+static struct gab_platform_data gab_dt_probe(struct platform_device *pdev)
+{
+   ERR_PTR(-ENODEV);
+}
+#endif
+
 static int gab_probe(struct platform_device *pdev)
 {
struct gab *adc_bat;
@@ -258,6 +322,9 @@ static int gab_probe(struct platform_device *pdev)
return -ENOMEM;
}
 
+   if (pdata == NULL)
+   pdata = gab_dt_probe(pdev);
+
psy_cfg.drv_data = adc_bat;
psy_desc = _bat->psy_desc;
psy_desc->name = "generic-adc-batt";//pdata->battery_info.name;
@@ -418,6 +485,7 @@ static struct platform_driver gab_driver = {
.driver = {
.name   = "generic-adc-battery",
.pm = _pm_ops,
+   .of_match_table = of_gab_match,
},
.probe  = gab_probe,
.remove = gab_remove,
-- 
2.7.4