diff options
Diffstat (limited to '0003-power-supply-core-Add-support-for-supplied-from-devi.patch')
| -rw-r--r-- | 0003-power-supply-core-Add-support-for-supplied-from-devi.patch | 57 |
1 files changed, 0 insertions, 57 deletions
diff --git a/0003-power-supply-core-Add-support-for-supplied-from-devi.patch b/0003-power-supply-core-Add-support-for-supplied-from-devi.patch deleted file mode 100644 index ab646e2e5..000000000 --- a/0003-power-supply-core-Add-support-for-supplied-from-devi.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 69dd0606a0d8680fe0a5e9b959f6662e582e1674 Mon Sep 17 00:00:00 2001 -From: Hans de Goede <hdegoede@redhat.com> -Date: Tue, 2 May 2017 13:43:34 +0200 -Subject: [PATCH 03/16] power: supply: core: Add support for supplied-from - device-property - -On devicetree using platforms the devicetree can provide info on which -power-supplies supply another power-supply through phandles. - -This commit adds support for providing this info on non devicetree -platforms through the platform code setting a supplied-from -device-property on the power-supplies parent device. - -Signed-off-by: Hans de Goede <hdegoede@redhat.com> ---- - drivers/power/supply/power_supply_core.c | 24 +++++++++++++++++++++++- - 1 file changed, 23 insertions(+), 1 deletion(-) - -diff --git a/drivers/power/supply/power_supply_core.c b/drivers/power/supply/power_supply_core.c -index 7ec7c7c202bd..0c09144193a6 100644 ---- a/drivers/power/supply/power_supply_core.c -+++ b/drivers/power/supply/power_supply_core.c -@@ -274,8 +274,30 @@ static int power_supply_check_supplies(struct power_supply *psy) - return power_supply_populate_supplied_from(psy); - } - #else --static inline int power_supply_check_supplies(struct power_supply *psy) -+static int power_supply_check_supplies(struct power_supply *psy) - { -+ int nval, ret; -+ -+ if (!psy->dev.parent) -+ return 0; -+ -+ nval = device_property_read_string_array(psy->dev.parent, -+ "supplied-from", NULL, 0); -+ if (nval <= 0) -+ return 0; -+ -+ psy->supplied_from = devm_kmalloc_array(&psy->dev, nval, -+ sizeof(char *), GFP_KERNEL); -+ if (!psy->supplied_from) -+ return -ENOMEM; -+ -+ ret = device_property_read_string_array(psy->dev.parent, -+ "supplied-from", (const char **)psy->supplied_from, nval); -+ if (ret < 0) -+ return ret; -+ -+ psy->num_supplies = nval; -+ - return 0; - } - #endif --- -2.13.0 - |