@@ -215,7 +215,8 @@ static int berlin_pinctrl_build_state(struct platform_device *pdev)
}
/* we will reallocate later */
- pctrl->functions = kzalloc_objs(*pctrl->functions, max_functions);
+ pctrl->functions = devm_kcalloc(&pdev->dev, max_functions,
+ sizeof(*pctrl->functions), GFP_KERNEL);
if (!pctrl->functions)
return -ENOMEM;
@@ -230,13 +231,11 @@ static int berlin_pinctrl_build_state(struct platform_device *pdev)
}
}
- new_functions = krealloc(pctrl->functions,
- pctrl->nfunctions * sizeof(*pctrl->functions),
- GFP_KERNEL);
- if (!new_functions) {
- kfree(pctrl->functions);
+ new_functions = devm_krealloc(&pdev->dev, pctrl->functions,
+ pctrl->nfunctions * sizeof(*pctrl->functions),
+ GFP_KERNEL);
+ if (!new_functions)
return -ENOMEM;
- }
pctrl->functions = new_functions;
/* map functions to theirs groups */
@@ -257,10 +256,8 @@ static int berlin_pinctrl_build_state(struct platform_device *pdev)
function++;
}
- if (!found) {
- kfree(pctrl->functions);
+ if (!found)
return -EINVAL;
- }
if (!function->groups) {
function->groups =
@@ -268,10 +265,9 @@ static int berlin_pinctrl_build_state(struct platform_device *pdev)
function->ngroups,
sizeof(*function->groups),
GFP_KERNEL);
- if (!function->groups) {
- kfree(pctrl->functions);
+
+ if (!function->groups)
return -ENOMEM;
- }
}
groups = (const char **)function->groups;
@@ -327,6 +323,7 @@ int berlin_pinctrl_probe_regmap(struct platform_device *pdev,
return 0;
}
+EXPORT_SYMBOL_GPL(berlin_pinctrl_probe_regmap);
int berlin_pinctrl_probe(struct platform_device *pdev,
const struct berlin_pinctrl_desc *desc)
@@ -341,3 +338,7 @@ int berlin_pinctrl_probe(struct platform_device *pdev,
return berlin_pinctrl_probe_regmap(pdev, desc, regmap);
}
+EXPORT_SYMBOL_GPL(berlin_pinctrl_probe);
+
+MODULE_LICENSE("GPL v2");
+MODULE_DESCRIPTION("pinctrl library for Synaptics SoCs");
@@ -20,6 +20,8 @@ struct berlin_desc_group {
u16 offset;
u8 bit_width;
u8 lsb;
+ u16 conf_offset;
+ u8 conf_bits;
struct berlin_desc_function *functions;
};
@@ -28,6 +30,19 @@ struct berlin_pinctrl_desc {
unsigned ngroups;
};
+#define BERLIN_PINCTRLCONF_GROUP(_name, _offset, _width, _lsb, \
+ _conf_offset, _conf_bits, ...) \
+ { \
+ .name = _name, \
+ .offset = _offset, \
+ .bit_width = _width, \
+ .lsb = _lsb, \
+ .conf_offset = _conf_offset, \
+ .conf_bits = _conf_bits, \
+ .functions = (struct berlin_desc_function[]){ \
+ __VA_ARGS__, { } }, \
+ }
+
#define BERLIN_PINCTRL_GROUP(_name, _offset, _width, _lsb, ...) \
{ \
.name = _name, \
For Android GKI + vendor_dlkm deployments, where vendor-specific drivers must be kept separate from the GKI vmlinux and loaded as modules from the vendor partition, we need to enable module build support for berlin pinctrl drivers. To acchive this goal: 1.Use devm_* APIs to alloc memory, so that we don't need to care free when unloading. 2.Export two symbols which will be used by SoC pinctrl drivers. 3.Add MODULE_LICENSE and MODULE_DESCRIPTION Signed-off-by: Jisheng Zhang <jszhang@kernel.org> --- drivers/pinctrl/berlin/berlin.c | 27 ++++++++++++++------------- drivers/pinctrl/berlin/berlin.h | 15 +++++++++++++++ 2 files changed, 29 insertions(+), 13 deletions(-)