~ubuntu-branches/ubuntu/quantal/linux-lowlatency/quantal

« back to all changes in this revision

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

  • Committer: Package Import Robot
  • Author(s): Luke Yelavich, Stefan Bader, Tim Gardner, Luke Yelavich, Upstream Kernel Changes, Andy Whitcroft, Colin Watson, John Johansen, Leann Ogasawara, Eugeni Dodonov, Seth Forshee, Wu Fengguang
  • Date: 2012-03-21 23:51:57 UTC
  • Revision ID: package-import@ubuntu.com-20120321235157-rqb6rpvyitir8dpj
Tags: 3.2.0-19.27
[ Stefan Bader ]

* d-i: Add dm-multipath and scsi device handlers
  - LP: #959749
* d-i: Move multipath modules into their own udeb
  - LP: #598251, #959749

[ Tim Gardner ]

* [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

[ Luke Yelavich ]
* UBUNTU: Look for releases marked Lowlatency instead of Ubuntu
* UBUNTU: [Config] Adjust Poulsbo config options to match precise mainline,
  to satisfy enforcer

[ Upstream Kernel Changes ]

* powerpc/pmac: Fix SMP kernels on pre-core99 UP machines
  - LP: #959959
* rebase to v3.2.12

[ Andy Whitcroft ]

* [Config] Fix typeo in the Hyper-V module names

[ Colin Watson ]

* [Config] Move kernels to "Section: kernel"
  - LP: #499557

[ John Johansen ]

* 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

[ Leann Ogasawara ]

* [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

[ Tim Gardner ]

* [Config] Drop non-SMP powerpc

[ Upstream Kernel Changes ]

* 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

[ Andy Whitcroft ]

* [Config] restore build-% shortcut
* SAUCE: ata_piix: defer disks to the Hyper-V drivers by default
  - LP: #929545, #942316

[ Eugeni Dodonov ]

* SAUCE: drm: give up on edid retries when i2c bus is not responding
  - LP: #855124

[ Seth Forshee ]

* SAUCE: (drop after 3.3) platform/x86: Add driver for Apple gmux device
  - LP: #925544

[ Upstream Kernel Changes ]

* bsg: fix sysfs link remove warning
  - LP: #946928
* regset: Prevent null pointer reference on readonly regsets
  - LP: #949905
  - CVE-2012-1097
* regset: Return -EFAULT, not -EIO, on host-side memory fault
  - LP: #949905
  - CVE-2012-1097

[ Wu Fengguang ]

* SAUCE: (drop after 3.4) ALSA: hda - add id for Atom Cedar Trail HDMI
  codec

Show diffs side-by-side

added added

removed removed

Lines of Context:
51
51
#define ETH_KS8851_QUART                138
52
52
#define OMAP4_SFH7741_SENSOR_OUTPUT_GPIO        184
53
53
#define OMAP4_SFH7741_ENABLE_GPIO               188
54
 
#define HDMI_GPIO_HPD 60 /* Hot plug pin for HDMI */
 
54
#define HDMI_GPIO_CT_CP_HPD 60 /* HPD mode enable/disable */
55
55
#define HDMI_GPIO_LS_OE 41 /* Level shifter for HDMI */
 
56
#define HDMI_GPIO_HPD  63 /* Hotplug detect */
56
57
#define DISPLAY_SEL_GPIO        59      /* LCD2/PicoDLP switch */
57
58
#define DLP_POWER_ON_GPIO       40
58
59
 
596
597
 
597
598
static void sdp4430_hdmi_mux_init(void)
598
599
{
599
 
        /* PAD0_HDMI_HPD_PAD1_HDMI_CEC */
600
 
        omap_mux_init_signal("hdmi_hpd",
601
 
                        OMAP_PIN_INPUT_PULLUP);
602
600
        omap_mux_init_signal("hdmi_cec",
603
601
                        OMAP_PIN_INPUT_PULLUP);
604
 
        /* PAD0_HDMI_DDC_SCL_PAD1_HDMI_DDC_SDA */
605
602
        omap_mux_init_signal("hdmi_ddc_scl",
606
603
                        OMAP_PIN_INPUT_PULLUP);
607
604
        omap_mux_init_signal("hdmi_ddc_sda",
609
606
}
610
607
 
611
608
static struct gpio sdp4430_hdmi_gpios[] = {
612
 
        { HDMI_GPIO_HPD,        GPIOF_OUT_INIT_HIGH,    "hdmi_gpio_hpd"   },
 
609
        { HDMI_GPIO_CT_CP_HPD, GPIOF_OUT_INIT_HIGH, "hdmi_gpio_ct_cp_hpd" },
613
610
        { HDMI_GPIO_LS_OE,      GPIOF_OUT_INIT_HIGH,    "hdmi_gpio_ls_oe" },
 
611
        { HDMI_GPIO_HPD, GPIOF_DIR_IN, "hdmi_gpio_hpd" },
614
612
};
615
613
 
616
614
static int sdp4430_panel_enable_hdmi(struct omap_dss_device *dssdev)
627
625
 
628
626
static void sdp4430_panel_disable_hdmi(struct omap_dss_device *dssdev)
629
627
{
630
 
        gpio_free(HDMI_GPIO_LS_OE);
631
 
        gpio_free(HDMI_GPIO_HPD);
 
628
        gpio_free_array(sdp4430_hdmi_gpios, ARRAY_SIZE(sdp4430_hdmi_gpios));
632
629
}
633
630
 
634
631
static struct nokia_dsi_panel_data dsi1_panel = {
744
741
                pr_err("%s: Could not get lcd2_reset_gpio\n", __func__);
745
742
}
746
743
 
 
744
static struct omap_dss_hdmi_data sdp4430_hdmi_data = {
 
745
        .hpd_gpio = HDMI_GPIO_HPD,
 
746
};
 
747
 
747
748
static struct omap_dss_device sdp4430_hdmi_device = {
748
749
        .name = "hdmi",
749
750
        .driver_name = "hdmi_panel",
751
752
        .platform_enable = sdp4430_panel_enable_hdmi,
752
753
        .platform_disable = sdp4430_panel_disable_hdmi,
753
754
        .channel = OMAP_DSS_CHANNEL_DIGIT,
 
755
        .data = &sdp4430_hdmi_data,
754
756
};
755
757
 
756
758
static struct picodlp_panel_data sdp4430_picodlp_pdata = {
828
830
        sdp4430_hdmi_mux_init();
829
831
        sdp4430_picodlp_init();
830
832
        omap_display_init(&sdp4430_dss_data);
 
833
 
 
834
        omap_mux_init_gpio(HDMI_GPIO_LS_OE, OMAP_PIN_OUTPUT);
 
835
        omap_mux_init_gpio(HDMI_GPIO_CT_CP_HPD, OMAP_PIN_OUTPUT);
 
836
        omap_mux_init_gpio(HDMI_GPIO_HPD, OMAP_PIN_INPUT_PULLDOWN);
831
837
}
832
838
 
833
839
#ifdef CONFIG_OMAP_MUX