pinctrl: ralink: rt2880: Some minimal clean ups
Subsystems (5)
cover pinctrl: ralink: rt2880: Some minimal clean ups
After this driver was moved from staging into pinctrl subsytems some reviews for bindigns and driver itself comes from Ron Herring and Dan Carpenter. Get rid of all the comments to properly be in a good shape before merge window.
Best regards,
Sergio Paracuellos
Sergio Paracuellos (8):
dt-bindings: pinctrl: rt2880: properly redo bindings
pinctrl: ralink: rt2880: avoid double pointer to simplify code
pinctrl: ralink: rt2880: return proper error code
pinctrl: ralink: rt2880: add missing NULL check
pinctrl: ralink: rt2880: delete not needed error message
pinctrl: ralink: rt2880: preserve error codes
pinctrl: ralink: rt2880: use 'PTR_ERR_OR_ZERO'
staging: mt7621-dts: properly name pinctrl related nodes
.../pinctrl/ralink,rt2880-pinmux.yaml | 62 +++++++++---------- drivers/pinctrl/ralink/pinctrl-rt2880.c | 45 +++++++------- drivers/staging/mt7621-dts/mt7621.dtsi | 46 +++++++------- 3 files changed, 73 insertions(+), 80 deletions(-)
Signature · 1 line
2.25.1
PATCH 1/8 dt-bindings: pinctrl: rt2880: properly redo bindings
When this bindings where applied there weren't already reviewed and some old hacks was being used to properly pass the schemas checks. This commits fix them up:
- Instead of using 'if-then' clause use '-pins$'.
- 'groups' and 'function' are included inside a new '^(.*-)?pinmux$' node.
- compatible string is not an 'enum' but a 'const'.
- 'pinctrl-0' and 'pinctrl-names' removed since they are used in consumer nodes.
--- .../pinctrl/ralink,rt2880-pinmux.yaml | 62 +++++++++---------- 1 file changed, 28 insertions(+), 34 deletions(-)
Documentation/devicetree/bindings/pinctrl/ralink,rt2880-pinmux.yaml +28 -34
@@ -15,39 +15,38 @@ description: properties: compatible: - enum: - - ralink,rt2880-pinmux + const: ralink,rt2880-pinmux - pinctrl-0: - description: - A phandle to the node containing the subnodes containing default - configurations. This is for pinctrl hogs. +patternProperties: + '-pins$': + type: object + patternProperties: + '^(.*-)?pinmux$': + type: object + description: node for pinctrl. + $ref: pinmux-node.yaml# + + properties: + groups: + description: Name of the pin group to use for the functions. + enum: [i2c, spi, uart1, uart2, uart3, rgmii1, rgmii2, mdio, + pcie, sdhci] + function: + description: The mux function to select + enum: [gpio, i2c, spi, uart1, uart2, uart3, rgmii1, rgmii2, + mdio, nand1, nand2, sdhci] + + required: + - groups + - function + + additionalProperties: false - pinctrl-names: - description: - A pinctrl state named "default" can be defined. - const: default + additionalProperties: false required: - compatible -patternProperties: - '[a-z0-9_-]+': - if: - type: object - description: node for pinctrl. - $ref: "pinmux-node.yaml" - then: - properties: - groups: - description: Name of the pin group to use for the functions. - enum: [i2c, spi, uart1, uart2, uart3, rgmii1, rgmii2, mdio, - pcie, sdhci] - function: - description: The mux function to select - enum: [gpio, i2c, spi, uart1, uart2, uart3, rgmii1, rgmii2, - mdio, nand1, nand2, sdhci] - additionalProperties: false examples:
@@ -55,14 +54,9 @@ examples: - | pinctrl { compatible = "ralink,rt2880-pinmux"; - pinctrl-names = "default"; - pinctrl-0 = <&state_default>; - - state_default: pinctrl0 { - }; - i2c_pins: i2c0 { - i2c0 { + i2c_pins: i2c0-pins { + pinmux { groups = "i2c"; function = "i2c"; };
Signature · 1 line
2.25.1
Re: [PATCH 1/8] dt-bindings: pinctrl: rt2880: properly redo bindings
Quoted 10 lines · Sergio Paracuellos
When this bindings where applied there weren't already reviewed and some old hacks was being used to properly pass the schemas checks. This commits fix them up:
- Instead of using 'if-then' clause use '-pins$'.
- 'groups' and 'function' are included inside a new '^(.*-)?pinmux$' node.
- compatible string is not an 'enum' but a 'const'.
- 'pinctrl-0' and 'pinctrl-names' removed since they are used in consumer nodes.
Quoted 5 lines
Signed-off-by Sergio Paracuellos <[email protected]>--- .../pinctrl/ralink,rt2880-pinmux.yaml | 62 +++++++++---------- 1 file changed, 28 insertions(+), 34 deletions(-)
PATCH 2/8 pinctrl: ralink: rt2880: avoid double pointer to simplify code
In reply to Sergio ParacuellosDouble pointer is being used and assigned in a bit dirty way to assign functions in pinctrl. Instead of doing this just avoid it and use directly 'p->func' instead.
--- drivers/pinctrl/ralink/pinctrl-rt2880.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-)
drivers/pinctrl/ralink/pinctrl-rt2880.c +9 -12
@@ -193,7 +193,6 @@ static struct rt2880_pmx_func gpio_func = {static int rt2880_pinmux_index (struct rt2880_priv *p) { -struct rt2880_pmx_func **f;struct rt2880_pmx_group *mux = p->groups;int i, j, c =0 ;
@@ -218,31 +217,29 @@ static int rt2880_pinmux_index(struct rt2880_priv *p) p->func_count++;/* allocate our function and group mapping index buffers */ - f = p->func =devm_kcalloc (p->dev, - p->func_count, -sizeof (*p->func), -GFP_KERNEL ); + p->func =devm_kcalloc (p->dev, p->func_count, +sizeof (*p->func),GFP_KERNEL ); gpio_func.groups =devm_kcalloc (p->dev, p->group_count,sizeof (int ),GFP_KERNEL ); -if (!f || !gpio_func.groups) -return -1 ; +if (!p->func || !gpio_func.groups) +return -ENOMEM ;/* add a backpointer to the function so it knows its group */ gpio_func.group_count = p->group_count;for (i =0 ; i < gpio_func.group_count; i++) gpio_func.groups[i] = i; - f[c] = &gpio_func; + p->func[c] = &gpio_func; c++;/* add remaining functions */ for (i =0 ; i < p->group_count; i++) {for (j =0 ; j < p->groups[i].func_count; j++) { - f[c] = &p->groups[i].func[j]; - f[c]->groups =devm_kzalloc (p->dev,sizeof (int ), + p->func[c] = &p->groups[i].func[j]; + p->func[c]->groups =devm_kzalloc (p->dev,sizeof (int ),GFP_KERNEL ); - f[c]->groups[0 ] = i; - f[c]->group_count =1 ; + p->func[c]->groups[0 ] = i; + p->func[c]->group_count =1 ; c++; } }
Signature · 1 line
2.25.1
PATCH 3/8 pinctrl: ralink: rt2880: return proper error code
In reply to Sergio ParacuellosCheck for NULL shall return '-ENOMEM' instead of '-1'.
--- drivers/pinctrl/ralink/pinctrl-rt2880.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pinctrl/ralink/pinctrl-rt2880.c +1 -1
@@ -206,7 +206,7 @@ static int rt2880_pinmux_index(struct rt2880_priv *p) p->group_names =devm_kcalloc (p->dev, p->group_count,sizeof (char *),GFP_KERNEL );if (!p->group_names) -return -1 ; +return -ENOMEM ;for (i =0 ; i < p->group_count; i++) { p->group_names[i] = p->groups[i].name;
Signature · 1 line
2.25.1
PATCH 4/8 pinctrl: ralink: rt2880: add missing NULL check
In reply to Sergio ParacuellosMemory is being requested to the kernel but there is a missing check for NULL. Hence, add it.
--- drivers/pinctrl/ralink/pinctrl-rt2880.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/pinctrl/ralink/pinctrl-rt2880.c +2 -0
@@ -238,6 +238,8 @@ static int rt2880_pinmux_index(struct rt2880_priv *p) p->func[c] = &p->groups[i].func[j]; p->func[c]->groups =devm_kzalloc (p->dev,sizeof (int ),GFP_KERNEL ); +if (!p->func[c]->groups) +return -ENOMEM ; p->func[c]->groups[0 ] = i; p->func[c]->group_count =1 ; c++;
Signature · 1 line
2.25.1
PATCH 5/8 pinctrl: ralink: rt2880: delete not needed error message
In reply to Sergio ParacuellosWhen '-ENOMEM' is returned there is not need at all to add custom error messages. Hence delete it.
--- drivers/pinctrl/ralink/pinctrl-rt2880.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/pinctrl/ralink/pinctrl-rt2880.c +1 -3
@@ -279,10 +279,8 @@ static int rt2880_pinmux_pins(struct rt2880_priv *p)/* the pads needed to tell pinctrl about our pins */ p->pads =devm_kcalloc (p->dev, p->max_pins,sizeof (struct pinctrl_pin_desc ),GFP_KERNEL ); -if (!p->pads || !p->gpio) { -dev_err (p->dev,"Failed to allocate gpio data\n" ); +if (!p->pads || !p->gpio)return -ENOMEM ; - }memset (p->gpio,1 ,sizeof (u8) * p->max_pins);for (i =0 ; i < p->func_count; i++) {
Signature · 1 line
2.25.1
PATCH 6/8 pinctrl: ralink: rt2880: preserve error codes
In reply to Sergio ParacuellosSome paths in probe function are returning '-EINVAL' instead of preserve original code from called functions. Change them to preserve all of them.
--- drivers/pinctrl/ralink/pinctrl-rt2880.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
drivers/pinctrl/ralink/pinctrl-rt2880.c +8 -4
@@ -315,6 +315,7 @@ static int rt2880_pinmux_probe(struct platform_device *pdev) {struct rt2880_priv *p;struct pinctrl_dev *dev; +int err;if (!rt2880_pinmux_data)return -ENOTSUPP ;
@@ -330,13 +331,16 @@ static int rt2880_pinmux_probe(struct platform_device *pdev)platform_set_drvdata (pdev, p);/* init the device */ -if (rt2880_pinmux_index (p)) { + err =rt2880_pinmux_index (p); +if (err) {dev_err (&pdev->dev,"failed to load index\n" ); -return -EINVAL ; +return err; } -if (rt2880_pinmux_pins (p)) { + + err =rt2880_pinmux_pins (p); +if (err) {dev_err (&pdev->dev,"failed to load pins\n" ); -return -EINVAL ; +return err; } dev =pinctrl_register (p->desc, &pdev->dev, p);if (IS_ERR (dev))
Signature · 1 line
2.25.1
PATCH 7/8 pinctrl: ralink: rt2880: use 'PTR_ERR_OR_ZERO'
In reply to Sergio Paracuellos Avoid some boilerplate code using 'PTR_ERR_OR_ZERO' in probe function.
--- drivers/pinctrl/ralink/pinctrl-rt2880.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/pinctrl/ralink/pinctrl-rt2880.c +1 -3
@@ -343,10 +343,8 @@ static int rt2880_pinmux_probe(struct platform_device *pdev)return err; } dev =pinctrl_register (p->desc, &pdev->dev, p); -if (IS_ERR (dev)) -return PTR_ERR (dev); -return 0 ; +return PTR_ERR_OR_ZERO (dev); }static const struct of_device_id rt2880_pinmux_match[] = {
Signature · 1 line
2.25.1
PATCH 8/8 staging: mt7621-dts: properly name pinctrl related nodes
In reply to Sergio ParacuellosAccording to the binding documentation pinctrl related nodes must use '-pins$' and ''^(.*-)?pinmux$'' as names. Change all of them to properly match them.
--- drivers/staging/mt7621-dts/mt7621.dtsi | 46 +++++++++++++------------- 1 file changed, 23 insertions(+), 23 deletions(-)
drivers/staging/mt7621-dts/mt7621.dtsi +23 -23
@@ -228,83 +228,83 @@ pinctrl: pinctrl { state_default: pinctrl0 { }; - i2c_pins: i2c0 { - i2c0 { + i2c_pins: i2c0-pins { + pinmux { groups = "i2c"; function = "i2c"; }; }; - spi_pins: spi0 { - spi0 { + spi_pins: spi0-pins { + pinmux { groups = "spi"; function = "spi"; }; }; - uart1_pins: uart1 { - uart1 { + uart1_pins: uart1-pins { + pinmux { groups = "uart1"; function = "uart1"; }; }; - uart2_pins: uart2 { - uart2 { + uart2_pins: uart2-pins { + pinmux { groups = "uart2"; function = "uart2"; }; }; - uart3_pins: uart3 { - uart3 { + uart3_pins: uart3-pins { + pinmux { groups = "uart3"; function = "uart3"; }; }; - rgmii1_pins: rgmii1 { - rgmii1 { + rgmii1_pins: rgmii1-pins { + pinmux { groups = "rgmii1"; function = "rgmii1"; }; }; - rgmii2_pins: rgmii2 { - rgmii2 { + rgmii2_pins: rgmii2-pins { + pinmux { groups = "rgmii2"; function = "rgmii2"; }; }; - mdio_pins: mdio0 { - mdio0 { + mdio_pins: mdio0-pins { + pinmux { groups = "mdio"; function = "mdio"; }; }; - pcie_pins: pcie0 { - pcie0 { + pcie_pins: pcie0-pins { + pinmux { groups = "pcie"; function = "gpio"; }; }; - nand_pins: nand0 { - spi-nand { + nand_pins: nand0-pins { + spi-pinmux { groups = "spi"; function = "nand1"; }; - sdhci-nand { + sdhci-pinmux { groups = "sdhci"; function = "nand2"; }; }; - sdhci_pins: sdhci0 { - sdhci0 { + sdhci_pins: sdhci0-pins { + pinmux { groups = "sdhci"; function = "sdhci"; };
Signature · 1 line
2.25.1
Quoted 4 lines · Sergio Paracuellos
After this driver was moved from staging into pinctrl subsytems some reviews for bindigns and driver itself comes from Ron Herring and Dan Carpenter. Get rid of all the comments to properly be in a good shape before merge window.
If Greg wants he can queue them last minute. Else I'll apply these after the merge window, no big deal.
Yours,
Linus Walleij
Quoted 9 lines · Linus Walleij
Quoted 4 lines · Sergio Paracuellos
After this driver was moved from staging into pinctrl subsytems some reviews for bindigns and driver itself comes from Ron Herring and Dan Carpenter. Get rid of all the comments to properly be in a good shape before merge window.
Quoted 4 lines
Reviewed-by Linus Walleij <[email protected]>If Greg wants he can queue them last minute. Else I'll apply these after the merge window, no big deal.
Thanks, and sorry for the last minute.
Quoted 3 lines
Yours,
Linus Walleij
Best regards,
Sergio Paracuellos
Linus Walleij
AppliedQuoted 4 lines · Sergio Paracuellos
After this driver was moved from staging into pinctrl subsytems some reviews for bindigns and driver itself comes from Ron Herring and Dan Carpenter. Get rid of all the comments to properly be in a good shape before merge window.
Applied patches 1-7 to the pinctrl tree, patch 8 needs to be sent to Greg.
Yours,
Linus Walleij
Hi,
Quoted 11 lines · Linus Walleij
Quoted 4 lines · Sergio Paracuellos
After this driver was moved from staging into pinctrl subsytems some reviews for bindigns and driver itself comes from Ron Herring and Dan Carpenter. Get rid of all the comments to properly be in a good shape before merge window.
Applied patches 1-7 to the pinctrl tree, patch 8 needs to be sent to Greg.
Thanks Linus. PATCH 8 should apply directly as it is in this series also in staging. Greg, can you take PATCH 8 from this series or do you want me to resend it?
Quoted 3 lines
Yours,
Linus Walleij
Best regards,
Sergio Paracuellos
Greg KH
maintainerQuoted 12 lines · Sergio Paracuellos
Hi,
Quoted 9 lines · Linus Walleij
Quoted 4 lines · Sergio Paracuellos
After this driver was moved from staging into pinctrl subsytems some reviews for bindigns and driver itself comes from Ron Herring and Dan Carpenter. Get rid of all the comments to properly be in a good shape before merge window.
Quoted 6 lines
Quoted 2 lines
Applied patches 1-7 to the pinctrl tree, patch 8 needs to be sent to Greg.
Thanks Linus. PATCH 8 should apply directly as it is in this series also in staging. Greg, can you take PATCH 8 from this series or do you want me to resend it?
Resend please.
thanks,
greg k-h