| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <9e2fe4a3-05b0-1382-2932-151231ccecd3@lapa.com.au>
Date: Sun, 19 Jun 2016 23:52:27 +1000
From: Chris Lapa <chris@...a.com.au>
To: Krzysztof Kozlowski <k.kozlowski@...sung.com>, dwmw2@...radead.org,
dbaryshkov@...il.com, sre@...nel.org, mark.rutland@....com,
robh+dt@...nel.org
Cc: devicetree@...r.kernel.org, linux-kernel@...r.kernel.org,
linux-pm@...r.kernel.org
Subject: Re: [PATCH v3 7/7] max8903: adds support for initiation via device
tree.
On 17/06/2016 4:41 PM, Krzysztof Kozlowski wrote:
> On 06/17/2016 07:00 AM, Chris Lapa wrote:
>> From: Chris Lapa <chris@...a.com.au>
>>
>> Adds support for device tree to setup a max8903 battery charger. DC and USB
>> validity are determined by looking the presence of the dok and uok gpios.
>>
>> Signed-off-by: Chris Lapa <chris@...a.com.au>
>> ---
>> drivers/power/max8903_charger.c | 217 +++++++++++++++++++++++++++-------------
>> 1 file changed, 145 insertions(+), 72 deletions(-)
>>
>> diff --git a/drivers/power/max8903_charger.c b/drivers/power/max8903_charger.c
>> index 5ddc667..3c59213 100644
>> --- a/drivers/power/max8903_charger.c
>> +++ b/drivers/power/max8903_charger.c
>> @@ -23,6 +23,9 @@
>> #include <linux/gpio.h>
>> #include <linux/interrupt.h>
>> #include <linux/module.h>
>> +#include <linux/of.h>
>> +#include <linux/of_device.h>
>> +#include <linux/of_gpio.h>
>> #include <linux/slab.h>
>> #include <linux/power_supply.h>
>> #include <linux/platform_device.h>
>> @@ -75,6 +78,7 @@ static int max8903_get_property(struct power_supply *psy,
>> default:
>> return -EINVAL;
>> }
>> +
>> return 0;
>> }
>>
>> @@ -179,48 +183,116 @@ static irqreturn_t max8903_fault(int irq, void *_data)
>> return IRQ_HANDLED;
>> }
>>
>> +static struct max8903_pdata *max8903_parse_dt_data(
>> + struct device *dev)
>> +{
>> + struct device_node *of_node = dev->of_node;
>
> Common naming convention for device_node is just 'np':
> struct device_node *np = dev->of_node;
>
> It is shorter and already spread in the kernel.
>
>> + struct max8903_pdata *pdata = NULL;
>> +
>> + if (!of_node)
>> + return NULL;
>> +
>> + pdata = devm_kzalloc(dev, sizeof(*pdata),
>> + GFP_KERNEL);
>
> No need to break the line.
>
>> + if (!pdata)
>> + return NULL;
>> +
>> + pdata->dc_valid = false;
>> + pdata->usb_valid = false;
>> +
>> + pdata->cen = of_get_named_gpio(of_node, "cen-gpios", 0);
>> + if (!gpio_is_valid(pdata->cen))
>> + pdata->cen = -EINVAL;
>> +
>> + pdata->chg = of_get_named_gpio(of_node, "chg-gpios", 0);
>> + if (!gpio_is_valid(pdata->chg))
>> + pdata->chg = -EINVAL;
>> +
>> + pdata->flt = of_get_named_gpio(of_node, "flt-gpios", 0);
>> + if (!gpio_is_valid(pdata->flt))
>> + pdata->flt = -EINVAL;
>> +
>> + pdata->usus = of_get_named_gpio(of_node, "usus-gpios", 0);
>> + if (!gpio_is_valid(pdata->usus))
>> + pdata->usus = -EINVAL;
>> +
>> + pdata->dcm = of_get_named_gpio(of_node, "dcm-gpios", 0);
>> + if (!gpio_is_valid(pdata->dcm))
>> + pdata->dcm = -EINVAL;
>> +
>> + pdata->dok = of_get_named_gpio(of_node, "dok-gpios", 0);
>> + if (!gpio_is_valid(pdata->dok))
>> + pdata->dok = -EINVAL;
>> + else
>> + pdata->dc_valid = true;
>> +
>> + pdata->uok = of_get_named_gpio(of_node, "uok-gpios", 0);
>> + if (!gpio_is_valid(pdata->uok))
>> + pdata->uok = -EINVAL;
>> + else
>> + pdata->usb_valid = true;
>> +
>> + return pdata;
>> +}
>> +
>> static int max8903_probe(struct platform_device *pdev)
>> {
>> - struct max8903_data *data;
>> + struct max8903_data *charger;
>> struct device *dev = &pdev->dev;
>> - struct max8903_pdata *pdata = pdev->dev.platform_data;
>> struct power_supply_config psy_cfg = {};
>> int ret = 0;
>> int gpio;
>> int ta_in = 0;
>> int usb_in = 0;
>>
>> - if (pdata == NULL) {
>> + charger = devm_kzalloc(dev, sizeof(struct max8903_data), GFP_KERNEL);
>> + if (!charger)
>> + return -ENOMEM;
>> +
>> + charger->pdata = pdev->dev.platform_data;
>> + if (IS_ENABLED(CONFIG_OF) && !charger->pdata && dev->of_node)
>> + charger->pdata = max8903_parse_dt_data(dev);
>> +
>> + if (!charger->pdata) {
>> dev_err(dev, "No platform data.\n");
>> return -EINVAL;
>> }
>>
>> - data = devm_kzalloc(dev, sizeof(struct max8903_data), GFP_KERNEL);
>> - if (!data)
>> - return -ENOMEM;
>> + charger->dev = dev;
>>
>> - data->pdata = pdev->dev.platform_data;
>> - data->dev = dev;
>> - platform_set_drvdata(pdev, data);
>> + charger->fault = false;
>> + charger->ta_in = ta_in;
>> + charger->usb_in = usb_in;
>>
>> - if (pdata->dc_valid == false && pdata->usb_valid == false) {
>> + charger->psy_desc.name = "max8903_charger";
>> + charger->psy_desc.type = (ta_in) ? POWER_SUPPLY_TYPE_MAINS :
>> + ((usb_in) ? POWER_SUPPLY_TYPE_USB :
>> + POWER_SUPPLY_TYPE_BATTERY);
>> + charger->psy_desc.get_property = max8903_get_property;
>> + charger->psy_desc.properties = max8903_charger_props;
>> + charger->psy_desc.num_properties = ARRAY_SIZE(max8903_charger_props);
>> +
>> + platform_set_drvdata(pdev, charger);
>> +
>> + if (charger->pdata->dc_valid == false && charger->pdata->usb_valid == false) {
>> dev_err(dev, "No valid power sources.\n");
>> return -EINVAL;
>> }
>>
>> - if (pdata->dc_valid) {
>> - if (gpio_is_valid(pdata->dok)) {
>> +
>> + if (charger->pdata->dc_valid) {
>> + if (gpio_is_valid(charger->pdata->dok)) {
>> ret = devm_gpio_request(dev,
>> - pdata->dok,
>> - data->psy_desc.name);
>> + charger->pdata->dok,
>> + charger->psy_desc.name);
>> if (ret) {
>> dev_err(dev,
>> "Failed GPIO request for dok: %d err %d\n",
>> - pdata->dok, ret);
>> + charger->pdata->dok, ret);
>
>
> I pointed the weird indentation in 4/7. Just a reminder: after fixing it
> in 4/7 you also have to adjust it in consecutive patches.
>
> Best regards,
> Krzysztof
>
Fixed in v4. Will send later once I have a chance to test on the hardware.
Thanks,
Chris
Powered by blists - more mailing lists