| Message ID | 1364574725.4634.51.camel@mars (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
* Christoph Fritz <chf.fritz@googlemail.com> [130329 09:36]: > - 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". Thanks applying into omap-for-v3.10/dt on top of the patches queued by Benoit. Tony > Signed-off-by: Christoph Fritz <chf.fritz@googlemail.com> > --- > arch/arm/boot/dts/omap3.dtsi | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/arch/arm/boot/dts/omap3.dtsi b/arch/arm/boot/dts/omap3.dtsi > index 1acc261..1997b41 100644 > --- a/arch/arm/boot/dts/omap3.dtsi > +++ b/arch/arm/boot/dts/omap3.dtsi > @@ -27,7 +27,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 { > @@ -81,16 +81,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 { > -- > 1.7.10.4 > > >
diff --git a/arch/arm/boot/dts/omap3.dtsi b/arch/arm/boot/dts/omap3.dtsi index 1acc261..1997b41 100644 --- a/arch/arm/boot/dts/omap3.dtsi +++ b/arch/arm/boot/dts/omap3.dtsi @@ -27,7 +27,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 { @@ -81,16 +81,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 {
- 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". Signed-off-by: Christoph Fritz <chf.fritz@googlemail.com> --- arch/arm/boot/dts/omap3.dtsi | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)