target/linux/ipq806x/patches/0182-qcom-Kconfig-Make-drivers-mutually-exclusive.patch

   1 From 0771849495b4128cac2faf7d49c85c729fc48b20 Mon Sep 17 00:00:00 2001
   2 From: Andy Gross <agross@codeaurora.org>
   3 Date: Mon, 30 Jun 2014 21:18:39 -0500
   4 Subject: [PATCH 182/182] qcom: Kconfig: Make drivers mutually exclusive
   5
   6 This patch makes sure QCOM ADM dmaengine and QCOM Nand cannot be enabled at the
   7 same time.  This is an issue because the dma drivers will conflict with one
   8 another.
   9
  10 Signed-off-by: Andy Gross <agross@codeaurora.org>
  11 ---
  12  drivers/dma/Kconfig      |    2 +-
  13  drivers/mtd/nand/Kconfig |    6 +++---
  14  2 files changed, 4 insertions(+), 4 deletions(-)
  15
  16 diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig
  17 index 79155fa..ed7a5f6 100644
  18 --- a/drivers/dma/Kconfig
  19 +++ b/drivers/dma/Kconfig
  20 @@ -412,7 +412,7 @@ config QCOM_BAM_DMA
  21
  22  config QCOM_ADM
  23         tristate "Qualcomm ADM support"
  24 -       depends on ARCH_QCOM || (COMPILE_TEST && OF && ARM)
  25 +       depends on !MTD_QCOM_ADM && (ARCH_QCOM || (COMPILE_TEST && OF && ARM))
  26         select DMA_ENGINE
  27         select DMA_VIRTUAL_CHANNELS
  28         ---help---
  29 diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
  30 index 6e3842f..4a84264 100644
  31 --- a/drivers/mtd/nand/Kconfig
  32 +++ b/drivers/mtd/nand/Kconfig
  33 @@ -511,15 +511,15 @@ config MTD_NAND_XWAY
  34           to the External Bus Unit (EBU).
  35
  36  config MTD_QCOM_DMA
  37 -       tristate "QCMO NAND DMA Support"
  38 -       depends on ARCH_QCOM && MTD_QCOM_NAND
  39 +       tristate "QCOM NAND DMA Support"
  40 +       depends on !QCOM_ADM && ARCH_QCOM && MTD_QCOM_NAND
  41         default n
  42         help
  43           DMA support for QCOM NAND
  44
  45  config MTD_QCOM_NAND
  46         tristate "QCOM NAND Device Support"
  47 -       depends on MTD && ARCH_QCOM
  48 +       depends on MTD && ARCH_QCOM && !QCOM_ADM
  49         select CRC16
  50         select BITREVERSE
  51         select MTD_NAND_IDS
  52 --
  53 1.7.10.4
  54