From patchwork Thu Sep 8 09:10:13 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Abraham X-Patchwork-Id: 1129262 Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p889AXLV024040 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Thu, 8 Sep 2011 09:10:53 GMT Received: from canuck.infradead.org ([2001:4978:20e::1]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1R1acl-0002Fa-Q7; Thu, 08 Sep 2011 09:10:20 +0000 Received: from localhost ([127.0.0.1] helo=canuck.infradead.org) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1R1acl-0002ZK-9O; Thu, 08 Sep 2011 09:10:19 +0000 Received: from mail-yw0-f49.google.com ([209.85.213.49]) by canuck.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1R1ach-0002Z1-T1 for linux-arm-kernel@lists.infradead.org; Thu, 08 Sep 2011 09:10:17 +0000 Received: by ywp17 with SMTP id 17so484342ywp.36 for ; Thu, 08 Sep 2011 02:10:14 -0700 (PDT) MIME-Version: 1.0 Received: by 10.101.121.2 with SMTP id y2mr367512anm.113.1315473013860; Thu, 08 Sep 2011 02:10:13 -0700 (PDT) Received: by 10.100.8.20 with HTTP; Thu, 8 Sep 2011 02:10:13 -0700 (PDT) In-Reply-To: <001901cc6b8b$0f450730$2dcf1590$%kim@samsung.com> 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> <1314867882-11755-7-git-send-email-thomas.abraham@linaro.org> <001901cc6b8b$0f450730$2dcf1590$%kim@samsung.com> Date: Thu, 8 Sep 2011 14:40:13 +0530 Message-ID: Subject: Re: [PATCH v2 6/6] ARM: EXYNOS4: Limit usage of pl330 device instance to non-dt build From: Thomas Abraham To: Kukjin Kim X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20110908_051016_051138_D25DD043 X-CRM114-Status: GOOD ( 19.55 ) X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.3.1 on canuck.infradead.org summary: Content analysis details: (-0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.213.49 listed in list.dnswl.org] Cc: boojin.kim@samsung.com, linux-samsung-soc@vger.kernel.org, patches@linaro.org, vinod.koul@intel.com, devicetree-discuss@lists.ozlabs.org, jassisinghbrar@gmail.com, grant.likely@secretlab.ca, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Thu, 08 Sep 2011 09:10:54 +0000 (UTC) X-MIME-Autoconverted: from quoted-printable to 8bit by demeter2.kernel.org id p889AXLV024040 Dear Mr. Kim, On 5 September 2011 10:47, Kukjin Kim wrote: >> Subject: [PATCH v2 6/6] ARM: EXYNOS4: Limit usage of pl330 device instance > to >> non-dt build >> >> 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 > > Do we need _really_ EXYNOS4_DEV_DMA here? > How about to use like following? > > +obj-$(!CONFIG_OF)              += dma.o > > If any problems, let me know. While trying out your suggestion, I found a issue with this patch related to compiling a kernel with both dt and non-dt board files included in the build. When compiling a single kernel image with mach-smdkv310.c file and exynos4 device tree enabled machine file, since CONFIG_OF is enabled, dma platform data does not get compiled which is required for mach-smdkv310. So, I would like to resubmit this patch and the updated Thanks, Thomas. diff is listed below. Could you please review the following diff. diff --git a/arch/arm/mach-exynos4/Kconfig b/arch/arm/mach-exynos4/Kconfig index d4d401c..953ead7 100644 --- a/arch/arm/mach-exynos4/Kconfig +++ b/arch/arm/mach-exynos4/Kconfig @@ -21,6 +21,11 @@ config EXYNOS4_MCT help Use MCT (Multi Core Timer) as kernel timers +config EXYNOS4_DEV_DMA + bool + help + Compile in amba device definitions for DMA controller + config EXYNOS4_DEV_AHCI bool help @@ -129,6 +134,7 @@ config MACH_SMDKC210 select EXYNOS4_SETUP_FIMD0 select EXYNOS4_SETUP_I2C1 select EXYNOS4_SETUP_SDHCI + select EXYNOS4_DEV_DMA help Machine support for Samsung SMDKC210 @@ -153,6 +159,7 @@ config MACH_SMDKV310 select EXYNOS4_SETUP_I2C1 select EXYNOS4_SETUP_KEYPAD select EXYNOS4_SETUP_SDHCI + select EXYNOS4_DEV_DMA help Machine support for Samsung SMDKV310 @@ -191,6 +198,7 @@ config MACH_UNIVERSAL_C210 select EXYNOS4_SETUP_I2C3 select EXYNOS4_SETUP_I2C5 select EXYNOS4_SETUP_SDHCI + select EXYNOS4_DEV_DMA help Machine support for Samsung Mobile Universal S5PC210 Reference Board. @@ -215,6 +223,7 @@ config MACH_NURI select EXYNOS4_SETUP_USB_PHY select SAMSUNG_DEV_PWM select SAMSUNG_DEV_ADC + select EXYNOS4_DEV_DMA help Machine support for Samsung Mobile NURI Board. diff --git a/arch/arm/mach-exynos4/Makefile b/arch/arm/mach-exynos4/Makefile index 929262a..a2f33dc 100644 --- a/arch/arm/mach-exynos4/Makefile +++ b/arch/arm/mach-exynos4/Makefile @@ -14,7 +14,8 @@ obj- := 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