| Message ID | 1314867882-11755-7-git-send-email-thomas.abraham@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
> -----Original Message----- > From: Thomas Abraham [mailto:thomas.abraham@linaro.org] > Sent: Thursday, September 01, 2011 6:05 PM > 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 > 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. Thanks. Best regards, Kgene. -- Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd. > obj-$(CONFIG_PM) += pm.o sleep.o > obj-$(CONFIG_CPU_IDLE) += cpuidle.o > > -- > 1.6.6.rc2
Dear Mr. Kim, On 5 September 2011 10:47, Kukjin Kim <kgene.kim@samsung.com> wrote: >> -----Original Message----- >> From: Thomas Abraham [mailto:thomas.abraham@linaro.org] >> Sent: Thursday, September 01, 2011 6:05 PM >> 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 >> 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 Thanks for the suggestion. I will try it and resubmit the patch. Thanks, Thomas. > > If any problems, let me know. > > Thanks. > > Best regards, > Kgene. > -- > Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer, > SW Solution Development Team, Samsung Electronics Co., Ltd. > > >> obj-$(CONFIG_PM) += pm.o sleep.o >> obj-$(CONFIG_CPU_IDLE) += cpuidle.o >> >> -- >> 1.6.6.rc2 > >
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
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(-)