Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d623a0e1 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

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: default avatarTony Lindgren <tony@atomide.com>
parent 016c12d2

arch/arm/boot/dts/omap3.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ 
			#address-cells = <1>;

			#size-cells = <0>;

			pinctrl-single,register-width = <16>;

			pinctrl-single,function-mask = <0x7f1f>;

			pinctrl-single,function-mask = <0xff1f>;

		};



		omap3_pmx_wkup: pinmux@0x48002a00 {
@@ -117,7 +117,7 @@ 
			#address-cells = <1>;

			#size-cells = <0>;

			pinctrl-single,register-width = <16>;

			pinctrl-single,function-mask = <0x7f1f>;

			pinctrl-single,function-mask = <0xff1f>;

		};



		gpio1: gpio@48310000 {

arch/arm/mach-omap2/mux.h

+1 −3
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
#define OMAP_PULL_UP			(1 << 4)

#define OMAP_ALTELECTRICALSEL		(1 << 5)



/* 34xx specific mux bit defines */

/* omap3/4/5 specific mux bit defines */

#define OMAP_INPUT_EN			(1 << 8)

#define OMAP_OFF_EN			(1 << 9)

#define OMAP_OFFOUT_EN			(1 << 10)
@@ -36,8 +36,6 @@ 
#define OMAP_OFF_PULL_EN		(1 << 12)

#define OMAP_OFF_PULL_UP		(1 << 13)

#define OMAP_WAKEUP_EN			(1 << 14)



/* 44xx specific mux bit defines */

#define OMAP_WAKEUP_EVENT		(1 << 15)



/* Active pin states */

include/dt-bindings/pinctrl/omap.h

+1 −3
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
#define PULL_UP			(1 << 4)

#define ALTELECTRICALSEL	(1 << 5)



/* 34xx specific mux bit defines */

/* omap3/4/5 specific mux bit defines */

#define INPUT_EN		(1 << 8)

#define OFF_EN			(1 << 9)

#define OFFOUT_EN		(1 << 10)
@@ -31,8 +31,6 @@ 
#define OFF_PULL_EN		(1 << 12)

#define OFF_PULL_UP		(1 << 13)

#define WAKEUP_EN		(1 << 14)



/* 44xx specific mux bit defines */

#define WAKEUP_EVENT		(1 << 15)



/* Active pin states */