On Tue, Apr 27, 2010 at 10:58 AM, Koen Kooi <koen@xxxxxxxxxxxxxxxxxxxxx> wrote: > No more comments? Can it go in? > > Op 22 apr 2010, om 10:23 heeft Koen Kooi het volgende geschreven: > >> This patch adds DSS2 support to the beagleboard boardfile. DVI and TV-out are supported. >> >> Signed-off-by: Koen Kooi <koen@xxxxxxxxxxxxxxxxxxxxx> >> --- >> Changes since v1: >> * removed beagle_panel_enable_tv() and beagle_panel_disable_tv() >> Changes since v2: >> * changed to REGULATOR_SUPPLY(_name, _dev_name) for dss regulators >> Changes since v3: >> * really remove beagle_panel_enable_tv() and beagle_panel_disable_tv() >> * moved comments to this section >> Changes since v4: >> * remove trailing whitespace >> Changes since v5: >> * fix semicolon typo >> Changes since v6: >> * use gpio_is_valid(dssdev->reset_gpio) >> Changes since v8: >> * fix missing whitespace before __init omap3_beagle_map_io(){} >> >> arch/arm/mach-omap2/board-omap3beagle.c | 101 +++++++++++++++++++++++-------- >> 1 files changed, 75 insertions(+), 26 deletions(-) I also have these changes in one of my trees backported from Tomi Valkeinen's tree. I'm attaching the diff; some of these are cosmetic, but I think the gpio changes make sense, although I don't know if omap_mux_init_gpio is really needed. I think the current proposed patch should go in already, I don't know what we are waiting for. --- 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) -- Felipe Contreras -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html