Resneptacle/openwrt-cghmn-mt300n
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bcm4908: fixup pinctrl patches for kernel 5.4

Browse Source 
Fixes: b0145891676f ("bcm4908: backport BCM4908 pinctrl driver")
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
This commit is contained in:
Rafał Miłecki 2022-01-31 00:34:01 +01:00
parent b014589167
commit a11e9fd1d5
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
target/linux/bcm4908/patches-5.4/087-v5.18-0001-dt-bindings-pinctrl-Add-binding-for-BCM4908-pinctrl.patch
View File

@ -95,7 +95,7 @@ Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
+ }; + };
--- a/MAINTAINERS --- a/MAINTAINERS
+++ b/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/bcm4908_enet.*
F: drivers/net/ethernet/broadcom/unimac.h 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 +F: Documentation/devicetree/bindings/pinctrl/brcm,bcm4908-pinctrl.yaml
+ +
BROADCOM BCM5301X ARM ARCHITECTURE BROADCOM BCM5301X ARM ARCHITECTURE
M: Florian Fainelli <f.fainelli@gmail.com>
M: Hauke Mehrtens <hauke@hauke-m.de> M: Hauke Mehrtens <hauke@hauke-m.de>
M: Rafał Miłecki <zajec5@gmail.com>

11
target/linux/bcm4908/patches-5.4/087-v5.18-0002-pinctrl-bcm-add-driver-for-BCM4908-pinmux.patch
View File

@ -23,7 +23,7 @@ Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
--- a/MAINTAINERS --- a/MAINTAINERS
+++ b/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 L: linux-gpio@vger.kernel.org
S: Maintained S: Maintained
F: Documentation/devicetree/bindings/pinctrl/brcm,bcm4908-pinctrl.yaml 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 obj-$(CONFIG_PINCTRL_NS) += pinctrl-ns.o
--- /dev/null --- /dev/null
+++ b/drivers/pinctrl/bcm/pinctrl-bcm4908.c +++ b/drivers/pinctrl/bcm/pinctrl-bcm4908.c
@@ -0,0 +1,560 @@ @@ -0,0 +1,561 @@
+// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0
+/* Copyright (C) 2021 Rafał Miłecki <rafal@milecki.pl> */ +/* Copyright (C) 2021 Rafał Miłecki <rafal@milecki.pl> */
+ +
@ -579,9 +579,10 @@ Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
+ /* Register */ + /* Register */
+ +
+ bcm4908_pinctrl->pctldev = devm_pinctrl_register(dev, pctldesc, bcm4908_pinctrl); + bcm4908_pinctrl->pctldev = devm_pinctrl_register(dev, pctldesc, bcm4908_pinctrl);
+ if (IS_ERR(bcm4908_pinctrl->pctldev)) + if (IS_ERR(bcm4908_pinctrl->pctldev)) {
+ return dev_err_probe(dev, PTR_ERR(bcm4908_pinctrl->pctldev), + dev_err(dev, "Failed to register pinctrl\n");
+ "Failed to register pinctrl\n"); + return PTR_ERR(bcm4908_pinctrl->pctldev);
+ }
+ +
+ /* Groups */ + /* Groups */
+ +