From 5db7039a6c2776883feb2852718e493bbb873f01 Mon Sep 17 00:00:00 2001 From: Joakim Tjernlund Date: Tue, 23 Aug 2011 15:23:46 +0200 Subject: [PATCH] --- yaml --- r: 264913 b: refs/heads/master c: 39eb4ed556c145f35059c59144192d8ee32ceaa5 h: refs/heads/master i: 264911: a9e073cc02e3a517efc52318384d1fe08c27a5b7 v: v3 --- [refs] | 2 +- trunk/drivers/usb/host/fhci-hcd.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index fd07a0b00036..a1bd2e33e17f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 74ad60292bf0108de9884c531d7ec3f65c206230 +refs/heads/master: 39eb4ed556c145f35059c59144192d8ee32ceaa5 diff --git a/trunk/drivers/usb/host/fhci-hcd.c b/trunk/drivers/usb/host/fhci-hcd.c index 572ea53b0226..484a74f7553a 100644 --- a/trunk/drivers/usb/host/fhci-hcd.c +++ b/trunk/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 */