diff options
| author | Rafał Miłecki <rafal@milecki.pl> | 2022-01-31 00:34:01 +0100 |
|---|---|---|
| committer | Rafał Miłecki <rafal@milecki.pl> | 2022-01-31 00:57:58 +0100 |
| commit | a11e9fd1d5b511eeaec2c1e024d2adb33d9f16c5 (patch) | |
| tree | 3b544393c69f4157f102cfe802e8da641d485a9e /target/linux | |
| parent | b0145891676faa38f0a5991e3e229aed7b4a9117 (diff) | |
| download | upstream-a11e9fd1d5b511eeaec2c1e024d2adb33d9f16c5.tar.gz upstream-a11e9fd1d5b511eeaec2c1e024d2adb33d9f16c5.tar.bz2 upstream-a11e9fd1d5b511eeaec2c1e024d2adb33d9f16c5.zip | |
bcm4908: fixup pinctrl patches for kernel 5.4
Fixes: b0145891676f ("bcm4908: backport BCM4908 pinctrl driver")
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Diffstat (limited to 'target/linux')
2 files changed, 8 insertions, 7 deletions
diff --git a/target/linux/bcm4908/patches-5.4/087-v5.18-0001-dt-bindings-pinctrl-Add-binding-for-BCM4908-pinctrl.patch b/target/linux/bcm4908/patches-5.4/087-v5.18-0001-dt-bindings-pinctrl-Add-binding-for-BCM4908-pinctrl.patch index 0d2573b902..ab18c17fd1 100644 --- a/target/linux/bcm4908/patches-5.4/087-v5.18-0001-dt-bindings-pinctrl-Add-binding-for-BCM4908-pinctrl.patch +++ b/target/linux/bcm4908/patches-5.4/087-v5.18-0001-dt-bindings-pinctrl-Add-binding-for-BCM4908-pinctrl.patch @@ -95,7 +95,7 @@ Signed-off-by: Linus Walleij <linus.walleij@linaro.org> + }; --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -3688,6 +3688,13 @@ F: Documentation/devicetree/bindings/net/brcm,bcm4908-enet.yaml +@@ -3217,6 +3217,13 @@ F: Documentation/devicetree/bindings/net F: drivers/net/ethernet/broadcom/bcm4908_enet.* F: drivers/net/ethernet/broadcom/unimac.h @@ -107,5 +107,5 @@ Signed-off-by: Linus Walleij <linus.walleij@linaro.org> +F: Documentation/devicetree/bindings/pinctrl/brcm,bcm4908-pinctrl.yaml + BROADCOM BCM5301X ARM ARCHITECTURE - M: Florian Fainelli <f.fainelli@gmail.com> M: Hauke Mehrtens <hauke@hauke-m.de> + M: Rafał Miłecki <zajec5@gmail.com> diff --git a/target/linux/bcm4908/patches-5.4/087-v5.18-0002-pinctrl-bcm-add-driver-for-BCM4908-pinmux.patch b/target/linux/bcm4908/patches-5.4/087-v5.18-0002-pinctrl-bcm-add-driver-for-BCM4908-pinmux.patch index bb2ae459e9..670cbee948 100644 --- a/target/linux/bcm4908/patches-5.4/087-v5.18-0002-pinctrl-bcm-add-driver-for-BCM4908-pinmux.patch +++ b/target/linux/bcm4908/patches-5.4/087-v5.18-0002-pinctrl-bcm-add-driver-for-BCM4908-pinmux.patch @@ -23,7 +23,7 @@ Signed-off-by: Linus Walleij <linus.walleij@linaro.org> --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -3442,6 +3442,7 @@ M: bcm-kernel-feedback-list@broadcom.com +@@ -3223,6 +3223,7 @@ M: bcm-kernel-feedback-list@broadcom.com L: linux-gpio@vger.kernel.org S: Maintained F: Documentation/devicetree/bindings/pinctrl/brcm,bcm4908-pinctrl.yaml @@ -66,7 +66,7 @@ Signed-off-by: Linus Walleij <linus.walleij@linaro.org> obj-$(CONFIG_PINCTRL_NS) += pinctrl-ns.o --- /dev/null +++ b/drivers/pinctrl/bcm/pinctrl-bcm4908.c -@@ -0,0 +1,560 @@ +@@ -0,0 +1,561 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (C) 2021 Rafał Miłecki <rafal@milecki.pl> */ + @@ -579,9 +579,10 @@ Signed-off-by: Linus Walleij <linus.walleij@linaro.org> + /* Register */ + + bcm4908_pinctrl->pctldev = devm_pinctrl_register(dev, pctldesc, bcm4908_pinctrl); -+ if (IS_ERR(bcm4908_pinctrl->pctldev)) -+ return dev_err_probe(dev, PTR_ERR(bcm4908_pinctrl->pctldev), -+ "Failed to register pinctrl\n"); ++ if (IS_ERR(bcm4908_pinctrl->pctldev)) { ++ dev_err(dev, "Failed to register pinctrl\n"); ++ return PTR_ERR(bcm4908_pinctrl->pctldev); ++ } + + /* Groups */ + |