| Message ID | 1647359413-31662-1-git-send-email-quic_srivasam@quicinc.com |
|---|---|
| Headers | show |
| Series | Add pin control support for lpass sc7280 | expand |
On 3/15/2022 10:15 PM, Bjorn Andersson wrote: Thanks for your time Bjorn!!! > On Tue 15 Mar 10:50 CDT 2022, Srinivasa Rao Mandadapu wrote: > >> Update custom pin group structure members with framework generic group_desc structure >> and replace the driver's custom pinctrl_ops with framework provided generic pin control >> group functions to avoid redundant code written in lpass lpi driver. >> >> Signed-off-by: Srinivasa Rao Mandadapu <quic_srivasam@quicinc.com> >> Co-developed-by: Venkata Prasad Potturu <quic_potturu@quicinc.com> >> Signed-off-by: Venkata Prasad Potturu <quic_potturu@quicinc.com> >> --- >> drivers/pinctrl/qcom/Kconfig | 1 + >> drivers/pinctrl/qcom/pinctrl-lpass-lpi.c | 98 +++++++++++++++----------------- >> 2 files changed, 48 insertions(+), 51 deletions(-) >> >> diff --git a/drivers/pinctrl/qcom/Kconfig b/drivers/pinctrl/qcom/Kconfig >> index ca6f68a..31c4aa6 100644 >> --- a/drivers/pinctrl/qcom/Kconfig >> +++ b/drivers/pinctrl/qcom/Kconfig >> @@ -351,6 +351,7 @@ config PINCTRL_LPASS_LPI >> select PINMUX >> select PINCONF >> select GENERIC_PINCONF >> + select GENERIC_PINCTRL_GROUPS >> depends on GPIOLIB >> help >> This is the pinctrl, pinmux, pinconf and gpiolib driver for the >> diff --git a/drivers/pinctrl/qcom/pinctrl-lpass-lpi.c b/drivers/pinctrl/qcom/pinctrl-lpass-lpi.c >> index 3c15f80..5e27a38 100644 >> --- a/drivers/pinctrl/qcom/pinctrl-lpass-lpi.c >> +++ b/drivers/pinctrl/qcom/pinctrl-lpass-lpi.c >> @@ -51,11 +51,11 @@ >> >> #define LPI_PINGROUP(id, soff, f1, f2, f3, f4) \ >> { \ >> - .name = "gpio" #id, \ >> - .pins = gpio##id##_pins, \ >> + .group.name = "gpio" #id, \ >> + .group.pins = gpio##id##_pins, \ >> .pin = id, \ >> .slew_offset = soff, \ >> - .npins = ARRAY_SIZE(gpio##id##_pins), \ >> + .group.num_pins = ARRAY_SIZE(gpio##id##_pins), \ >> .funcs = (int[]){ \ >> LPI_MUX_gpio, \ >> LPI_MUX_##f1, \ >> @@ -67,9 +67,7 @@ >> } >> >> struct lpi_pingroup { >> - const char *name; >> - const unsigned int *pins; >> - unsigned int npins; >> + struct group_desc group; >> unsigned int pin; >> /* Bit offset in slew register for SoundWire pins only */ >> int slew_offset; >> @@ -150,20 +148,20 @@ enum sm8250_lpi_functions { >> LPI_MUX__, >> }; >> >> -static const unsigned int gpio0_pins[] = { 0 }; >> -static const unsigned int gpio1_pins[] = { 1 }; >> -static const unsigned int gpio2_pins[] = { 2 }; >> -static const unsigned int gpio3_pins[] = { 3 }; >> -static const unsigned int gpio4_pins[] = { 4 }; >> -static const unsigned int gpio5_pins[] = { 5 }; >> -static const unsigned int gpio6_pins[] = { 6 }; >> -static const unsigned int gpio7_pins[] = { 7 }; >> -static const unsigned int gpio8_pins[] = { 8 }; >> -static const unsigned int gpio9_pins[] = { 9 }; >> -static const unsigned int gpio10_pins[] = { 10 }; >> -static const unsigned int gpio11_pins[] = { 11 }; >> -static const unsigned int gpio12_pins[] = { 12 }; >> -static const unsigned int gpio13_pins[] = { 13 }; >> +static int gpio0_pins[] = { 0 }; >> +static int gpio1_pins[] = { 1 }; >> +static int gpio2_pins[] = { 2 }; >> +static int gpio3_pins[] = { 3 }; >> +static int gpio4_pins[] = { 4 }; >> +static int gpio5_pins[] = { 5 }; >> +static int gpio6_pins[] = { 6 }; >> +static int gpio7_pins[] = { 7 }; >> +static int gpio8_pins[] = { 8 }; >> +static int gpio9_pins[] = { 9 }; >> +static int gpio10_pins[] = { 10 }; >> +static int gpio11_pins[] = { 11 }; >> +static int gpio12_pins[] = { 12 }; >> +static int gpio13_pins[] = { 13 }; >> static const char * const swr_tx_clk_groups[] = { "gpio0" }; >> static const char * const swr_tx_data_groups[] = { "gpio1", "gpio2", "gpio5" }; >> static const char * const swr_rx_clk_groups[] = { "gpio3" }; >> @@ -250,38 +248,10 @@ static int lpi_gpio_write(struct lpi_pinctrl *state, unsigned int pin, >> return 0; >> } >> >> -static int lpi_gpio_get_groups_count(struct pinctrl_dev *pctldev) >> -{ >> - struct lpi_pinctrl *pctrl = pinctrl_dev_get_drvdata(pctldev); >> - >> - return pctrl->data->ngroups; >> -} >> - >> -static const char *lpi_gpio_get_group_name(struct pinctrl_dev *pctldev, >> - unsigned int group) >> -{ >> - struct lpi_pinctrl *pctrl = pinctrl_dev_get_drvdata(pctldev); >> - >> - return pctrl->data->groups[group].name; >> -} >> - >> -static int lpi_gpio_get_group_pins(struct pinctrl_dev *pctldev, >> - unsigned int group, >> - const unsigned int **pins, >> - unsigned int *num_pins) >> -{ >> - struct lpi_pinctrl *pctrl = pinctrl_dev_get_drvdata(pctldev); >> - >> - *pins = pctrl->data->groups[group].pins; >> - *num_pins = pctrl->data->groups[group].npins; >> - >> - return 0; >> -} >> - >> static const struct pinctrl_ops lpi_gpio_pinctrl_ops = { >> - .get_groups_count = lpi_gpio_get_groups_count, >> - .get_group_name = lpi_gpio_get_group_name, >> - .get_group_pins = lpi_gpio_get_group_pins, >> + .get_groups_count = pinctrl_generic_get_group_count, >> + .get_group_name = pinctrl_generic_get_group_name, >> + .get_group_pins = pinctrl_generic_get_group_pins, >> .dt_node_to_map = pinconf_generic_dt_node_to_map_group, >> .dt_free_map = pinctrl_utils_free_map, >> }; >> @@ -582,6 +552,28 @@ static const struct gpio_chip lpi_gpio_template = { >> .dbg_show = lpi_gpio_dbg_show, >> }; >> >> +static int lpi_build_pin_desc_groups(struct lpi_pinctrl *pctrl) >> +{ >> + struct group_desc *lpi_groups; >> + int i; >> + >> + lpi_groups = devm_kcalloc(pctrl->dev, pctrl->data->npins, >> + sizeof(*lpi_groups), GFP_KERNEL); >> + if (!lpi_groups) >> + return -ENOMEM; >> + >> + for (i = 0; i < pctrl->data->npins; i++) { >> + const struct pinctrl_pin_desc *pin_info = pctrl->desc.pins + i; >> + struct group_desc *group = lpi_groups + i; >> + >> + group->name = pin_info->name; >> + group->pins = (int *)&pin_info->number; >> + pinctrl_generic_add_group(pctrl->ctrl, group->name, group->pins, 1, NULL); > I've not used this generic interface before, but I believe you need to > pair your add with pinctrl_generic_remove_group(), both in error paths > and driver remove. Okay. Will add pinctrl_generic_remove_group() accordingly. > > Makes me wonder about the usefulness of this, as you will end up with > a bit more code than you remove and you have the additional heap > allocation. Feels like I'm missing something... Here Heap allocation can be avoided. will do accordingly and re post. > >> + } >> + >> + return 0; >> +} >> + >> static int lpi_pinctrl_probe(struct platform_device *pdev) >> { >> const struct lpi_pinctrl_variant_data *data; >> @@ -647,6 +639,10 @@ static int lpi_pinctrl_probe(struct platform_device *pdev) >> goto err_pinctrl; >> } >> >> + ret = lpi_build_pin_desc_groups(pctrl); >> + if (ret) >> + return ret; > A few lines up the code does error handling by goto err_pinctrl, you > should do the same. Okay. will update accordingly. > > Regards, > Bjorn > >> + >> ret = devm_gpiochip_add_data(dev, &pctrl->chip, pctrl); >> if (ret) { >> dev_err(pctrl->dev, "can't add gpio chip\n"); >> -- >> 2.7.4 >>
This patch series is to split lpass variant common pin control functions and SoC specific functions and to add lpass sc7280 pincontrol support. It also Adds dt-bindings for lpass sc7280 lpass lpi pincontrol. Changes Since V10: -- Modify driver's custom functions with pin control framework generic functions. -- Update sm8250 and sc7280 pin control depedency list in Kconfig. -- Update commit description of few patches. Changes Since V9: -- Add pinctrl groups macro to Kconfig. Changes Since V8: -- Remove redundant headers included in v8. Changes Since V7: -- Update optional clock voting with conditional check. -- Add const to lpi_pinctrl_variant_data structure. -- Update required headers and remove redundant. -- Change EXPORT_SYMBOL to EXPORT_SYMBOL_GPL -- Fix typo errors. Changes Since V6: -- Update conditional clock voting to optional clock voting. -- Update Kconfig depends on field with select. -- Fix typo errors. Changes Since V5: -- Create new patch by updating macro name to lpi specific. -- Create new patch by updating lpi pin group structure with core group_desc structure. -- Fix typo errors. -- Sort macros in the make file and configuration file. Changes Since V4: -- Update commit message and description of the chip specific extraction patch. -- Sort macros in kconfig and makefile. -- Update optional clock voting to conditional clock voting. -- Fix typo errors. -- Move to quicinc domain email id's. Changes Since V3: -- Update separate Kconfig fields for sm8250 and sc7280. -- Update module license and description. -- Move static variables to corresponding .c files from header file. Changes Since V2: -- Add new dt-bindings for sc7280 lpi driver. -- Make clock voting change as separate patch. -- Split existing pincontrol driver and make common functions as part of separate file. -- Rename lpass pincontrol lpi dt-bindings to sm8250 specific dt-bindings Changes Since V1: -- Make lpi pinctrl variant data structure as constant -- Add appropriate commit message -- Change signedoff by sequence. Srinivasa Rao Mandadapu (7): dt-bindings: pinctrl: qcom: Update lpass lpi file name to SoC specific dt-bindings: pinctrl: qcom: Add sc7280 lpass lpi pinctrl bindings pinctrl: qcom: Update macro name to LPI specific pinctrl: qcom: Update lpi pin group custiom functions with framework generic functions pinctrl: qcom: Extract chip specific LPASS LPI code pinctrl: qcom: Add SC7280 lpass pin configuration pinctrl: qcom: Update clock voting as optional Tested this on SM8250 MTP with WSA and WCD codecs. Tested-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> .../bindings/pinctrl/qcom,lpass-lpi-pinctrl.yaml | 133 --------- .../pinctrl/qcom,sc7280-lpass-lpi-pinctrl.yaml | 115 ++++++++ .../pinctrl/qcom,sm8250-lpass-lpi-pinctrl.yaml | 133 +++++++++ drivers/pinctrl/qcom/Kconfig | 19 ++ drivers/pinctrl/qcom/Makefile | 2 + drivers/pinctrl/qcom/pinctrl-lpass-lpi.c | 309 +++------------------ drivers/pinctrl/qcom/pinctrl-lpass-lpi.h | 86 ++++++ drivers/pinctrl/qcom/pinctrl-sc7280-lpass-lpi.c | 168 +++++++++++ drivers/pinctrl/qcom/pinctrl-sm8250-lpass-lpi.c | 164 +++++++++++ 9 files changed, 731 insertions(+), 398 deletions(-) delete mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,lpass-lpi-pinctrl.yaml create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,sc7280-lpass-lpi-pinctrl.yaml create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,sm8250-lpass-lpi-pinctrl.yaml create mode 100644 drivers/pinctrl/qcom/pinctrl-lpass-lpi.h create mode 100644 drivers/pinctrl/qcom/pinctrl-sc7280-lpass-lpi.c create mode 100644 drivers/pinctrl/qcom/pinctrl-sm8250-lpass-lpi.c