diff options
| author | Tony Lindgren <tony@atomide.com> | 2013-10-07 13:22:01 -0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2013-10-08 13:37:29 -0400 |
| commit | d623a0e19dcbc4e44a8db047158815d7f8c2b839 (patch) | |
| tree | fa7031c3706be52c37004996a2080aa11e883fab /arch/arm | |
| parent | 016c12d2fb8584db392211bc6b0bdd6fcf7cfd97 (diff) | |
ARM: dts: Fix pinctrl mask for omap3
The wake-up interrupt bit is available on omap3/4/5 processors
unlike what we claim. Without fixing it we cannot use it on
omap3 and the system configured for wake-up events will just
hang on wake-up.
Cc: Grygorii Strashko <grygorii.strashko@ti.com>
Cc: Benoît Cousson <bcousson@baylibre.com>
Cc: devicetree@vger.kernel.org
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/boot/dts/omap3.dtsi | 4 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/mux.h | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/arch/arm/boot/dts/omap3.dtsi b/arch/arm/boot/dts/omap3.dtsi index 7d95cda1fae4..b41bd57f4328 100644 --- a/arch/arm/boot/dts/omap3.dtsi +++ b/arch/arm/boot/dts/omap3.dtsi | |||
| @@ -108,7 +108,7 @@ | |||
| 108 | #address-cells = <1>; | 108 | #address-cells = <1>; |
| 109 | #size-cells = <0>; | 109 | #size-cells = <0>; |
| 110 | pinctrl-single,register-width = <16>; | 110 | pinctrl-single,register-width = <16>; |
| 111 | pinctrl-single,function-mask = <0x7f1f>; | 111 | pinctrl-single,function-mask = <0xff1f>; |
| 112 | }; | 112 | }; |
| 113 | 113 | ||
| 114 | omap3_pmx_wkup: pinmux@0x48002a00 { | 114 | omap3_pmx_wkup: pinmux@0x48002a00 { |
| @@ -117,7 +117,7 @@ | |||
| 117 | #address-cells = <1>; | 117 | #address-cells = <1>; |
| 118 | #size-cells = <0>; | 118 | #size-cells = <0>; |
| 119 | pinctrl-single,register-width = <16>; | 119 | pinctrl-single,register-width = <16>; |
| 120 | pinctrl-single,function-mask = <0x7f1f>; | 120 | pinctrl-single,function-mask = <0xff1f>; |
| 121 | }; | 121 | }; |
| 122 | 122 | ||
| 123 | gpio1: gpio@48310000 { | 123 | gpio1: gpio@48310000 { |
diff --git a/arch/arm/mach-omap2/mux.h b/arch/arm/mach-omap2/mux.h index 5d2080ef7923..16f78a990d04 100644 --- a/arch/arm/mach-omap2/mux.h +++ b/arch/arm/mach-omap2/mux.h | |||
| @@ -28,7 +28,7 @@ | |||
| 28 | #define OMAP_PULL_UP (1 << 4) | 28 | #define OMAP_PULL_UP (1 << 4) |
| 29 | #define OMAP_ALTELECTRICALSEL (1 << 5) | 29 | #define OMAP_ALTELECTRICALSEL (1 << 5) |
| 30 | 30 | ||
| 31 | /* 34xx specific mux bit defines */ | 31 | /* omap3/4/5 specific mux bit defines */ |
| 32 | #define OMAP_INPUT_EN (1 << 8) | 32 | #define OMAP_INPUT_EN (1 << 8) |
| 33 | #define OMAP_OFF_EN (1 << 9) | 33 | #define OMAP_OFF_EN (1 << 9) |
| 34 | #define OMAP_OFFOUT_EN (1 << 10) | 34 | #define OMAP_OFFOUT_EN (1 << 10) |
| @@ -36,8 +36,6 @@ | |||
| 36 | #define OMAP_OFF_PULL_EN (1 << 12) | 36 | #define OMAP_OFF_PULL_EN (1 << 12) |
| 37 | #define OMAP_OFF_PULL_UP (1 << 13) | 37 | #define OMAP_OFF_PULL_UP (1 << 13) |
| 38 | #define OMAP_WAKEUP_EN (1 << 14) | 38 | #define OMAP_WAKEUP_EN (1 << 14) |
| 39 | |||
| 40 | /* 44xx specific mux bit defines */ | ||
| 41 | #define OMAP_WAKEUP_EVENT (1 << 15) | 39 | #define OMAP_WAKEUP_EVENT (1 << 15) |
| 42 | 40 | ||
| 43 | /* Active pin states */ | 41 | /* Active pin states */ |