Patchwork [U-Boot,v2] OMAP3: BeagleBoard: add more expansionboard IDs

login
register
mail settings
Submitter Jason Kridner
Date March 3, 2011, 7:51 p.m.
Message ID <1299181865-31632-1-git-send-email-jkridner@beagleboard.org>
Download mbox | patch
Permalink /patch/85333/
State Accepted
Commit ee8485fd84418eff0caa89ea1c9fa7a6701868cc
Delegated to: Sandeep Paulraj
Headers show

Comments

Jason Kridner - March 3, 2011, 7:51 p.m.
From: Koen Kooi <koen@dominion.thruhere.net>

Information on configurations pulled from
http://www.elinux.org/BeagleBoardPinMux#Vendor_and_Device_IDs

Boards added:
* Added BeagleBoardToys WiFi, VGA and LCD boards
* Added KBADC Beagle FPGA board
* Added Brainmux LCDog and LCDog Touch
* Added Liquidware BeagleTouch
---
v2 updates
  * Feedback from http://www.mail-archive.com/u-boot@lists.denx.de/msg41851.html
    - Removed unused definitions
    - The detection mechanism *is* consistent, simple read from an EEPROM
  * Added BeagleBoardToys board configurations
  * Made definition names consistent as VENDOR_BOARD

Signed-off-by: Jason Kridner <jkridner@beagleboard.org>
Cc: Koen Kooi <koen@dominion.thruhere.net>
---
 board/ti/beagle/beagle.c |   30 +++++++++++++++++++++++++++++-
 board/ti/beagle/beagle.h |   12 ++++++++++++
 2 files changed, 41 insertions(+), 1 deletions(-)
Sandeep Paulraj - April 18, 2011, 9:37 p.m.
> From: Koen Kooi <koen@dominion.thruhere.net>
> 
> Information on configurations pulled from
> http://www.elinux.org/BeagleBoardPinMux#Vendor_and_Device_IDs
> 
> Boards added:
> * Added BeagleBoardToys WiFi, VGA and LCD boards
> * Added KBADC Beagle FPGA board
> * Added Brainmux LCDog and LCDog Touch
> * Added Liquidware BeagleTouch
> ---
> v2 updates
>   * Feedback from http://www.mail-archive.com/u-
> boot@lists.denx.de/msg41851.html
>     - Removed unused definitions
>     - The detection mechanism *is* consistent, simple read from an EEPROM
>   * Added BeagleBoardToys board configurations
>   * Made definition names consistent as VENDOR_BOARD
> 
> Signed-off-by: Jason Kridner <jkridner@beagleboard.org>

Pushed to u-boot-ti

Patch

diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c
index 4049606..e05232f 100644
--- a/board/ti/beagle/beagle.c
+++ b/board/ti/beagle/beagle.c
@@ -48,7 +48,12 @@ 
 #define TINCANTOOLS_TRAINER		0x04000100
 #define TINCANTOOLS_SHOWDOG		0x03000100
 #define KBADC_BEAGLEFPGA		0x01000600
-
+#define LW_BEAGLETOUCH			0x01000700
+#define BRAINMUX_LCDOG			0x01000800
+#define BRAINMUX_LCDOGTOUCH		0x02000800
+#define BBTOYS_WIFI			0x01000B00
+#define BBTOYS_VGA			0x02000B00
+#define BBTOYS_LCD			0x03000B00
 #define BEAGLE_NO_EEPROM		0xffffffff
 
 DECLARE_GLOBAL_DATA_PTR;
@@ -239,6 +244,29 @@  int misc_init_r(void)
 		MUX_KBADC_BEAGLEFPGA();
 		setenv("buddy", "beaglefpga");
 		break;
+	case LW_BEAGLETOUCH:
+		printf("Recognized Liquidware BeagleTouch board\n");
+		setenv("buddy", "beagletouch");
+		break;
+	case BRAINMUX_LCDOG:
+		printf("Recognized Brainmux LCDog board\n");
+		setenv("buddy", "lcdog");
+		break;
+	case BRAINMUX_LCDOGTOUCH:
+		printf("Recognized Brainmux LCDog Touch board\n");
+		setenv("buddy", "lcdogtouch");
+		break;
+	case BBTOYS_WIFI:
+		printf("Recognized BeagleBoardToys WiFi board\n");
+		MUX_BBTOYS_WIFI()
+		setenv("buddy", "bbtoys-wifi");
+		break;;
+	case BBTOYS_VGA:
+		printf("Recognized BeagleBoardToys VGA board\n");
+		break;;
+	case BBTOYS_LCD:
+		printf("Recognized BeagleBoardToys LCD board\n");
+		break;;
 	case BEAGLE_NO_EEPROM:
 		printf("No EEPROM on expansion board\n");
 		setenv("buddy", "none");
diff --git a/board/ti/beagle/beagle.h b/board/ti/beagle/beagle.h
index b0e26e5..0f21790 100644
--- a/board/ti/beagle/beagle.h
+++ b/board/ti/beagle/beagle.h
@@ -458,4 +458,16 @@  const omap3_sysinfo sysinfo = {
 	MUX_VAL(CP(MCBSP1_DR),      (IEN  | PTU | EN  | M1)) /*MCSPI4_SOMI*/\
 	MUX_VAL(CP(MCBSP1_FSX),     (IDIS | PTU | DIS | M1)) /*MCSPI4_CS0*/
 
+#define MUX_BBTOYS_WIFI() \
+	MUX_VAL(CP(MMC2_CLK),       (IEN  | PTU | EN  | M0)) /*MMC2_CLK*/\
+	MUX_VAL(CP(MMC2_CMD),       (IEN  | PTU | EN  | M0)) /*MMC2_CMD*/\
+	MUX_VAL(CP(MMC2_DAT0),      (IEN  | PTU | EN  | M0)) /*MMC2_DAT0*/\
+	MUX_VAL(CP(MMC2_DAT1),      (IEN  | PTU | EN  | M0)) /*MMC2_DAT1*/\
+	MUX_VAL(CP(MMC2_DAT2),      (IEN  | PTU | EN  | M0)) /*MMC2_DAT2*/\
+	MUX_VAL(CP(MMC2_DAT3),      (IEN  | PTU | EN  | M0)) /*MMC2_DAT3*/\
+	MUX_VAL(CP(MMC2_DAT4),      (IDIS | PTU | EN  | M4)) /*GPIO_136 FM_EN/BT_WU*/\
+	MUX_VAL(CP(MMC2_DAT5),      (IEN  | PTU | EN  | M4)) /*GPIO_137 WLAN_IRQ*/\
+	MUX_VAL(CP(MMC2_DAT6),      (IDIS | PTU | EN  | M4)) /*GPIO_138 BT_EN*/\
+	MUX_VAL(CP(MMC2_DAT7),      (IDIS | PTU | EN  | M4)) /*GPIO_139 WLAN_EN*/
+
 #endif