← Back to branch summary

~ubuntu-branches/debian/experimental/linux-2.6/experimental

« back to all changes in this revision

Viewing changes to drivers/usb/host/ehci-fsl.h

  • Committer: Package Import Robot
  • Author(s): maximilian attems, maximilian attems, Ben Hutchings
  • Date: 2012-06-06 10:25:57 UTC
  • mfrom: (1.2.38)
  • Revision ID: package-import@ubuntu.com-20120606102557-b9j3506wcwrqrnx8
Tags: 3.4.1-1~experimental.1
* New upstream release: http://kernelnewbies.org/Linux_3.4
* New upstream stable update:
  http://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.4.1

[ maximilian attems ]
* Enable DM_VERITY, NF_CONNTRACK_TIMEOUT, NF_CT_NETLINK_TIMEOUT,
  IP_NF_MATCH_RPFILTER, IP6_NF_MATCH_RPFILTER, NETFILTER_NETLINK_ACCT,
  NETFILTER_XT_MATCH_NFACCT, NET_SCH_PLUG, SCSI_UFSHCD, SCSI_VIRTIO,
  NET_TEAM, ATH6KL.

[ Ben Hutchings ]
* DFSG: Remove the new vs6624 driver, which contains non-free firmware
* aufs: Update to aufs3.4-20120521
* [rt] Update to 3.4-rt8 and reenable

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/usb/host/ehci-fsl.h
19
19
#define _EHCI_FSL_H
20
20
 
21
21
/* offsets for the non-ehci registers in the FSL SOC USB controller */
 
22
#define FSL_SOC_USB_SBUSCFG     0x90
 
23
#define SBUSCFG_INCR8           0x02    /* INCR8, specified */
22
24
#define FSL_SOC_USB_ULPIVP      0x170
23
25
#define FSL_SOC_USB_PORTSC1     0x184
24
26
#define PORT_PTS_MSK            (3<<30)
46
48
#define FSL_SOC_USB_SICTRL      0x410   /* NOTE: big-endian */
47
49
#define FSL_SOC_USB_CTRL        0x500   /* NOTE: big-endian */
48
50
#define CTRL_UTMI_PHY_EN        (1<<9)
 
51
#define CTRL_PHY_CLK_VALID      (1 << 17)
49
52
#define SNOOP_SIZE_2GB          0x1e
50
53
#endif                          /* _EHCI_FSL_H */