| Message ID | 1315852165-32402-7-git-send-email-thomas.abraham@linaro.org |
|---|---|
| State | New |
| Headers | show |
On Mon, Sep 12, 2011 at 11:59:25PM +0530, Thomas Abraham wrote: > The pl330 device instances and associated platform data is required only > for non-device-tree builds. With device tree enabled, the data about the > platform is obtained from the device tree. For images that include both > dt and non-dt platforms, an addditional check is added to ensure that > static amba device registrations is applicable to only non-dt platforms. > > Cc: Kukjin Kim <kgene.kim@samsung.com> > Cc: Kyungmin Park <kyungmin.park@samsung.com> > Signed-off-by: Thomas Abraham <thomas.abraham@linaro.org> > --- > diff --git a/arch/arm/mach-exynos4/dma.c b/arch/arm/mach-exynos4/dma.c > index c3c0d17..3203a31 100644 > --- a/arch/arm/mach-exynos4/dma.c > +++ b/arch/arm/mach-exynos4/dma.c > @@ -24,6 +24,7 @@ > #include <linux/dma-mapping.h> > #include <linux/amba/bus.h> > #include <linux/amba/pl330.h> > +#include <linux/of.h> > > #include <asm/irq.h> > #include <plat/devs.h> > @@ -138,6 +139,11 @@ struct amba_device exynos4_device_pdma1 = { > > static int __init exynos4_dma_init(void) > { > +#ifdef CONFIG_OF > + if (of_have_populated_dt()) > + return 0; > +#endif > + Drop the #ifdef. of_have_populated_dt() has an empty stub for !CONFIG_OF. Otherwise looks good to me. Well done not breaking non-DT support when CONFIG_OF is enabled. :-) The other patches in this series look good to me too. g.
Hi Grant, On 14 September 2011 21:56, Grant Likely <grant.likely@secretlab.ca> wrote: > On Mon, Sep 12, 2011 at 11:59:25PM +0530, Thomas Abraham wrote: >> The pl330 device instances and associated platform data is required only >> for non-device-tree builds. With device tree enabled, the data about the >> platform is obtained from the device tree. For images that include both >> dt and non-dt platforms, an addditional check is added to ensure that >> static amba device registrations is applicable to only non-dt platforms. >> >> Cc: Kukjin Kim <kgene.kim@samsung.com> >> Cc: Kyungmin Park <kyungmin.park@samsung.com> >> Signed-off-by: Thomas Abraham <thomas.abraham@linaro.org> >> --- >> diff --git a/arch/arm/mach-exynos4/dma.c b/arch/arm/mach-exynos4/dma.c >> index c3c0d17..3203a31 100644 >> --- a/arch/arm/mach-exynos4/dma.c >> +++ b/arch/arm/mach-exynos4/dma.c >> @@ -24,6 +24,7 @@ >> #include <linux/dma-mapping.h> >> #include <linux/amba/bus.h> >> #include <linux/amba/pl330.h> >> +#include <linux/of.h> >> >> #include <asm/irq.h> >> #include <plat/devs.h> >> @@ -138,6 +139,11 @@ struct amba_device exynos4_device_pdma1 = { >> >> static int __init exynos4_dma_init(void) >> { >> +#ifdef CONFIG_OF >> + if (of_have_populated_dt()) >> + return 0; >> +#endif >> + > > Drop the #ifdef. of_have_populated_dt() has an empty stub for > !CONFIG_OF. Otherwise looks good to me. Well done not breaking > non-DT support when CONFIG_OF is enabled. :-) Ok. I will drop the #ifdef. Well, I actually learnt from you on not breaking non-dt support because of your comments on my earlier patches which did break non-dt support. Thanks. > > The other patches in this series look good to me too. > > g. Thanks for your review. I will do the changes you have recommended for the pl330 dt support patches and resubmit. I would like to add your Ack to the patches when resubmitting. Regards, Thomas.
diff --git a/arch/arm/mach-exynos4/Kconfig b/arch/arm/mach-exynos4/Kconfig index d4d401c..679ba48 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. @@ -222,6 +231,7 @@ config MACH_EXYNOS4_DT bool "Samsung Exynos4 Machine using device tree" select CPU_EXYNOS4210 select USE_OF + select ARM_AMBA help Machine support for Samsung Exynos4 machine with device tree enabled. 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 diff --git a/arch/arm/mach-exynos4/dma.c b/arch/arm/mach-exynos4/dma.c index c3c0d17..3203a31 100644 --- a/arch/arm/mach-exynos4/dma.c +++ b/arch/arm/mach-exynos4/dma.c @@ -24,6 +24,7 @@ #include <linux/dma-mapping.h> #include <linux/amba/bus.h> #include <linux/amba/pl330.h> +#include <linux/of.h> #include <asm/irq.h> #include <plat/devs.h> @@ -138,6 +139,11 @@ struct amba_device exynos4_device_pdma1 = { static int __init exynos4_dma_init(void) { +#ifdef CONFIG_OF + if (of_have_populated_dt()) + return 0; +#endif + dma_cap_set(DMA_SLAVE, exynos4_pdma0_pdata.cap_mask); dma_cap_set(DMA_CYCLIC, exynos4_pdma0_pdata.cap_mask); amba_device_register(&exynos4_device_pdma0, &iomem_resource);
The pl330 device instances and associated platform data is required only for non-device-tree builds. With device tree enabled, the data about the platform is obtained from the device tree. For images that include both dt and non-dt platforms, an addditional check is added to ensure that static amba device registrations is applicable to only non-dt platforms. Cc: Kukjin Kim <kgene.kim@samsung.com> Cc: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Thomas Abraham <thomas.abraham@linaro.org> --- arch/arm/mach-exynos4/Kconfig | 10 ++++++++++ arch/arm/mach-exynos4/Makefile | 3 ++- arch/arm/mach-exynos4/dma.c | 6 ++++++ 3 files changed, 18 insertions(+), 1 deletions(-)