DSS2: Beagle: Use gpio_set_value

[pandora-kernel.git] / arch / arm / mach-omap2 / board-omap3beagle.c

diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
index 19702c7..d6622f1 100644 (file)
--- a/arch/arm/mach-omap2/board-omap3beagle.c
+++ b/arch/arm/mach-omap2/board-omap3beagle.c
@@ -25,6 +25,7 @@
 #include <linux/gpio_keys.h>
 
 #include <linux/i2c/twl4030.h>
+#include <linux/omapfb.h>
 
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
@@ -44,6 +45,7 @@
 #include <mach/gpmc.h>
 #include <mach/nand.h>
 #include <mach/mux.h>
+#include <mach/display.h>
 
 
 #define GPMC_CS0_BASE  0x60
@@ -115,19 +117,26 @@ static struct twl4030_usb_data beagle_usb_data = {
        .usb_mode       = T2_USB_MODE_ULPI,
 };
 
+static struct gpio_led gpio_leds[];
+
 static int beagle_twl_gpio_setup(struct device *dev,
                unsigned gpio, unsigned ngpio)
 {
-       /* request_gpio(gpio + 0, "mmc0_cd");
-        * gpio_direction_input(gpio + 0);
+       /* gpio + 0 is "mmc0_cd" (input/IRQ) */
+
+       /* REVISIT: need ehci-omap hooks for external VBUS
+        * power switch and overcurrent detect
         */
 
        gpio_request(gpio + 1, "EHCI_nOC");
        gpio_direction_input(gpio + 1);
 
-       /* gpio + 18 + 0 == ledA, nEN_USB_PWR (out)
-        * gpio + 18 + 1 == ledB, PMU_STAT (out, a LED)
-        */
+       /* TWL4030_GPIO_MAX + 0 == ledA, EHCI nEN_USB_PWR (out, active low) */
+       gpio_request(gpio + TWL4030_GPIO_MAX, "nEN_USB_PWR");
+       gpio_direction_output(gpio + TWL4030_GPIO_MAX, 1);
+
+       /* TWL4030_GPIO_MAX + 1 == ledB, PMU_STAT (out, active low LED) */
+       gpio_leds[2].gpio = gpio + TWL4030_GPIO_MAX + 1;
 
        return 0;
 }
@@ -136,6 +145,7 @@ static struct twl4030_gpio_platform_data beagle_gpio_data = {
        .gpio_base      = OMAP_MAX_GPIO_LINES,
        .irq_base       = TWL4030_GPIO_IRQ_BASE,
        .irq_end        = TWL4030_GPIO_IRQ_END,
+       .use_leds       = true,
        .pullups        = BIT(1),
        .pulldowns      = BIT(2) | BIT(6) | BIT(7) | BIT(8) | BIT(13)
                                | BIT(15) | BIT(16) | BIT(17),
@@ -183,10 +193,6 @@ static struct platform_device omap3_beagle_lcd_device = {
        .id             = -1,
 };
 
-static struct omap_lcd_config omap3_beagle_lcd_config __initdata = {
-       .ctrl_name      = "internal",
-};
-
 static struct gpio_led gpio_leds[] = {
        {
                .name                   = "beagleboard::usr0",
@@ -198,6 +204,11 @@ static struct gpio_led gpio_leds[] = {
                .default_trigger        = "mmc0",
                .gpio                   = 149,
        },
+       {
+               .name                   = "beagleboard::pmu_stat",
+               .gpio                   = -EINVAL,      /* gets replaced */
+               .active_low             = true,
+       },
 };
 
 static struct gpio_led_platform_data gpio_led_info = {
@@ -235,13 +246,98 @@ static struct platform_device keys_gpio = {
        },
 };
 
+/* DSS */
+
+static int beagle_enable_dvi(struct omap_display *display)
+{
+       if (display->hw_config.panel_reset_gpio != -1)
+               gpio_set_value(display->hw_config.panel_reset_gpio, 1);
+
+       return 0;
+}
+
+static void beagle_disable_dvi(struct omap_display *display)
+{
+       if (display->hw_config.panel_reset_gpio != -1)
+               gpio_set_value(display->hw_config.panel_reset_gpio, 0);
+}
+
+static struct omap_dss_display_config beagle_display_data_dvi = {
+       .type = OMAP_DISPLAY_TYPE_DPI,
+       .name = "dvi",
+       .panel_name = "panel-generic",
+       .u.dpi.data_lines = 24,
+       .panel_reset_gpio = 170,
+       .panel_enable = beagle_enable_dvi,
+       .panel_disable = beagle_disable_dvi,
+};
+
+
+static int beagle_panel_enable_tv(struct omap_display *display)
+{
+#define ENABLE_VDAC_DEDICATED           0x03
+#define ENABLE_VDAC_DEV_GRP             0x20
+
+       twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER,
+                       ENABLE_VDAC_DEDICATED,
+                       TWL4030_VDAC_DEDICATED);
+       twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER,
+                       ENABLE_VDAC_DEV_GRP, TWL4030_VDAC_DEV_GRP);
+
+       return 0;
+}
+
+static void beagle_panel_disable_tv(struct omap_display *display)
+{
+       twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER, 0x00,
+                       TWL4030_VDAC_DEDICATED);
+       twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER, 0x00,
+                       TWL4030_VDAC_DEV_GRP);
+}
+
+static struct omap_dss_display_config beagle_display_data_tv = {
+       .type = OMAP_DISPLAY_TYPE_VENC,
+       .name = "tv",
+       .u.venc.type = OMAP_DSS_VENC_TYPE_SVIDEO,
+       .panel_enable = beagle_panel_enable_tv,
+       .panel_disable = beagle_panel_disable_tv,
+};
+
+static struct omap_dss_board_info beagle_dss_data = {
+       .num_displays = 2,
+       .displays = {
+               &beagle_display_data_dvi,
+               &beagle_display_data_tv,
+       }
+};
+
+static struct platform_device beagle_dss_device = {
+       .name          = "omapdss",
+       .id            = -1,
+       .dev            = {
+               .platform_data = &beagle_dss_data,
+       },
+};
+
+static void __init beagle_display_init(void)
+{
+       int r;
+
+       r = gpio_request(beagle_display_data_dvi.panel_reset_gpio, "DVI reset");
+       if (r < 0) {
+               printk(KERN_ERR "Unable to get DVI reset GPIO\n");
+               return;
+       }
+
+       gpio_direction_output(beagle_display_data_dvi.panel_reset_gpio, 0);
+}
+
 static struct omap_board_config_kernel omap3_beagle_config[] __initdata = {
        { OMAP_TAG_UART,        &omap3_beagle_uart_config },
-       { OMAP_TAG_LCD,         &omap3_beagle_lcd_config },
 };
 
 static struct platform_device *omap3_beagle_devices[] __initdata = {
-       &omap3_beagle_lcd_device,
+       &beagle_dss_device,
        &leds_gpio,
        &keys_gpio,
 };
@@ -299,13 +395,11 @@ static void __init omap3_beagle_init(void)
        hsmmc_init();
 
        omap_cfg_reg(J25_34XX_GPIO170);
-       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();
        omap3beagle_flash_init();
+       beagle_display_init();
 }
 
 static void __init omap3_beagle_map_io(void)