Skip to contentSkip to conversation

OMAP3: Beagle: Set pinmux conditionally for Rev C boards

PATCH New Dirk Behme 2 participants 3 messages Apr 5, 2009

lore
Share & tools
lore

Dirk Behme

author
#0 lore raw

PATCH 1/1 OMAP3: Beagle: Set pinmux conditionally for Rev C boards

The Beagle Rev C boards pull UART2 from an alternate set of balls.

---

 board/omap3/beagle/beagle.c |    4 ++++
 board/omap3/beagle/beagle.h |   25 +++++++++++++++++--------
 2 files changed, 21 insertions(+), 8 deletions(-)
board/omap3/beagle/beagle.c +4 -0
Index: 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) {
+		MUX_BEAGLE_C();
+	}
 }
board/omap3/beagle/beagle.h +17 -8
Index: 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*/\
- 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*/\
- MUX_VAL(CP(UART2_RX),		(IDIS | PTD | DIS | M4)) /*GPIO_147*/\
+ MUX_VAL(CP(MCBSP3_DX),		(IEN  | PTD | DIS | M1)) /*UART2_CTS*/\
+ MUX_VAL(CP(MCBSP3_DR),		(IDIS | PTD | DIS | M1)) /*UART2_RTS*/\
+ MUX_VAL(CP(MCBSP3_CLKX),	(IDIS | PTD | DIS | M1)) /*UART2_TX*/\
+ MUX_VAL(CP(MCBSP3_FSX),	(IEN  | PTD | DIS | M1)) /*UART2_RX*/\
+ MUX_VAL(CP(UART2_CTS),		(IEN  | PTD | DIS | M4)) /*GPIO_144*/\
+ MUX_VAL(CP(UART2_RTS),		(IEN  | PTD | DIS | M4)) /*GPIO_145*/\
+ MUX_VAL(CP(UART2_TX),		(IEN  | PTD | DIS | M4)) /*GPIO_146*/\
+ MUX_VAL(CP(UART2_RX),		(IEN  | PTD | DIS | M4)) /*GPIO_147*/\
  /*Modem Interface */\
  MUX_VAL(CP(UART1_TX),		(IDIS | PTD | DIS | M0)) /*UART1_TX*/\
  MUX_VAL(CP(UART1_RTS),		(IDIS | PTD | DIS | M4)) /*GPIO_149*/ \
@@ -374,4 +374,13 @@ const omap3_sysinfo sysinfo = {
  MUX_VAL(CP(D2D_SBUSFLAG),	(IEN  | PTD | DIS | M0)) /*d2d_sbusflag*/\
  MUX_VAL(CP(SDRC_CKE0),		(IDIS | PTU | EN  | M0)) /*sdrc_cke0*/\
  MUX_VAL(CP(SDRC_CKE1),		(IDIS | PTD | DIS | M7)) /*sdrc_cke1*/
+
+#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*/
+
 #endif
#1 lore raw

PATCH 1/1 OMAP3: Beagle: Set pinmux conditionally for Rev C boards

Quoted 15 lines · Dirk Behme

The Beagle Rev C boards pull UART2 from an alternate set of balls.

---

 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
===================================================================

board/omap3/beagle/beagle.c int misc_init_r(void) · line 134

Quoted 5 lines
board/omap3/beagle/beagle.c +2 -0
@@ -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 '('

Quoted 15 lines
board/omap3/beagle/beagle.c +2 -0
+		MUX_BEAGLE_C();
+	}
 }

Index: u-boot-main/board/omap3/beagle/beagle.h
===================================================================

board/omap3/beagle/beagle.h +0 -4
@@ -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*/\

<snip>

Quoted 7 lines

+#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

Best Regards,
J.

author
#2 lore raw

PATCH 1/1 OMAP3: Beagle: Set pinmux conditionally for Rev C boards

Dear Jean-Christophe,

Quoted 38 lines · Jean-Christophe PLAGNIOL-VILLARD
Quoted 15 lines · Dirk Behme

The Beagle Rev C boards pull UART2 from an alternate set of balls.

---

 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
===================================================================

board/omap3/beagle/beagle.c int misc_init_r(void) · line 134

Quoted 5 lines
board/omap3/beagle/beagle.c +2 -0
@@ -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 '('

Quoted 15 lines
board/omap3/beagle/beagle.c +2 -0
+		MUX_BEAGLE_C();
+	}
 }

Index: u-boot-main/board/omap3/beagle/beagle.h
===================================================================

board/omap3/beagle/beagle.h +0 -4
@@ -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*/\

<snip>

Quoted 8 lines
Quoted 7 lines

+#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