[v9] board-omap3-beagle: add DSS2 support
diff mbox

Message ID l2l94a0d4531005020858l1a79e4f3hf632a7fab4e4ff33@mail.gmail.com
State New, archived
Delegated to: Tomi Valkeinen
Headers show

Commit Message

Felipe Contreras May 2, 2010, 3:58 p.m. UTC
None

Patch
diff mbox

--- a/arch/arm/mach-omap2/board-omap3beagle.c
+++ b/arch/arm/mach-omap2/board-omap3beagle.c
@@ -39,11 +39,11 @@ 

 #include <plat/board.h>
 #include <plat/common.h>
-#include <plat/display.h>
 #include <plat/gpmc.h>
 #include <plat/nand.h>
 #include <plat/usb.h>
 #include <plat/timer-gp.h>
+#include <plat/display.h>

 #include "mux.h"
 #include "mmc-twl4030.h"
@@ -169,6 +169,10 @@  static void __init beagle_display_init(void)
 {
 	int r;

+#if 0
+	/* is this really needed? */
+	omap_mux_init_gpio(beagle_dvi_device.reset_gpio, OMAP_PIN_INPUT);
+#endif
 	r = gpio_request(beagle_dvi_device.reset_gpio, "DVI reset");
 	if (r < 0) {
 		printk(KERN_ERR "Unable to get DVI reset GPIO\n");
@@ -279,6 +283,7 @@  static struct regulator_init_data beagle_vdac = {
 	.constraints = {
 		.min_uV			= 1800000,
 		.max_uV			= 1800000,
+		.apply_uV		= true,
 		.valid_modes_mask	= REGULATOR_MODE_NORMAL
 					| REGULATOR_MODE_STANDBY,
 		.valid_ops_mask		= REGULATOR_CHANGE_MODE
@@ -414,9 +419,9 @@  static void __init omap3_beagle_init_irq(void)
 }

 static struct platform_device *omap3_beagle_devices[] __initdata = {
+	&beagle_dss_device,
 	&leds_gpio,
 	&keys_gpio,
-	&beagle_dss_device,
 };

 static void __init omap3beagle_flash_init(void)
@@ -485,20 +490,14 @@  static void __init omap3_beagle_init(void)
 			ARRAY_SIZE(omap3_beagle_devices));
 	omap_serial_init();

-	omap_mux_init_gpio(170, OMAP_PIN_INPUT);
-	gpio_request(170, "DVI_nPD");
-	/* REVISIT leave DVI powered down until it's needed ... */
-	gpio_direction_output(170, true);
-
 	usb_musb_init();
 	usb_ehci_init(&ehci_pdata);
 	omap3beagle_flash_init();
+	beagle_display_init();

 	/* Ensure SDRC pins are mux'd for self-refresh */
 	omap_mux_init_signal("sdrc_cke0", OMAP_PIN_OUTPUT);
 	omap_mux_init_signal("sdrc_cke1", OMAP_PIN_OUTPUT);
-
-	beagle_display_init();
 }

 static void __init omap3_beagle_map_io(void)