← Back to branch summary

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

« 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, Ubuntu: 3.2.0-19.31, Ubuntu: 3.2.0-19.30
  • Date: 2012-03-21 15:23:51 UTC
  • Revision ID: package-import@ubuntu.com-20120321152351-ya52awpl9cmqlwrs
Tags: 3.2.0-1410.13
https://launchpad.net/bugs/959749
https://launchpad.net/bugs/598251
https://launchpad.net/bugs/959749
https://launchpad.net/bugs/959959
https://launchpad.net/bugs/499557
https://launchpad.net/bugs/952035
https://launchpad.net/bugs/899244
https://launchpad.net/bugs/899244
https://launchpad.net/bugs/872044
https://launchpad.net/bugs/917842
https://launchpad.net/bugs/917842
[ Paolo Pisati ]

* rebased on Ubuntu-3.2.0-19.31

[ Ubuntu: 3.2.0-19.31 ]

* d-i: Add dm-multipath and scsi device handlers
  - LP: #959749
* d-i: Move multipath modules into their own udeb
  - LP: #598251, #959749
* [Config] Auto-detect do_tools setting
* [Config] correctly specify CROSS_COMPILE for tools build
* [Config] CONFIG_DRM_PSB_CDV=n
* Rebase to v3.2.12
* powerpc/pmac: Fix SMP kernels on pre-core99 UP machines
  - LP: #959959
* rebase to v3.2.12

[ Ubuntu: 3.2.0-19.30 ]

* [Config] Fix typeo in the Hyper-V module names
* [Config] Move kernels to "Section: kernel"
  - LP: #499557
* SAUCE: AppArmor: Add ability to load extended policy
* SAUCE: AppArmor: Add the ability to mediate mount
* SAUCE: AppArmor: Add profile introspection file to interface
* SAUCE: AppArmor: basic networking rules
* [Config] Disable CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER
  - LP: #952035
* Rebase to v3.2.10
* [Config] Update configs after rebase to v3.2.10
* Rebase to v3.2.11
* [Config] Disable CONFIG_STUB_POULSBO
  - LP: #899244
* [Config] Add CONFIG_DRM_PSB check to enforcer
  - LP: #899244
* [Config] Drop non-SMP powerpc
* net/hyperv: Use the built-in macro KBUILD_MODNAME for this driver
* x86: Derandom delay_tsc for 64 bit
* Bluetooth: Fix l2cap conn failures for ssp devices
  - LP: #872044
* KVM: x86: extend "struct x86_emulate_ops" with "get_cpuid"
  - LP: #917842
  - CVE-2012-0045
* KVM: x86: fix missing checks in syscall emulation
  - LP: #917842
  - CVE-2012-0045
* rebase to v3.2.11
* rebase to v3.2.10

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_HPD 60 /* Hot plug pin for HDMI */
 
62
#define HDMI_GPIO_CT_CP_HPD 60 /* HPD mode enable/disable */
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 */
64
66
#define DLP_POWER_ON_GPIO       40
65
67
#define LCD_BL_GPIO             27      /* LCD Backlight GPIO */
66
68
/* PWM2 and TOGGLE3 register offsets */
778
780
                        OMAP_PIN_INPUT_PULLUP);
779
781
        omap_mux_init_signal("hdmi_cec",
780
782
                        OMAP_PIN_INPUT_PULLUP);
781
 
        /* PAD0_HDMI_DDC_SCL_PAD1_HDMI_DDC_SDA */
782
783
        omap_mux_init_signal("hdmi_ddc_scl",
783
784
                        OMAP_PIN_INPUT_PULLUP);
784
785
        omap_mux_init_signal("hdmi_ddc_sda",
801
802
}
802
803
 
803
804
static struct gpio sdp4430_hdmi_gpios[] = {
804
 
        { HDMI_GPIO_HPD,        GPIOF_OUT_INIT_HIGH,    "hdmi_gpio_hpd"   },
 
805
        { HDMI_GPIO_CT_CP_HPD, GPIOF_OUT_INIT_HIGH, "hdmi_gpio_ct_cp_hpd" },
805
806
        { HDMI_GPIO_LS_OE,      GPIOF_OUT_INIT_HIGH,    "hdmi_gpio_ls_oe" },
 
807
        { HDMI_GPIO_HPD, GPIOF_DIR_IN, "hdmi_gpio_hpd" },
806
808
};
807
809
 
808
810
static int sdp4430_panel_enable_hdmi(struct omap_dss_device *dssdev)
819
821
 
820
822
static void sdp4430_panel_disable_hdmi(struct omap_dss_device *dssdev)
821
823
{
822
 
        gpio_free(HDMI_GPIO_LS_OE);
823
 
        gpio_free(HDMI_GPIO_HPD);
 
824
        gpio_free_array(sdp4430_hdmi_gpios, ARRAY_SIZE(sdp4430_hdmi_gpios));
824
825
}
825
826
 
826
827
static struct nokia_dsi_panel_data dsi1_panel = {
937
938
                pr_err("%s: Could not get lcd2_reset_gpio\n", __func__);
938
939
}
939
940
 
 
941
static struct omap_dss_hdmi_data sdp4430_hdmi_data = {
 
942
        .hpd_gpio = HDMI_GPIO_HPD,
 
943
};
 
944
 
940
945
static struct omap_dss_device sdp4430_hdmi_device = {
941
946
        .name = "hdmi",
942
947
        .driver_name = "hdmi_panel",
944
949
        .platform_enable = sdp4430_panel_enable_hdmi,
945
950
        .platform_disable = sdp4430_panel_disable_hdmi,
946
951
        .channel = OMAP_DSS_CHANNEL_DIGIT,
 
952
        .data = &sdp4430_hdmi_data,
947
953
};
948
954
 
949
955
static struct picodlp_panel_data sdp4430_picodlp_pdata = {
1029
1035
        sdp4430_lcd_init();
1030
1036
        sdp4430_picodlp_init();
1031
1037
        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);
1032
1042
        /*
1033
1043
         * CONTROL_I2C_1: HDMI_DDC_SDA_PULLUPRESX (bit 28) and
1034
1044
         * HDMI_DDC_SCL_PULLUPRESX (bit 24) are set to disable