target/linux/brcm47xx/patches-3.0/0020-bcma-small-fixes-needed-to-get-b43-up-with-SoC.patch

   1 From f3007275d7706afb1381adb0003f3ba69d359c8f Mon Sep 17 00:00:00 2001
   2 From: Hauke Mehrtens <hauke@hauke-m.de>
   3 Date: Fri, 22 Jul 2011 17:09:36 +0200
   4 Subject: [PATCH 20/22] bcma: small fixes needed to get b43 up with SoC
   5
   6 When using an SoC these small cahnges are neede to get it up
   7
   8 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
   9 ---
  10  drivers/bcma/core.c |    2 ++
  11  drivers/bcma/main.c |    3 +++
  12  2 files changed, 5 insertions(+), 0 deletions(-)
  13
  14 --- a/drivers/bcma/core.c
  15 +++ b/drivers/bcma/core.c
  16 @@ -110,6 +110,8 @@ EXPORT_SYMBOL_GPL(bcma_core_pll_ctl);
  17  u32 bcma_core_dma_translation(struct bcma_device *core)
  18  {
  19         switch (core->bus->hosttype) {
  20 +       case BCMA_HOSTTYPE_SOC:
  21 +               return 0;
  22         case BCMA_HOSTTYPE_PCI:
  23                 if (bcma_aread32(core, BCMA_IOST) & BCMA_IOST_DMA64)
  24                         return BCMA_DMA_TRANSLATION_DMA64_CMT;
  25 --- a/drivers/bcma/main.c
  26 +++ b/drivers/bcma/main.c
  27 @@ -99,7 +99,10 @@ static int bcma_register_cores(struct bc
  28                         core->irq = bus->host_pci->irq;
  29                         break;
  30                 case BCMA_HOSTTYPE_SDIO:
  31 +                       break;
  32                 case BCMA_HOSTTYPE_SOC:
  33 +                       core->dev.dma_mask = &core->dev.coherent_dma_mask;
  34 +                       core->dma_dev = &core->dev;
  35                         break;
  36                 }
  37