| Message ID | 20230908055146.18347-2-Linhua.xu@unisoc.com |
|---|---|
| State | New |
| Headers | show |
| Series | pinctrl: sprd: Modification of UNIOC Platform pinctrl Driver | expand |
On Fri, Sep 08, 2023 at 01:51:41PM +0800, Linhua Xu wrote: > From: Linhua Xu <Linhua.Xu@unisoc.com> > > For UNISOC pin controller, the offset values of the common register and > misc register will be different. Thus put these in the probe function > parameters. ... > +#define PINCTRL_REG_OFFSET 0x20 0x0020 to make it look as related to the other one, as they are of the same type: register offsets. > +#define PINCTRL_REG_MISC_OFFSET 0x4020
On 9/8/2023 1:51 PM, Linhua Xu wrote: > From: Linhua Xu <Linhua.Xu@unisoc.com> > > For UNISOC pin controller, the offset values of the common register and > misc register will be different. Thus put these in the probe function > parameters. > > Signed-off-by: Linhua Xu <Linhua.Xu@unisoc.com> > --- > drivers/pinctrl/sprd/pinctrl-sprd-sc9860.c | 7 +++++- > drivers/pinctrl/sprd/pinctrl-sprd.c | 27 +++++++++++++--------- > drivers/pinctrl/sprd/pinctrl-sprd.h | 3 ++- > 3 files changed, 24 insertions(+), 13 deletions(-) > > diff --git a/drivers/pinctrl/sprd/pinctrl-sprd-sc9860.c b/drivers/pinctrl/sprd/pinctrl-sprd-sc9860.c > index d14f382f2392..05158c71ad77 100644 > --- a/drivers/pinctrl/sprd/pinctrl-sprd-sc9860.c > +++ b/drivers/pinctrl/sprd/pinctrl-sprd-sc9860.c > @@ -10,6 +10,9 @@ > > #include "pinctrl-sprd.h" > > +#define PINCTRL_REG_OFFSET 0x20 > +#define PINCTRL_REG_MISC_OFFSET 0x4020 > + > enum sprd_sc9860_pins { > /* pin global control register 0 */ > SC9860_VIO28_0_IRTE = SPRD_PIN_INFO(0, GLOBAL_CTRL_PIN, 11, 1, 0), > @@ -926,7 +929,9 @@ static struct sprd_pins_info sprd_sc9860_pins_info[] = { > static int sprd_pinctrl_probe(struct platform_device *pdev) > { > return sprd_pinctrl_core_probe(pdev, sprd_sc9860_pins_info, > - ARRAY_SIZE(sprd_sc9860_pins_info)); > + ARRAY_SIZE(sprd_sc9860_pins_info), > + PINCTRL_REG_OFFSET, > + PINCTRL_REG_MISC_OFFSET); > } > > static const struct of_device_id sprd_pinctrl_of_match[] = { > diff --git a/drivers/pinctrl/sprd/pinctrl-sprd.c b/drivers/pinctrl/sprd/pinctrl-sprd.c > index ca9659f4e4b1..25fb9ce9ad78 100644 > --- a/drivers/pinctrl/sprd/pinctrl-sprd.c > +++ b/drivers/pinctrl/sprd/pinctrl-sprd.c > @@ -30,8 +30,6 @@ > #include "pinctrl-sprd.h" > > #define PINCTRL_BIT_MASK(width) (~(~0UL << (width))) > -#define PINCTRL_REG_OFFSET 0x20 > -#define PINCTRL_REG_MISC_OFFSET 0x4020 > #define PINCTRL_REG_LEN 0x4 > > #define PIN_FUNC_MASK (BIT(4) | BIT(5)) > @@ -148,12 +146,16 @@ struct sprd_pinctrl_soc_info { > * @pctl: pointer to the pinctrl handle > * @base: base address of the controller > * @info: pointer to SoC's pins description information > + * @common_pin_offset: offset value of common register > + * @misc_pin_offset: offset value of misc register > */ > struct sprd_pinctrl { > struct device *dev; > struct pinctrl_dev *pctl; > void __iomem *base; > struct sprd_pinctrl_soc_info *info; > + u32 common_pin_offset; > + u32 misc_pin_offset; > }; > > #define SPRD_PIN_CONFIG_CONTROL (PIN_CONFIG_END + 1) > @@ -1023,12 +1025,12 @@ static int sprd_pinctrl_add_pins(struct sprd_pinctrl *sprd_pctl, > ctrl_pin++; > } else if (pin->type == COMMON_PIN) { > pin->reg = (unsigned long)sprd_pctl->base + > - PINCTRL_REG_OFFSET + PINCTRL_REG_LEN * > + sprd_pctl->common_pin_offset + PINCTRL_REG_LEN * > (i - ctrl_pin); > com_pin++; > } else if (pin->type == MISC_PIN) { > pin->reg = (unsigned long)sprd_pctl->base + > - PINCTRL_REG_MISC_OFFSET + PINCTRL_REG_LEN * > + sprd_pctl->misc_pin_offset + PINCTRL_REG_LEN * > (i - ctrl_pin - com_pin); > } > } > @@ -1045,7 +1047,9 @@ static int sprd_pinctrl_add_pins(struct sprd_pinctrl *sprd_pctl, > > int sprd_pinctrl_core_probe(struct platform_device *pdev, > struct sprd_pins_info *sprd_soc_pin_info, > - int pins_cnt) > + int pins_cnt, > + u32 common_pin_offset, > + u32 misc_pin_offset) > { > struct sprd_pinctrl *sprd_pctl; > struct sprd_pinctrl_soc_info *pinctrl_info; > @@ -1069,6 +1073,8 @@ int sprd_pinctrl_core_probe(struct platform_device *pdev, > > sprd_pctl->info = pinctrl_info; > sprd_pctl->dev = &pdev->dev; > + sprd_pctl->common_pin_offset = common_pin_offset; > + sprd_pctl->misc_pin_offset = misc_pin_offset; > platform_set_drvdata(pdev, sprd_pctl); > > ret = sprd_pinctrl_add_pins(sprd_pctl, sprd_soc_pin_info, pins_cnt); > @@ -1077,12 +1083,6 @@ int sprd_pinctrl_core_probe(struct platform_device *pdev, > return ret; > } > > - ret = sprd_pinctrl_parse_dt(sprd_pctl); > - if (ret) { > - dev_err(&pdev->dev, "fail to parse dt properties\n"); > - return ret; > - } > - > pin_desc = devm_kcalloc(&pdev->dev, > pinctrl_info->npins, > sizeof(struct pinctrl_pin_desc), > @@ -1100,6 +1100,11 @@ int sprd_pinctrl_core_probe(struct platform_device *pdev, > sprd_pinctrl_desc.name = dev_name(&pdev->dev); > sprd_pinctrl_desc.npins = pinctrl_info->npins; > > + ret = sprd_pinctrl_parse_dt(sprd_pctl); > + if (ret) { > + dev_err(&pdev->dev, "fail to parse dt properties\n"); > + return ret; > + } Why change this? If this change fixed anything, please mention it in the commit log. > sprd_pctl->pctl = pinctrl_register(&sprd_pinctrl_desc, > &pdev->dev, (void *)sprd_pctl); > if (IS_ERR(sprd_pctl->pctl)) { > diff --git a/drivers/pinctrl/sprd/pinctrl-sprd.h b/drivers/pinctrl/sprd/pinctrl-sprd.h > index 69544a3cd635..a696f81ce663 100644 > --- a/drivers/pinctrl/sprd/pinctrl-sprd.h > +++ b/drivers/pinctrl/sprd/pinctrl-sprd.h > @@ -52,7 +52,8 @@ struct sprd_pins_info { > > int sprd_pinctrl_core_probe(struct platform_device *pdev, > struct sprd_pins_info *sprd_soc_pin_info, > - int pins_cnt); > + int pins_cnt, u32 common_pin_offset, > + u32 misc_pin_offset); IMO, I don't like this modification since it lacks scalability, and just imagine that there might be more differences in SoC in the future. So adding a SoC structure in sprd_pinctrl_of_match() and parsing it in the sprd-pinctrl core seems the right way to go. > int sprd_pinctrl_remove(struct platform_device *pdev); > void sprd_pinctrl_shutdown(struct platform_device *pdev); >
diff --git a/drivers/pinctrl/sprd/pinctrl-sprd-sc9860.c b/drivers/pinctrl/sprd/pinctrl-sprd-sc9860.c index d14f382f2392..05158c71ad77 100644 --- a/drivers/pinctrl/sprd/pinctrl-sprd-sc9860.c +++ b/drivers/pinctrl/sprd/pinctrl-sprd-sc9860.c @@ -10,6 +10,9 @@ #include "pinctrl-sprd.h" +#define PINCTRL_REG_OFFSET 0x20 +#define PINCTRL_REG_MISC_OFFSET 0x4020 + enum sprd_sc9860_pins { /* pin global control register 0 */ SC9860_VIO28_0_IRTE = SPRD_PIN_INFO(0, GLOBAL_CTRL_PIN, 11, 1, 0), @@ -926,7 +929,9 @@ static struct sprd_pins_info sprd_sc9860_pins_info[] = { static int sprd_pinctrl_probe(struct platform_device *pdev) { return sprd_pinctrl_core_probe(pdev, sprd_sc9860_pins_info, - ARRAY_SIZE(sprd_sc9860_pins_info)); + ARRAY_SIZE(sprd_sc9860_pins_info), + PINCTRL_REG_OFFSET, + PINCTRL_REG_MISC_OFFSET); } static const struct of_device_id sprd_pinctrl_of_match[] = { diff --git a/drivers/pinctrl/sprd/pinctrl-sprd.c b/drivers/pinctrl/sprd/pinctrl-sprd.c index ca9659f4e4b1..25fb9ce9ad78 100644 --- a/drivers/pinctrl/sprd/pinctrl-sprd.c +++ b/drivers/pinctrl/sprd/pinctrl-sprd.c @@ -30,8 +30,6 @@ #include "pinctrl-sprd.h" #define PINCTRL_BIT_MASK(width) (~(~0UL << (width))) -#define PINCTRL_REG_OFFSET 0x20 -#define PINCTRL_REG_MISC_OFFSET 0x4020 #define PINCTRL_REG_LEN 0x4 #define PIN_FUNC_MASK (BIT(4) | BIT(5)) @@ -148,12 +146,16 @@ struct sprd_pinctrl_soc_info { * @pctl: pointer to the pinctrl handle * @base: base address of the controller * @info: pointer to SoC's pins description information + * @common_pin_offset: offset value of common register + * @misc_pin_offset: offset value of misc register */ struct sprd_pinctrl { struct device *dev; struct pinctrl_dev *pctl; void __iomem *base; struct sprd_pinctrl_soc_info *info; + u32 common_pin_offset; + u32 misc_pin_offset; }; #define SPRD_PIN_CONFIG_CONTROL (PIN_CONFIG_END + 1) @@ -1023,12 +1025,12 @@ static int sprd_pinctrl_add_pins(struct sprd_pinctrl *sprd_pctl, ctrl_pin++; } else if (pin->type == COMMON_PIN) { pin->reg = (unsigned long)sprd_pctl->base + - PINCTRL_REG_OFFSET + PINCTRL_REG_LEN * + sprd_pctl->common_pin_offset + PINCTRL_REG_LEN * (i - ctrl_pin); com_pin++; } else if (pin->type == MISC_PIN) { pin->reg = (unsigned long)sprd_pctl->base + - PINCTRL_REG_MISC_OFFSET + PINCTRL_REG_LEN * + sprd_pctl->misc_pin_offset + PINCTRL_REG_LEN * (i - ctrl_pin - com_pin); } } @@ -1045,7 +1047,9 @@ static int sprd_pinctrl_add_pins(struct sprd_pinctrl *sprd_pctl, int sprd_pinctrl_core_probe(struct platform_device *pdev, struct sprd_pins_info *sprd_soc_pin_info, - int pins_cnt) + int pins_cnt, + u32 common_pin_offset, + u32 misc_pin_offset) { struct sprd_pinctrl *sprd_pctl; struct sprd_pinctrl_soc_info *pinctrl_info; @@ -1069,6 +1073,8 @@ int sprd_pinctrl_core_probe(struct platform_device *pdev, sprd_pctl->info = pinctrl_info; sprd_pctl->dev = &pdev->dev; + sprd_pctl->common_pin_offset = common_pin_offset; + sprd_pctl->misc_pin_offset = misc_pin_offset; platform_set_drvdata(pdev, sprd_pctl); ret = sprd_pinctrl_add_pins(sprd_pctl, sprd_soc_pin_info, pins_cnt); @@ -1077,12 +1083,6 @@ int sprd_pinctrl_core_probe(struct platform_device *pdev, return ret; } - ret = sprd_pinctrl_parse_dt(sprd_pctl); - if (ret) { - dev_err(&pdev->dev, "fail to parse dt properties\n"); - return ret; - } - pin_desc = devm_kcalloc(&pdev->dev, pinctrl_info->npins, sizeof(struct pinctrl_pin_desc), @@ -1100,6 +1100,11 @@ int sprd_pinctrl_core_probe(struct platform_device *pdev, sprd_pinctrl_desc.name = dev_name(&pdev->dev); sprd_pinctrl_desc.npins = pinctrl_info->npins; + ret = sprd_pinctrl_parse_dt(sprd_pctl); + if (ret) { + dev_err(&pdev->dev, "fail to parse dt properties\n"); + return ret; + } sprd_pctl->pctl = pinctrl_register(&sprd_pinctrl_desc, &pdev->dev, (void *)sprd_pctl); if (IS_ERR(sprd_pctl->pctl)) { diff --git a/drivers/pinctrl/sprd/pinctrl-sprd.h b/drivers/pinctrl/sprd/pinctrl-sprd.h index 69544a3cd635..a696f81ce663 100644 --- a/drivers/pinctrl/sprd/pinctrl-sprd.h +++ b/drivers/pinctrl/sprd/pinctrl-sprd.h @@ -52,7 +52,8 @@ struct sprd_pins_info { int sprd_pinctrl_core_probe(struct platform_device *pdev, struct sprd_pins_info *sprd_soc_pin_info, - int pins_cnt); + int pins_cnt, u32 common_pin_offset, + u32 misc_pin_offset); int sprd_pinctrl_remove(struct platform_device *pdev); void sprd_pinctrl_shutdown(struct platform_device *pdev);