diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-21 18:42:20 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-21 18:42:53 -0400 |
commit | 93ded9b8fd42abe2c3607097963d8de6ad9117eb (patch) | |
tree | 407a3adcf885ffd75a4d3299eaefd9b171b739be /drivers/usb/host/ehci-fsl.c | |
parent | 6d52dcbe56ca8464bcad56d98a64bcd781596663 (diff) | |
parent | f756cbd458ab71c996a069cb3928fb1e2d7cd9cc (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (100 commits)
usb-storage: revert DMA-alignment change for Wireless USB
USB: use reset_resume when normal resume fails
usb_gadget: composite cdc gadget fault handling
usb gadget: minor USBCV fix for composite framework
USB: Fix bug with byte order in isp116x-hcd.c fio write/read
USB: fix double kfree in ipaq in error case
USB: fix build error in cdc-acm for CONFIG_PM=n
USB: remove board-specific UP2OCR configuration from pxa27x-udc
USB: EHCI: Reconciling USB register differences on MPC85xx vs MPC83xx
USB: Fix pointer/int cast in USB devio code
usb gadget: g_cdc dependso on NET
USB: Au1xxx-usb: suspend/resume support.
USB: Au1xxx-usb: clean up ohci/ehci bus glue sources.
usbfs: don't store bad pointers in registration
usbfs: fix race between open and unregister
usbfs: simplify the lookup-by-minor routines
usbfs: send disconnect signals when device is unregistered
USB: Force unbinding of drivers lacking reset_resume or other methods
USB: ohci-pnx4008: I2C cleanups and fixes
USB: debug port converter does not accept more than 8 byte packets
...
Diffstat (limited to 'drivers/usb/host/ehci-fsl.c')
-rw-r--r-- | drivers/usb/host/ehci-fsl.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/drivers/usb/host/ehci-fsl.c b/drivers/usb/host/ehci-fsl.c index 7370d6187c64..01c3da34f678 100644 --- a/drivers/usb/host/ehci-fsl.c +++ b/drivers/usb/host/ehci-fsl.c | |||
@@ -56,7 +56,7 @@ int usb_hcd_fsl_probe(const struct hc_driver *driver, | |||
56 | pdata = (struct fsl_usb2_platform_data *)pdev->dev.platform_data; | 56 | pdata = (struct fsl_usb2_platform_data *)pdev->dev.platform_data; |
57 | if (!pdata) { | 57 | if (!pdata) { |
58 | dev_err(&pdev->dev, | 58 | dev_err(&pdev->dev, |
59 | "No platform data for %s.\n", pdev->dev.bus_id); | 59 | "No platform data for %s.\n", dev_name(&pdev->dev)); |
60 | return -ENODEV; | 60 | return -ENODEV; |
61 | } | 61 | } |
62 | 62 | ||
@@ -69,7 +69,7 @@ int usb_hcd_fsl_probe(const struct hc_driver *driver, | |||
69 | (pdata->operating_mode == FSL_USB2_DR_OTG))) { | 69 | (pdata->operating_mode == FSL_USB2_DR_OTG))) { |
70 | dev_err(&pdev->dev, | 70 | dev_err(&pdev->dev, |
71 | "Non Host Mode configured for %s. Wrong driver linked.\n", | 71 | "Non Host Mode configured for %s. Wrong driver linked.\n", |
72 | pdev->dev.bus_id); | 72 | dev_name(&pdev->dev)); |
73 | return -ENODEV; | 73 | return -ENODEV; |
74 | } | 74 | } |
75 | 75 | ||
@@ -77,12 +77,12 @@ int usb_hcd_fsl_probe(const struct hc_driver *driver, | |||
77 | if (!res) { | 77 | if (!res) { |
78 | dev_err(&pdev->dev, | 78 | dev_err(&pdev->dev, |
79 | "Found HC with no IRQ. Check %s setup!\n", | 79 | "Found HC with no IRQ. Check %s setup!\n", |
80 | pdev->dev.bus_id); | 80 | dev_name(&pdev->dev)); |
81 | return -ENODEV; | 81 | return -ENODEV; |
82 | } | 82 | } |
83 | irq = res->start; | 83 | irq = res->start; |
84 | 84 | ||
85 | hcd = usb_create_hcd(driver, &pdev->dev, pdev->dev.bus_id); | 85 | hcd = usb_create_hcd(driver, &pdev->dev, dev_name(&pdev->dev)); |
86 | if (!hcd) { | 86 | if (!hcd) { |
87 | retval = -ENOMEM; | 87 | retval = -ENOMEM; |
88 | goto err1; | 88 | goto err1; |
@@ -92,7 +92,7 @@ int usb_hcd_fsl_probe(const struct hc_driver *driver, | |||
92 | if (!res) { | 92 | if (!res) { |
93 | dev_err(&pdev->dev, | 93 | dev_err(&pdev->dev, |
94 | "Found HC with no register addr. Check %s setup!\n", | 94 | "Found HC with no register addr. Check %s setup!\n", |
95 | pdev->dev.bus_id); | 95 | dev_name(&pdev->dev)); |
96 | retval = -ENODEV; | 96 | retval = -ENODEV; |
97 | goto err2; | 97 | goto err2; |
98 | } | 98 | } |
@@ -132,7 +132,7 @@ int usb_hcd_fsl_probe(const struct hc_driver *driver, | |||
132 | err2: | 132 | err2: |
133 | usb_put_hcd(hcd); | 133 | usb_put_hcd(hcd); |
134 | err1: | 134 | err1: |
135 | dev_err(&pdev->dev, "init %s fail, %d\n", pdev->dev.bus_id, retval); | 135 | dev_err(&pdev->dev, "init %s fail, %d\n", dev_name(&pdev->dev), retval); |
136 | return retval; | 136 | return retval; |
137 | } | 137 | } |
138 | 138 | ||
@@ -230,8 +230,13 @@ static void mpc83xx_usb_setup(struct usb_hcd *hcd) | |||
230 | 230 | ||
231 | /* put controller in host mode. */ | 231 | /* put controller in host mode. */ |
232 | ehci_writel(ehci, 0x00000003, non_ehci + FSL_SOC_USB_USBMODE); | 232 | ehci_writel(ehci, 0x00000003, non_ehci + FSL_SOC_USB_USBMODE); |
233 | #ifdef CONFIG_PPC_85xx | ||
234 | out_be32(non_ehci + FSL_SOC_USB_PRICTRL, 0x00000008); | ||
235 | out_be32(non_ehci + FSL_SOC_USB_AGECNTTHRSH, 0x00000080); | ||
236 | #else | ||
233 | out_be32(non_ehci + FSL_SOC_USB_PRICTRL, 0x0000000c); | 237 | out_be32(non_ehci + FSL_SOC_USB_PRICTRL, 0x0000000c); |
234 | out_be32(non_ehci + FSL_SOC_USB_AGECNTTHRSH, 0x00000040); | 238 | out_be32(non_ehci + FSL_SOC_USB_AGECNTTHRSH, 0x00000040); |
239 | #endif | ||
235 | out_be32(non_ehci + FSL_SOC_USB_SICTRL, 0x00000001); | 240 | out_be32(non_ehci + FSL_SOC_USB_SICTRL, 0x00000001); |
236 | } | 241 | } |
237 | 242 | ||