]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
ARM: dts: Fix dm814x pinctrl address and mask
authorTony Lindgren <tony@atomide.com>
Thu, 3 Dec 2015 20:02:32 +0000 (12:02 -0800)
committerTony Lindgren <tony@atomide.com>
Thu, 10 Dec 2015 00:53:46 +0000 (16:53 -0800)
Otherwise pinctrl won't work. Because of silicon errata for some dm814x
versions, let's also keep bit 18 out of the function-mask and rely on
the bootloader configuration for bit 18  as suggested by
Matthijs van Duin <matthijsvanduin@gmail.com>.

Devices with that need to use bit 18 can override the function-mask in
the board specific dts file if really needed.

Signed-off-by: Tony Lindgren <tony@atomide.com>
arch/arm/boot/dts/dm814x.dtsi

index 68b156b52003934f619cd18568b42296351fc24e..09a8d88bde2360de6f44fef57fc52ec122a2223e 100644 (file)
@@ -205,13 +205,21 @@ scm_clockdomains: clockdomains {
                                        };
                                };
 
+                               /*
+                                * Note that silicon revision 2.1 and older
+                                * require input enabled (bit 18 set) for all
+                                * 3.3V I/Os to avoid cumulative hardware damage.
+                                * For more info, see errata advisory 2.1.87.
+                                * We leave bit 18 out of function-mask and rely
+                                * on the bootloader for it.
+                                */
                                pincntl: pinmux@800 {
                                        compatible = "pinctrl-single";
-                                       reg = <0x800 0xc38>;
+                                       reg = <0x800 0x438>;
                                        #address-cells = <1>;
                                        #size-cells = <0>;
                                        pinctrl-single,register-width = <32>;
-                                       pinctrl-single,function-mask = <0x300ff>;
+                                       pinctrl-single,function-mask = <0x307ff>;
                                };
                        };