| Message ID | 1461934299-14774-3-git-send-email-yendapally.reddy@broadcom.com |
|---|---|
| State | New |
| Headers | show |
On Fri, Apr 29, 2016 at 2:51 PM, Yendapally Reddy Dhananjaya Reddy <yendapally.reddy@broadcom.com> wrote: > This enables the pinctrl support for Broadcom NS2 SoC > > Signed-off-by: Yendapally Reddy Dhananjaya Reddy <yendapally.reddy@broadcom.com> > Reviewed-by: Ray Jui <ray.jui@broadcom.com> Acked-by: Linus Walleij <linus.walleij@linaro.org> Please take this in through the apropriate BCM tree to ARM SoC. Yours, Linus Walleij -- To unsubscribe from this list: send the line "unsubscribe linux-gpio" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Le 30/04/2016 04:13, Linus Walleij a écrit : > On Fri, Apr 29, 2016 at 2:51 PM, Yendapally Reddy Dhananjaya Reddy > <yendapally.reddy@broadcom.com> wrote: > >> This enables the pinctrl support for Broadcom NS2 SoC >> >> Signed-off-by: Yendapally Reddy Dhananjaya Reddy <yendapally.reddy@broadcom.com> >> Reviewed-by: Ray Jui <ray.jui@broadcom.com> > > Acked-by: Linus Walleij <linus.walleij@linaro.org> > > Please take this in through the apropriate BCM tree to ARM SoC. Applied to devicetree-arm64/next, there was a small conflict due to the crmu node removal while switching to PSCI, Dhanajay, please double check the result here: https://github.com/Broadcom/stblinux/commit/8eab685dda30fb15e74d6be07baa9d430a75b8ca
diff --git a/arch/arm64/boot/dts/broadcom/ns2-svk.dts b/arch/arm64/boot/dts/broadcom/ns2-svk.dts index ce0ab84..2c98d76 100644 --- a/arch/arm64/boot/dts/broadcom/ns2-svk.dts +++ b/arch/arm64/boot/dts/broadcom/ns2-svk.dts @@ -87,3 +87,12 @@ #size-cells = <1>; }; }; + +&pinctrl { + pinctrl-names = "default"; + pinctrl-0 = <&nand_sel>; + nand_sel: nand_sel { + function = "nand"; + groups = "nand_grp"; + }; +}; diff --git a/arch/arm64/boot/dts/broadcom/ns2.dtsi b/arch/arm64/boot/dts/broadcom/ns2.dtsi index 6f81c9d..e263ade3 100644 --- a/arch/arm64/boot/dts/broadcom/ns2.dtsi +++ b/arch/arm64/boot/dts/broadcom/ns2.dtsi @@ -308,6 +308,13 @@ "chimp", "port", "sdio"; }; + pinctrl: pinctrl@6501d130 { + compatible = "brcm,ns2-pinmux"; + reg = <0x6501d130 0x08>, + <0x660a0028 0x04>, + <0x660009b0 0x40>; + }; + crmu: crmu@65024000 { compatible = "syscon"; reg = <0x65024000 0x100>;