Merge tag 'uapi-20121219' into for-linus

[firefly-linux-kernel-4.4.55.git] / arch / arm / boot / dts / dbx5x0.dtsi

diff --git a/arch/arm/boot/dts/dbx5x0.dtsi b/arch/arm/boot/dts/dbx5x0.dtsi
index 2efd9c891bc91f85522a6158854fd14e89b7f65f..63f2fbcfe8196823a93ac5f74f2eadebd3ae52f7 100644 (file)
--- a/arch/arm/boot/dts/dbx5x0.dtsi
+++ b/arch/arm/boot/dts/dbx5x0.dtsi
@@ -170,7 +170,9 @@
                        gpio-bank = <8>;
                };
 
-               pinctrl {
+               pinctrl@80157000 {
+                       // This is actually the PRCMU base address
+                       reg = <0x80157000 0x2000>;
                        compatible = "stericsson,nmk_pinctrl";
                };