From patchwork Thu Sep 1 09:04:42 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: thomas.abraham@linaro.org X-Patchwork-Id: 3827 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 52F8B23F22 for ; Thu, 1 Sep 2011 09:05:09 +0000 (UTC) Received: from mail-fx0-f52.google.com (mail-fx0-f52.google.com [209.85.161.52]) by fiordland.canonical.com (Postfix) with ESMTP id 40E7CA18587 for ; Thu, 1 Sep 2011 09:05:09 +0000 (UTC) Received: by mail-fx0-f52.google.com with SMTP id 18so721928fxd.11 for ; Thu, 01 Sep 2011 02:05:09 -0700 (PDT) Received: by 10.223.5.139 with SMTP id 11mr951963fav.138.1314867909147; Thu, 01 Sep 2011 02:05:09 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.152.11.8 with SMTP id m8cs44985lab; Thu, 1 Sep 2011 02:05:08 -0700 (PDT) Received: by 10.91.51.10 with SMTP id d10mr1116719agk.95.1314867908062; Thu, 01 Sep 2011 02:05:08 -0700 (PDT) Received: from mailout4.samsung.com (mailout4.samsung.com [203.254.224.34]) by mx.google.com with ESMTP id p10si518426ank.150.2011.09.01.02.05.07; Thu, 01 Sep 2011 02:05:08 -0700 (PDT) Received-SPF: neutral (google.com: 203.254.224.34 is neither permitted nor denied by best guess record for domain of thomas.abraham@linaro.org) client-ip=203.254.224.34; Authentication-Results: mx.google.com; spf=neutral (google.com: 203.254.224.34 is neither permitted nor denied by best guess record for domain of thomas.abraham@linaro.org) smtp.mail=thomas.abraham@linaro.org Received: from epcpsbgm1.samsung.com (mailout4.samsung.com [203.254.224.34]) by mailout4.samsung.com (Oracle Communications Messaging Exchange Server 7u4-19.01 64bit (built Sep 7 2010)) with ESMTP id <0LQU00KZF6K5OK50@mailout4.samsung.com> for patches@linaro.org; Thu, 01 Sep 2011 18:05:06 +0900 (KST) X-AuditID: cbfee61a-b7cf1ae00000208e-7e-4e5f4ac2779e Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1.samsung.com (MMPCPMTA) with SMTP id 50.49.08334.2CA4F5E4; Thu, 01 Sep 2011 18:05:06 +0900 (KST) Received: from localhost.localdomain ([107.108.73.37]) by mmp2.samsung.com (iPlanet Messaging Server 5.2 Patch 2 (built Jul 14 2004)) with ESMTPA id <0LQU001MY6JYD0@mmp2.samsung.com> for patches@linaro.org; Thu, 01 Sep 2011 18:05:06 +0900 (KST) Date: Thu, 01 Sep 2011 14:34:42 +0530 From: Thomas Abraham Subject: [PATCH v2 6/6] ARM: EXYNOS4: Limit usage of pl330 device instance to non-dt build In-reply-to: <1314867882-11755-6-git-send-email-thomas.abraham@linaro.org> To: devicetree-discuss@lists.ozlabs.org Cc: grant.likely@secretlab.ca, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, kgene.kim@samsung.com, robherring2@gmail.com, vinod.koul@intel.com, patches@linaro.org, jassisinghbrar@gmail.com, boojin.kim@samsung.com Message-id: <1314867882-11755-7-git-send-email-thomas.abraham@linaro.org> X-Mailer: git-send-email 1.6.6.rc2 Content-transfer-encoding: 7BIT References: <1314867882-11755-1-git-send-email-thomas.abraham@linaro.org> <1314867882-11755-2-git-send-email-thomas.abraham@linaro.org> <1314867882-11755-3-git-send-email-thomas.abraham@linaro.org> <1314867882-11755-4-git-send-email-thomas.abraham@linaro.org> <1314867882-11755-5-git-send-email-thomas.abraham@linaro.org> <1314867882-11755-6-git-send-email-thomas.abraham@linaro.org> X-Brightmail-Tracker: AAAAAA== The pl330 device instances and associated platform data is required only for non-device-tree builds. With device tree, all of this information is obtained from the device tree. Signed-off-by: Thomas Abraham --- arch/arm/mach-exynos4/Kconfig | 7 +++++++ arch/arm/mach-exynos4/Makefile | 3 ++- 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/arch/arm/mach-exynos4/Kconfig b/arch/arm/mach-exynos4/Kconfig index d4d401c..3edbf37 100644 --- a/arch/arm/mach-exynos4/Kconfig +++ b/arch/arm/mach-exynos4/Kconfig @@ -21,6 +21,13 @@ config EXYNOS4_MCT help Use MCT (Multi Core Timer) as kernel timers +config EXYNOS4_DEV_DMA + bool + default y if !OF + help + Compile in amba device definitions for DMA controller if OF + is not enabled. + config EXYNOS4_DEV_AHCI bool help diff --git a/arch/arm/mach-exynos4/Makefile b/arch/arm/mach-exynos4/Makefile index d2bf5bf..a2f33dc 100644 --- a/arch/arm/mach-exynos4/Makefile +++ b/arch/arm/mach-exynos4/Makefile @@ -13,7 +13,8 @@ obj- := # Core support for EXYNOS4 system obj-$(CONFIG_CPU_EXYNOS4210) += cpu.o init.o clock.o irq-combiner.o -obj-$(CONFIG_CPU_EXYNOS4210) += setup-i2c0.o irq-eint.o dma.o pmu.o +obj-$(CONFIG_CPU_EXYNOS4210) += setup-i2c0.o irq-eint.o pmu.o +obj-$(CONFIG_EXYNOS4_DEV_DMA) += dma.o obj-$(CONFIG_PM) += pm.o sleep.o obj-$(CONFIG_CPU_IDLE) += cpuidle.o