← Back to branch summary

~ubuntu-branches/ubuntu/saucy/linux-ti-omap4/saucy-proposed

« back to all changes in this revision

Viewing changes to arch/arm/mach-omap2/omap_phy_internal.c

  • Committer: Package Import Robot
  • Author(s): Paolo Pisati, Paolo Pisati, Stefan Bader, Upstream Kernel Changes
  • Date: 2012-08-15 17:17:43 UTC
  • Revision ID: package-import@ubuntu.com-20120815171743-h5wnuf51xe7pvdid
Tags: 3.5.0-207.13
[ Paolo Pisati ]

* Start new release

[ Stefan Bader ]

* (config) Enable getabis to use local package copies

[ Upstream Kernel Changes ]

* fixup: gargabe collect iva_seq[0|1] init
* [Config] enable all SND_OMAP_SOC_*s
* fixup: cm2xxx_3xxx.o is needed for omap2_cm_read|write_reg
* fixup: add some snd_soc_dai* helper functions
* fixup: s/snd_soc_dpcm_params/snd_soc_dpcm/g
* fixup: typo, no_host_mode and useless SDP4430 init
* fixup: enable again aess hwmod

Show diffs side-by-side

added added

removed removed

Lines of Context:
arch/arm/mach-omap2/omap_phy_internal.c
239
239
 
240
240
        devconf2 &= ~CONF2_OTGMODE;
241
241
        switch (musb_mode) {
242
 
#ifdef  CONFIG_USB_MUSB_HDRC_HCD
243
242
        case MUSB_HOST:         /* Force VBUS valid, ID = 0 */
244
243
                devconf2 |= CONF2_FORCE_HOST;
245
244
                break;
246
 
#endif
247
 
#ifdef  CONFIG_USB_GADGET_MUSB_HDRC
248
245
        case MUSB_PERIPHERAL:   /* Force VBUS valid, ID = 1 */
249
246
                devconf2 |= CONF2_FORCE_DEVICE;
250
247
                break;
251
 
#endif
252
 
#ifdef  CONFIG_USB_MUSB_OTG
253
248
        case MUSB_OTG:          /* Don't override the VBUS/ID comparators */
254
249
                devconf2 |= CONF2_NO_OVERRIDE;
255
250
                break;
256
 
#endif
257
251
        default:
258
252
                pr_info(KERN_INFO "Unsupported mode %u\n", musb_mode);
259
253
        }