Skip to content

Commit

Permalink
ARM/dts: OMAP3: fix pinctrl-single configuration
Browse files Browse the repository at this point in the history
 - Fix 'function-mask' referring to TRM (Omap 36xx) Section 13.4.4:
   "Pad Functional Multiplexing and Configuration".
 - Fix 'omap3_pmx_wkup' referring to TRM Table 13-6:
   "Wkup Control Module Pad Configuration Register Fields".

Note that these fixes are not critical currently as we
are not yet using the missing range of pinmux registers
at this point.

Signed-off-by: Christoph Fritz <chf.fritz@googlemail.com>
[tony@atomide.com: updated comments]
Signed-off-by: Tony Lindgren <tony@atomide.com>
  • Loading branch information
Christoph Fritz authored and Tony Lindgren committed Apr 9, 2013
1 parent d05663a commit 161e89a
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions arch/arm/boot/dts/omap3.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
};

/*
* The soc node represents the soc top level view. It is uses for IPs
* The soc node represents the soc top level view. It is used for IPs
* that are not memory mapped in the MPU view or for the MPU itself.
*/
soc {
Expand Down Expand Up @@ -99,16 +99,16 @@
#address-cells = <1>;
#size-cells = <0>;
pinctrl-single,register-width = <16>;
pinctrl-single,function-mask = <0x7fff>;
pinctrl-single,function-mask = <0x7f1f>;
};

omap3_pmx_wkup: pinmux@0x48002a58 {
omap3_pmx_wkup: pinmux@0x48002a00 {
compatible = "ti,omap3-padconf", "pinctrl-single";
reg = <0x48002a58 0x5c>;
reg = <0x48002a00 0x5c>;
#address-cells = <1>;
#size-cells = <0>;
pinctrl-single,register-width = <16>;
pinctrl-single,function-mask = <0x7fff>;
pinctrl-single,function-mask = <0x7f1f>;
};

gpio1: gpio@48310000 {
Expand Down

0 comments on commit 161e89a

Please sign in to comment.