← Back to branch summary

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

« back to all changes in this revision

Viewing changes to include/linux/usb/otg.h

  • 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:
include/linux/usb/otg.h
66
66
 
67
67
        u8                      default_a;
68
68
        enum usb_otg_state      state;
 
69
        enum usb_xceiv_events   last_event;
69
70
 
70
71
        struct usb_bus          *host;
71
72
        struct usb_gadget       *gadget;
74
75
        void __iomem                    *io_priv;
75
76
 
76
77
        /* for notification of usb_xceiv_events */
77
 
        struct blocking_notifier_head   notifier;
 
78
        struct atomic_notifier_head     notifier;
78
79
 
79
80
        /* to pass extra port status to the root hub */
80
81
        u16                     port_status;
234
235
static inline int
235
236
otg_register_notifier(struct otg_transceiver *otg, struct notifier_block *nb)
236
237
{
237
 
        return blocking_notifier_chain_register(&otg->notifier, nb);
 
238
        return atomic_notifier_chain_register(&otg->notifier, nb);
238
239
}
239
240
 
240
241
static inline void
241
242
otg_unregister_notifier(struct otg_transceiver *otg, struct notifier_block *nb)
242
243
{
243
 
        blocking_notifier_chain_unregister(&otg->notifier, nb);
 
244
        atomic_notifier_chain_unregister(&otg->notifier, nb);
244
245
}
245
246
 
246
247
/* for OTG controller drivers (and maybe other stuff) */