← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-linaro-u8500/precise

« back to all changes in this revision

Viewing changes to drivers/usb/otg/twl4030-usb.c

  • Committer: Bazaar Package Importer
  • Author(s): John Rigby, Upstream Fixes, Andy Green, John Rigby
  • Date: 2011-04-14 12:16:06 UTC
  • Revision ID: james.westby@ubuntu.com-20110414121606-b77podkyqgr2oix7
Tags: 2.6.38-1002.3
https://launchpad.net/bugs/745737
https://launchpad.net/bugs/747639
https://launchpad.net/bugs/752900
https://launchpad.net/bugs/745737
https://launchpad.net/bugs/732842
https://launchpad.net/bugs/732912
[ Upstream Fixes ]

* MUSB: shutdown: Make sure block is awake before doing shutdown
  - LP: #745737
* Fixed gpio polarity of gpio USB-phy reset.
  - LP: #747639

[ Andy Green ]

* LINARO: SAUCE: disable CONFIG_OMAP_RESET_CLOCKS
  - LP: #752900

[ John Rigby ]

* Rebase to new upstreams:
  Linux v2.6.38.1
  linaro-linux-2.6.38-upstream-29Mar2011
  Ubuntu-2.6.38-7.35
* SAUCE: OMAP4: clock: wait for module to become accessible on
  a clk enable
  - LP: #745737
* Rebase to new upstreams:
  Linux v2.6.38.2
  linaro-linux-2.6.38-upstream-5Apr2011
  Ubuntu-2.6.38-8.41
  - LP: #732842
* Update configs for device tree, dvfs and lttng
* LINARO: add building of dtb's
* LINARO: SAUCE: Disable lowest operating freqs on omap34xx
  - LP: #732912

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/usb/otg/twl4030-usb.c
275
275
        dev_dbg(twl->dev, "HW_CONDITIONS 0x%02x/%d; link %d\n",
276
276
                        status, status, linkstat);
277
277
 
 
278
        twl->otg.last_event = linkstat;
 
279
 
278
280
        /* REVISIT this assumes host and peripheral controllers
279
281
         * are registered, and that both are active...
280
282
         */
512
514
                else
513
515
                        twl4030_phy_resume(twl);
514
516
 
515
 
                blocking_notifier_call_chain(&twl->otg.notifier, status,
 
517
                atomic_notifier_call_chain(&twl->otg.notifier, status,
516
518
                                twl->otg.gadget);
517
519
        }
518
520
        sysfs_notify(&twl->dev->kobj, NULL, "vbus");
534
536
                        twl->asleep = 0;
535
537
                }
536
538
 
537
 
                blocking_notifier_call_chain(&twl->otg.notifier, status,
 
539
                atomic_notifier_call_chain(&twl->otg.notifier, status,
538
540
                                twl->otg.gadget);
539
541
        }
540
542
        sysfs_notify(&twl->dev->kobj, NULL, "vbus");
623
625
        if (device_create_file(&pdev->dev, &dev_attr_vbus))
624
626
                dev_warn(&pdev->dev, "could not create sysfs file\n");
625
627
 
626
 
        BLOCKING_INIT_NOTIFIER_HEAD(&twl->otg.notifier);
 
628
        ATOMIC_INIT_NOTIFIER_HEAD(&twl->otg.notifier);
627
629
 
628
630
        /* Our job is to use irqs and status from the power module
629
631
         * to keep the transceiver disabled when nothing's connected.