From: Kukjin Kim <kgene.kim@samsung.com>
To: 'Thomas Abraham' <thomas.abraham@linaro.org>
Cc: devicetree-discuss@lists.ozlabs.org, grant.likely@secretlab.ca,
linux-arm-kernel@lists.infradead.org,
linux-samsung-soc@vger.kernel.org, robherring2@gmail.com,
vinod.koul@intel.com, patches@linaro.org,
jassisinghbrar@gmail.com, boojin.kim@samsung.com
Subject: RE: [PATCH v2 6/6] ARM: EXYNOS4: Limit usage of pl330 device instance to non-dt build
Date: Mon, 19 Sep 2011 19:26:20 +0900 [thread overview]
Message-ID: <001801cc76b6$92d65ff0$b8831fd0$%kim@samsung.com> (raw)
In-Reply-To: <CAJuYYwSB3f8BPQx1jgsSykKKMMGsbeCCj7zSLp2-+gtonBrdVw@mail.gmail.com>
Thomas Abraham wrote:
>
> Dear Mr. Kim,
>
> On 5 September 2011 10:47, Kukjin Kim <kgene.kim@samsung.com> 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 <thomas.abraham@linaro.org>
> >> ---
> >> 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
> diff is listed below. Could you please review the following diff.
>
Hi Thomas,
Oops, you're right...so following is ok to me but you need to rebase this
based on latest my tree.
If any problems, please let me know.
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
>
> 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
>
>
>
> Thanks,
> Thomas.
next prev parent reply other threads:[~2011-09-19 10:26 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-01 9:04 [PATCH v2 0/6] Add device tree support for PL330 dma controller driver Thomas Abraham
2011-09-01 9:04 ` [PATCH v2 1/6] DMA: PL330: move filter function into driver Thomas Abraham
2011-09-01 9:04 ` [PATCH v2 2/6] DMA: PL330: Infer transfer direction from transfer request instead of platform data Thomas Abraham
2011-09-01 9:04 ` [PATCH v2 3/6] ARM: EXYNOS4: Modify platform data for pl330 driver Thomas Abraham
2011-09-01 9:04 ` [PATCH v2 4/6] DMA: PL330: Add device tree support Thomas Abraham
2011-09-01 9:04 ` [PATCH v2 5/6] ARM: SAMSUNG: Add device tree support for pl330 dma engine wrappers Thomas Abraham
2011-09-01 9:04 ` [PATCH v2 6/6] ARM: EXYNOS4: Limit usage of pl330 device instance to non-dt build Thomas Abraham
2011-09-05 5:17 ` Kukjin Kim
2011-09-05 10:14 ` Thomas Abraham
2011-09-08 9:10 ` Thomas Abraham
2011-09-19 10:26 ` Kukjin Kim [this message]
2011-09-01 12:14 ` [PATCH v2 4/6] DMA: PL330: Add device tree support Rob Herring
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='001801cc76b6$92d65ff0$b8831fd0$%kim@samsung.com' \
--to=kgene.kim@samsung.com \
--cc=boojin.kim@samsung.com \
--cc=devicetree-discuss@lists.ozlabs.org \
--cc=grant.likely@secretlab.ca \
--cc=jassisinghbrar@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=patches@linaro.org \
--cc=robherring2@gmail.com \
--cc=thomas.abraham@linaro.org \
--cc=vinod.koul@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).