diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-09 17:38:51 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-09 17:38:51 -0500 |
commit | 5ede3ceb7b2c2843e153a1803edbdc8c56655950 (patch) | |
tree | 4cfa82b619f7d39b671e4a2a213f4d040b09c486 /drivers/usb/host | |
parent | 6d889d03ab1417645e76e129834f76204bae37c0 (diff) | |
parent | 3e2762c8f1141ae8dc708034ea41d6827818c328 (diff) |
Merge tag 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
New feature development
This adds support for new features, and contains stuff from most
platforms. A number of these patches could have fit into other
branches, too, but were small enough not to cause too much
confusion here.
* tag 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (28 commits)
mfd/db8500-prcmu: remove support for early silicon revisions
ARM: ux500: fix the smp_twd clock calculation
ARM: ux500: remove support for early silicon revisions
ARM: ux500: update register files
ARM: ux500: register DB5500 PMU dynamically
ARM: ux500: update ASIC detection for U5500
ARM: ux500: support DB8520
ARM: picoxcell: implement watchdog restart
ARM: OMAP3+: hwmod data: Add the default clockactivity for I2C
ARM: OMAP3: hwmod data: disable multiblock reads on MMC1/2 on OMAP34xx/35xx <= ES2.1
ARM: OMAP: USB: EHCI and OHCI hwmod structures for OMAP4
ARM: OMAP: USB: EHCI and OHCI hwmod structures for OMAP3
ARM: OMAP: hwmod data: Add support for AM35xx UART4/ttyO3
ARM: Orion: Remove address map info from all platform data structures
ARM: Orion: Get address map from plat-orion instead of via platform_data
ARM: Orion: mbus_dram_info consolidation
ARM: Orion: Consolidate the address map setup
ARM: Kirkwood: Add configuration for MPP12 as GPIO
ARM: Kirkwood: Recognize A1 revision of 6282 chip
ARM: ux500: update the MOP500 GPIO assignments
...
Diffstat (limited to 'drivers/usb/host')
-rw-r--r-- | drivers/usb/host/ehci-orion.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/usb/host/ehci-orion.c b/drivers/usb/host/ehci-orion.c index a68a2a5c4b83..6c6a5a3b4ea7 100644 --- a/drivers/usb/host/ehci-orion.c +++ b/drivers/usb/host/ehci-orion.c | |||
@@ -172,7 +172,7 @@ static const struct hc_driver ehci_orion_hc_driver = { | |||
172 | 172 | ||
173 | static void __init | 173 | static void __init |
174 | ehci_orion_conf_mbus_windows(struct usb_hcd *hcd, | 174 | ehci_orion_conf_mbus_windows(struct usb_hcd *hcd, |
175 | struct mbus_dram_target_info *dram) | 175 | const struct mbus_dram_target_info *dram) |
176 | { | 176 | { |
177 | int i; | 177 | int i; |
178 | 178 | ||
@@ -182,7 +182,7 @@ ehci_orion_conf_mbus_windows(struct usb_hcd *hcd, | |||
182 | } | 182 | } |
183 | 183 | ||
184 | for (i = 0; i < dram->num_cs; i++) { | 184 | for (i = 0; i < dram->num_cs; i++) { |
185 | struct mbus_dram_window *cs = dram->cs + i; | 185 | const struct mbus_dram_window *cs = dram->cs + i; |
186 | 186 | ||
187 | wrl(USB_WINDOW_CTRL(i), ((cs->size - 1) & 0xffff0000) | | 187 | wrl(USB_WINDOW_CTRL(i), ((cs->size - 1) & 0xffff0000) | |
188 | (cs->mbus_attr << 8) | | 188 | (cs->mbus_attr << 8) | |
@@ -194,6 +194,7 @@ ehci_orion_conf_mbus_windows(struct usb_hcd *hcd, | |||
194 | static int __devinit ehci_orion_drv_probe(struct platform_device *pdev) | 194 | static int __devinit ehci_orion_drv_probe(struct platform_device *pdev) |
195 | { | 195 | { |
196 | struct orion_ehci_data *pd = pdev->dev.platform_data; | 196 | struct orion_ehci_data *pd = pdev->dev.platform_data; |
197 | const struct mbus_dram_target_info *dram; | ||
197 | struct resource *res; | 198 | struct resource *res; |
198 | struct usb_hcd *hcd; | 199 | struct usb_hcd *hcd; |
199 | struct ehci_hcd *ehci; | 200 | struct ehci_hcd *ehci; |
@@ -259,8 +260,9 @@ static int __devinit ehci_orion_drv_probe(struct platform_device *pdev) | |||
259 | /* | 260 | /* |
260 | * (Re-)program MBUS remapping windows if we are asked to. | 261 | * (Re-)program MBUS remapping windows if we are asked to. |
261 | */ | 262 | */ |
262 | if (pd != NULL && pd->dram != NULL) | 263 | dram = mv_mbus_dram_info(); |
263 | ehci_orion_conf_mbus_windows(hcd, pd->dram); | 264 | if (dram) |
265 | ehci_orion_conf_mbus_windows(hcd, dram); | ||
264 | 266 | ||
265 | /* | 267 | /* |
266 | * setup Orion USB controller. | 268 | * setup Orion USB controller. |