← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise

« back to all changes in this revision

Viewing changes to arch/arm/mach-omap2/board-4430sdp.c

  • Committer: Package Import Robot
  • Author(s): Paolo Pisati, Paolo Pisati, Upstream Kernel Changes
  • Date: 2012-03-27 17:01:30 UTC
  • Revision ID: package-import@ubuntu.com-20120327170130-qrvi60snnxty6ibi
Tags: 3.2.0-1411.14
https://launchpad.net/bugs/963512
[ Paolo Pisati ]

* Revert to Ubuntu-3.2.0-1409.12 until we figure out what's wrong with hdmi
  - LP: #963512

[ Upstream Kernel Changes ]

* Revert "Reapply upleveled PMU interrupt patch"
* KBuild: Allow scripts/* to be cross compiled
* LINARO: Use KBUILD_SCRIPTROOT to cross build scripts

Show diffs side-by-side

added added

removed removed

Lines of Context:
arch/arm/mach-omap2/board-4430sdp.c
59
59
#define ETH_KS8851_QUART                138
60
60
#define OMAP4_SFH7741_SENSOR_OUTPUT_GPIO        184
61
61
#define OMAP4_SFH7741_ENABLE_GPIO               188
62
 
#define HDMI_GPIO_CT_CP_HPD 60 /* HPD mode enable/disable */
 
62
#define HDMI_GPIO_HPD 60 /* Hot plug pin for HDMI */
63
63
#define HDMI_GPIO_LS_OE 41 /* Level shifter for HDMI */
64
 
#define HDMI_GPIO_HPD  63 /* Hotplug detect */
65
 
#define DISPLAY_SEL_GPIO        59      /* LCD2/PicoDLP switch */
66
64
#define DLP_POWER_ON_GPIO       40
67
65
#define LCD_BL_GPIO             27      /* LCD Backlight GPIO */
68
66
/* PWM2 and TOGGLE3 register offsets */
780
778
                        OMAP_PIN_INPUT_PULLUP);
781
779
        omap_mux_init_signal("hdmi_cec",
782
780
                        OMAP_PIN_INPUT_PULLUP);
 
781
        /* PAD0_HDMI_DDC_SCL_PAD1_HDMI_DDC_SDA */
783
782
        omap_mux_init_signal("hdmi_ddc_scl",
784
783
                        OMAP_PIN_INPUT_PULLUP);
785
784
        omap_mux_init_signal("hdmi_ddc_sda",
802
801
}
803
802
 
804
803
static struct gpio sdp4430_hdmi_gpios[] = {
805
 
        { HDMI_GPIO_CT_CP_HPD, GPIOF_OUT_INIT_HIGH, "hdmi_gpio_ct_cp_hpd" },
 
804
        { HDMI_GPIO_HPD,        GPIOF_OUT_INIT_HIGH,    "hdmi_gpio_hpd"   },
806
805
        { HDMI_GPIO_LS_OE,      GPIOF_OUT_INIT_HIGH,    "hdmi_gpio_ls_oe" },
807
 
        { HDMI_GPIO_HPD, GPIOF_DIR_IN, "hdmi_gpio_hpd" },
808
806
};
809
807
 
810
808
static int sdp4430_panel_enable_hdmi(struct omap_dss_device *dssdev)
821
819
 
822
820
static void sdp4430_panel_disable_hdmi(struct omap_dss_device *dssdev)
823
821
{
824
 
        gpio_free_array(sdp4430_hdmi_gpios, ARRAY_SIZE(sdp4430_hdmi_gpios));
 
822
        gpio_free(HDMI_GPIO_LS_OE);
 
823
        gpio_free(HDMI_GPIO_HPD);
825
824
}
826
825
 
827
826
static struct nokia_dsi_panel_data dsi1_panel = {
938
937
                pr_err("%s: Could not get lcd2_reset_gpio\n", __func__);
939
938
}
940
939
 
941
 
static struct omap_dss_hdmi_data sdp4430_hdmi_data = {
942
 
        .hpd_gpio = HDMI_GPIO_HPD,
943
 
};
944
 
 
945
940
static struct omap_dss_device sdp4430_hdmi_device = {
946
941
        .name = "hdmi",
947
942
        .driver_name = "hdmi_panel",
949
944
        .platform_enable = sdp4430_panel_enable_hdmi,
950
945
        .platform_disable = sdp4430_panel_disable_hdmi,
951
946
        .channel = OMAP_DSS_CHANNEL_DIGIT,
952
 
        .data = &sdp4430_hdmi_data,
953
947
};
954
948
 
955
949
static struct picodlp_panel_data sdp4430_picodlp_pdata = {
1035
1029
        sdp4430_lcd_init();
1036
1030
        sdp4430_picodlp_init();
1037
1031
        omap_display_init(&sdp4430_dss_data);
1038
 
 
1039
 
        omap_mux_init_gpio(HDMI_GPIO_LS_OE, OMAP_PIN_OUTPUT);
1040
 
        omap_mux_init_gpio(HDMI_GPIO_CT_CP_HPD, OMAP_PIN_OUTPUT);
1041
 
        omap_mux_init_gpio(HDMI_GPIO_HPD, OMAP_PIN_INPUT_PULLDOWN);
1042
1032
        /*
1043
1033
         * CONTROL_I2C_1: HDMI_DDC_SDA_PULLUPRESX (bit 28) and
1044
1034
         * HDMI_DDC_SCL_PULLUPRESX (bit 24) are set to disable