From a4cafc50d84c57c49e9fa099651e0b26c4372b8a Mon Sep 17 00:00:00 2001 From: Christoph Fritz Date: Wed, 8 May 2013 16:48:02 -0700 Subject: [PATCH] --- yaml --- r: 375015 b: refs/heads/master c: 27b105bb9906292720dd75f54136554a3b70ce19 h: refs/heads/master i: 375013: 71702937cda0dafa6f992c545d51d073c9793011 375011: 67413081f026a72ca6f512896ef547c7837fd576 375007: 45385aabbe16a865244a44a38ba0105fc96e7e02 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-omap2/mux34xx.h | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index ec76a0d0f413..0c08b8121b75 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a8a07fffe4ecab7b77a4009ed317361385616aec +refs/heads/master: 27b105bb9906292720dd75f54136554a3b70ce19 diff --git a/trunk/arch/arm/mach-omap2/mux34xx.h b/trunk/arch/arm/mach-omap2/mux34xx.h index 6543ebf8ecfc..3f26d297c082 100644 --- a/trunk/arch/arm/mach-omap2/mux34xx.h +++ b/trunk/arch/arm/mach-omap2/mux34xx.h @@ -393,6 +393,10 @@ #define OMAP3_CONTROL_PADCONF_SAD2D_SWAKEUP_OFFSET 0xa1c #define OMAP3_CONTROL_PADCONF_JTAG_RTCK_OFFSET 0xa1e #define OMAP3_CONTROL_PADCONF_JTAG_TDO_OFFSET 0xa20 +#define OMAP3_CONTROL_PADCONF_GPIO_127 0xa24 +#define OMAP3_CONTROL_PADCONF_GPIO_126 0xa26 +#define OMAP3_CONTROL_PADCONF_GPIO_128 0xa28 +#define OMAP3_CONTROL_PADCONF_GPIO_129 0xa2a #define OMAP3_CONTROL_PADCONF_MUX_SIZE \ - (OMAP3_CONTROL_PADCONF_JTAG_TDO_OFFSET + 0x2) + (OMAP3_CONTROL_PADCONF_GPIO_129 + 0x2)