From ad9990a7549c0d8882f72fa4947dd19fbc86ffb1 Mon Sep 17 00:00:00 2001
From: Evan Wilson <evan@oliodevices.com>
Date: Tue, 28 Jan 2014 21:36:14 -0800
Subject: Removed TWL4030 support

---
 board/olio/h1/h1.c         | 45 ---------------------------------------------
 board/olio/h1/h1.h         |  4 ----
 include/configs/omap3_h1.h |  5 -----
 3 files changed, 54 deletions(-)

diff --git a/board/olio/h1/h1.c b/board/olio/h1/h1.c
index e04aa817a..be5d43064 100644
--- a/board/olio/h1/h1.c
+++ b/board/olio/h1/h1.c
@@ -14,7 +14,6 @@
  * SPDX-License-Identifier:	GPL-2.0+
  */
 #include <common.h>
-#include <twl4030.h>
 #include <linux/mtd/nand.h>
 #include <asm/io.h>
 #include <asm/arch/mux.h>
@@ -26,8 +25,6 @@
 #include "h1.h"
 #include <command.h>
 
-#define TWL4030_I2C_BUS			0
-
 DECLARE_GLOBAL_DATA_PTR;
 
 /*
@@ -79,36 +76,6 @@ void get_board_mem_timings(struct board_sdrc_timings *timings)
 }
 #endif
 
-#ifdef CONFIG_VIDEO_OMAP3
-/*
- * Configure DSS to display background color on DVID
- * Configure VENC to display color bar on S-Video
- */
-static void beagle_display_init(void)
-{
-	omap3_dss_venc_config(&venc_config_std_tv, VENC_HEIGHT, VENC_WIDTH);
-	omap3_dss_panel_config(&dvid_cfg_xm);
-}
-
-/*
- * Enable DVI power
- */
-static void beagle_dvi_pup(void)
-{
-	uchar val;
-	#define GPIODATADIR1 (TWL4030_BASEADD_GPIO+3)
-	#define GPIODATAOUT1 (TWL4030_BASEADD_GPIO+6)
-
-	i2c_read(TWL4030_CHIP_GPIO, GPIODATADIR1, 1, &val, 1);
-	val |= 4;
-	i2c_write(TWL4030_CHIP_GPIO, GPIODATADIR1, 1, &val, 1);
-
-	i2c_read(TWL4030_CHIP_GPIO, GPIODATAOUT1, 1, &val, 1);
-	val |= 4;
-	i2c_write(TWL4030_CHIP_GPIO, GPIODATAOUT1, 1, &val, 1);
-}
-#endif
-
 /*
  * Routine: misc_init_r
  * Description: Configure board specific parts
@@ -122,17 +89,7 @@ int misc_init_r(void)
 	/* Enable i2c2 pullup resisters */
 	writel(~(PRG_I2C2_PULLUPRESX), &prog_io_base->io1);
 	printf("Olio H1\n");
-	setenv("beaglerev", "xMC");
 	MUX_BEAGLE_XM();
-	/* Set VAUX2 to 1.8V for EHCI PHY */
-	twl4030_pmrecv_vsel_cfg(TWL4030_PM_RECEIVER_VAUX2_DEDICATED,
-				TWL4030_PM_RECEIVER_VAUX2_VSEL_18,
-				TWL4030_PM_RECEIVER_VAUX2_DEV_GRP,
-				TWL4030_PM_RECEIVER_DEV_GRP_P1);
-
-	setenv("buddy", "none");
-
-	twl4030_power_init();
 
 	/* Set GPIO states before they are made outputs */
 	writel(GPIO23 | GPIO10 | GPIO8 | GPIO2 | GPIO1,
@@ -148,8 +105,6 @@ int misc_init_r(void)
 	dieid_num_r();
 
 #ifdef CONFIG_VIDEO_OMAP3
-	beagle_dvi_pup();
-	beagle_display_init();
 	omap3_dss_enable();
 #endif
 
diff --git a/board/olio/h1/h1.h b/board/olio/h1/h1.h
index c12d0bc3b..ec0c24fb9 100644
--- a/board/olio/h1/h1.h
+++ b/board/olio/h1/h1.h
@@ -12,11 +12,7 @@
 const omap3_sysinfo sysinfo = {
 	DDR_STACKED,
 	"OMAP3 Beagle board",
-#if defined(CONFIG_ENV_IS_IN_ONENAND)
-	"OneNAND",
-#else
 	"NAND",
-#endif
 };
 
 /*
diff --git a/include/configs/omap3_h1.h b/include/configs/omap3_h1.h
index 3334c5219..83d006c91 100644
--- a/include/configs/omap3_h1.h
+++ b/include/configs/omap3_h1.h
@@ -120,11 +120,6 @@
 #define CONFIG_DRIVER_OMAP34XX_I2C	1
 #define CONFIG_VIDEO_OMAP3	/* DSS Support			*/
 
-/*
- * TWL4030
- */
-#define CONFIG_TWL4030_POWER		1
-
 /*
  * Board NAND Info.
  */
-- 
cgit v1.2.3-70-g09d2