From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dirk Behme Date: Sun, 05 Apr 2009 14:22:39 +0200 Subject: [U-Boot] [PATCH] OMAP3: Beagle: Set pinmux conditionally for Rev C boards In-Reply-To: <20090405105921.GB11028@game.jcrosoft.org> References: <1238914014-19302-1-git-send-email-dirk.behme@googlemail.com> <20090405105921.GB11028@game.jcrosoft.org> Message-ID: <49D8A28F.8020009@googlemail.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Dear Jean-Christophe, Jean-Christophe PLAGNIOL-VILLARD wrote: > On 08:46 Sun 05 Apr , Dirk Behme wrote: >> The Beagle Rev C boards pull UART2 from an alternate set of balls. >> >> Signed-off-by: Steve Sakoman >> Signed-off-by: Dirk Behme >> --- >> >> board/omap3/beagle/beagle.c | 4 ++++ >> board/omap3/beagle/beagle.h | 25 +++++++++++++++++-------- >> 2 files changed, 21 insertions(+), 8 deletions(-) >> >> Index: u-boot-main/board/omap3/beagle/beagle.c >> =================================================================== >> --- u-boot-main.orig/board/omap3/beagle/beagle.c >> +++ u-boot-main/board/omap3/beagle/beagle.c >> @@ -130,4 +130,8 @@ int misc_init_r(void) >> void set_muxconf_regs(void) >> { >> MUX_BEAGLE(); >> + >> + if(beagle_revision_c) { > please add a space between the if and '(' >> + MUX_BEAGLE_C(); >> + } >> } >> Index: u-boot-main/board/omap3/beagle/beagle.h >> =================================================================== >> --- u-boot-main.orig/board/omap3/beagle/beagle.h >> +++ u-boot-main/board/omap3/beagle/beagle.h >> @@ -214,14 +214,14 @@ const omap3_sysinfo sysinfo = { >> MUX_VAL(CP(MMC2_DAT6), (IEN | PTU | EN | M4)) /*GPIO_138*/\ >> MUX_VAL(CP(MMC2_DAT7), (IEN | PTU | EN | M4)) /*GPIO_139*/\ >> /*Bluetooth*/\ >> - MUX_VAL(CP(MCBSP3_DX), (IDIS | PTD | DIS | M4)) /*GPIO_140*/\ >> - MUX_VAL(CP(MCBSP3_DR), (IDIS | PTD | DIS | M4)) /*GPIO_142*/\ >> - MUX_VAL(CP(MCBSP3_CLKX), (IDIS | PTD | DIS | M4)) /*GPIO_141*/\ >> - MUX_VAL(CP(MCBSP3_FSX), (IDIS | PTD | DIS | M4)) /*GPIO_143*/\ > >> +#define MUX_BEAGLE_C() \ >> + MUX_VAL(CP(MCBSP3_DX), (IDIS | PTD | DIS | M4)) /*GPIO_140*/\ >> + MUX_VAL(CP(MCBSP3_DR), (IDIS | PTD | DIS | M4)) /*GPIO_142*/\ >> + MUX_VAL(CP(MCBSP3_CLKX), (IDIS | PTD | DIS | M4)) /*GPIO_141*/\ >> + MUX_VAL(CP(UART2_CTS), (IEN | PTU | EN | M0)) /*UART2_CTS*/\ >> + MUX_VAL(CP(UART2_RTS), (IDIS | PTD | DIS | M0)) /*UART2_RTS*/\ >> + MUX_VAL(CP(UART2_TX), (IDIS | PTD | DIS | M0)) /*UART2_TX*/ > please wait Tom Rix gpio patch move to this API We are dealing with PinMux here, not with how GPIOs are accessed/controlled. These are two different things we talk about [1]. Dirk [1] http://lists.denx.de/pipermail/u-boot/2009-April/050234.html