From: Joakim Tjernlund Date: Tue, 23 Aug 2011 13:23:46 +0000 (+0200) Subject: usb: fhci-hcd: Allocate pram dynamically. X-Git-Tag: MMI-PSA29.97-13-9~18248^2~179^2~9 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=39eb4ed556c145f35059c59144192d8ee32ceaa5;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git 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 Signed-off-by: Greg Kroah-Hartman --- 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) goto err_pram; } - pram_addr = cpm_muram_alloc_fixed(iprop[2], FHCI_PRAM_SIZE); + pram_addr = cpm_muram_alloc(FHCI_PRAM_SIZE, 64); if (IS_ERR_VALUE(pram_addr)) { dev_err(dev, "failed to allocate usb pram\n"); ret = -ENOMEM; goto err_pram; } + + qe_issue_cmd(QE_ASSIGN_PAGE_TO_DEVICE, QE_CR_SUBBLOCK_USB, + QE_CR_PROTOCOL_UNSPECIFIED, pram_addr); fhci->pram = cpm_muram_addr(pram_addr); /* GPIOs and pins */