lkml.org 
[lkml]   [2012]   [Mar]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[ 51/68] OMAP: 4430SDP/Panda: add HDMI HPD gpio
    3.0-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Tomi Valkeinen <tomi.valkeinen@ti.com>

    commit aa74274b464d4aa24703963ac89a0ee942d5d267 upstream.

    Both Panda and 4430SDP use GPIO 63 as HDMI hot-plug-detect. Configure
    this GPIO in the board files.

    Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
    Acked-by: Tony Lindgren <tony@atomide.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>


    ---
    arch/arm/mach-omap2/board-4430sdp.c | 3 +++
    arch/arm/mach-omap2/board-omap4panda.c | 3 +++
    2 files changed, 6 insertions(+)

    --- a/arch/arm/mach-omap2/board-4430sdp.c
    +++ b/arch/arm/mach-omap2/board-4430sdp.c
    @@ -51,6 +51,7 @@
    #define OMAP4_SFH7741_ENABLE_GPIO 188
    #define HDMI_GPIO_CT_CP_HPD 60 /* HPD mode enable/disable */
    #define HDMI_GPIO_LS_OE 41 /* Level shifter for HDMI */
    +#define HDMI_GPIO_HPD 63 /* Hotplug detect */

    static const int sdp4430_keymap[] = {
    KEY(0, 0, KEY_E),
    @@ -589,6 +590,7 @@ static void sdp4430_hdmi_mux_init(void)
    static struct gpio sdp4430_hdmi_gpios[] = {
    { HDMI_GPIO_CT_CP_HPD, GPIOF_OUT_INIT_HIGH, "hdmi_gpio_ct_cp_hpd" },
    { HDMI_GPIO_LS_OE, GPIOF_OUT_INIT_HIGH, "hdmi_gpio_ls_oe" },
    + { HDMI_GPIO_HPD, GPIOF_DIR_IN, "hdmi_gpio_hpd" },
    };

    static int sdp4430_panel_enable_hdmi(struct omap_dss_device *dssdev)
    @@ -634,6 +636,7 @@ void omap_4430sdp_display_init(void)

    omap_mux_init_gpio(HDMI_GPIO_LS_OE, OMAP_PIN_OUTPUT);
    omap_mux_init_gpio(HDMI_GPIO_CT_CP_HPD, OMAP_PIN_OUTPUT);
    + omap_mux_init_gpio(HDMI_GPIO_HPD, OMAP_PIN_INPUT_PULLDOWN);
    }

    #ifdef CONFIG_OMAP_MUX
    --- a/arch/arm/mach-omap2/board-omap4panda.c
    +++ b/arch/arm/mach-omap2/board-omap4panda.c
    @@ -54,6 +54,7 @@
    #define GPIO_WIFI_IRQ 53
    #define HDMI_GPIO_CT_CP_HPD 60 /* HPD mode enable/disable */
    #define HDMI_GPIO_LS_OE 41 /* Level shifter for HDMI */
    +#define HDMI_GPIO_HPD 63 /* Hotplug detect */

    /* wl127x BT, FM, GPS connectivity chip */
    static int wl1271_gpios[] = {46, -1, -1};
    @@ -625,6 +626,7 @@ static void omap4_panda_hdmi_mux_init(vo
    static struct gpio panda_hdmi_gpios[] = {
    { HDMI_GPIO_CT_CP_HPD, GPIOF_OUT_INIT_HIGH, "hdmi_gpio_ct_cp_hpd" },
    { HDMI_GPIO_LS_OE, GPIOF_OUT_INIT_HIGH, "hdmi_gpio_ls_oe" },
    + { HDMI_GPIO_HPD, GPIOF_DIR_IN, "hdmi_gpio_hpd" },
    };

    static int omap4_panda_panel_enable_hdmi(struct omap_dss_device *dssdev)
    @@ -677,6 +679,7 @@ void omap4_panda_display_init(void)

    omap_mux_init_gpio(HDMI_GPIO_LS_OE, OMAP_PIN_OUTPUT);
    omap_mux_init_gpio(HDMI_GPIO_CT_CP_HPD, OMAP_PIN_OUTPUT);
    + omap_mux_init_gpio(HDMI_GPIO_HPD, OMAP_PIN_INPUT_PULLDOWN);
    }

    static void __init omap4_panda_init(void)



    \
     
     \ /
      Last update: 2012-03-09 21:03    [W:0.025 / U:61.424 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site