diff options
author | Joakim Tjernlund <Joakim.Tjernlund@transmode.se> | 2011-08-23 09:23:46 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-08-23 12:47:39 -0400 |
commit | 39eb4ed556c145f35059c59144192d8ee32ceaa5 (patch) | |
tree | 786f01f4bcbaff9f7a5081b8b22380fae01f8a10 /drivers/usb/host/fhci-hcd.c | |
parent | 74ad60292bf0108de9884c531d7ec3f65c206230 (diff) |
usb: fhci-hcd: Allocate pram dynamically.
MPC832x does not have enough MURAM to do fixed MURAM allocation.
Change to dynamic allocation.
Signed-off-by: Joakim Tjernlund <Joakim.Tjernlund@transmode.se>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/host/fhci-hcd.c')
-rw-r--r-- | drivers/usb/host/fhci-hcd.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/usb/host/fhci-hcd.c b/drivers/usb/host/fhci-hcd.c index 572ea53b0226..484a74f7553a 100644 --- a/drivers/usb/host/fhci-hcd.c +++ b/drivers/usb/host/fhci-hcd.c | |||
@@ -621,12 +621,15 @@ static int __devinit of_fhci_probe(struct platform_device *ofdev) | |||
621 | goto err_pram; | 621 | goto err_pram; |
622 | } | 622 | } |
623 | 623 | ||
624 | pram_addr = cpm_muram_alloc_fixed(iprop[2], FHCI_PRAM_SIZE); | 624 | pram_addr = cpm_muram_alloc(FHCI_PRAM_SIZE, 64); |
625 | if (IS_ERR_VALUE(pram_addr)) { | 625 | if (IS_ERR_VALUE(pram_addr)) { |
626 | dev_err(dev, "failed to allocate usb pram\n"); | 626 | dev_err(dev, "failed to allocate usb pram\n"); |
627 | ret = -ENOMEM; | 627 | ret = -ENOMEM; |
628 | goto err_pram; | 628 | goto err_pram; |
629 | } | 629 | } |
630 | |||
631 | qe_issue_cmd(QE_ASSIGN_PAGE_TO_DEVICE, QE_CR_SUBBLOCK_USB, | ||
632 | QE_CR_PROTOCOL_UNSPECIFIED, pram_addr); | ||
630 | fhci->pram = cpm_muram_addr(pram_addr); | 633 | fhci->pram = cpm_muram_addr(pram_addr); |
631 | 634 | ||
632 | /* GPIOs and pins */ | 635 | /* GPIOs and pins */ |