Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fca3de6a authored by Thomas Abraham's avatar Thomas Abraham Committed by Kukjin Kim
Browse files

ARM: EXYNOS: 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 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: default avatarThomas Abraham <thomas.abraham@linaro.org>
Acked-by: default avatarGrant Likely <grant.likely@secretlab.ca>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent 4972a80e

arch/arm/mach-exynos/Kconfig

+10 −0
Original line number Diff line number Diff line
@@ -57,6 +57,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
@@ -177,6 +182,7 @@ config MACH_SMDKV310 
	select SAMSUNG_DEV_BACKLIGHT

	select EXYNOS4_DEV_AHCI

	select SAMSUNG_DEV_KEYPAD

	select EXYNOS4_DEV_DMA

	select EXYNOS4_DEV_PD

	select SAMSUNG_DEV_PWM

	select EXYNOS4_DEV_SYSMMU
@@ -197,6 +203,7 @@ config MACH_ARMLEX4210 
	select S3C_DEV_HSMMC2

	select S3C_DEV_HSMMC3

	select EXYNOS4_DEV_AHCI

	select EXYNOS4_DEV_DMA

	select EXYNOS4_DEV_SYSMMU

	select EXYNOS4_SETUP_SDHCI

	help
@@ -222,6 +229,7 @@ config MACH_UNIVERSAL_C210 
	select S5P_DEV_MFC

	select S5P_DEV_ONENAND

	select S5P_DEV_TV

	select EXYNOS4_DEV_DMA

	select EXYNOS4_DEV_PD

	select EXYNOS4_SETUP_FIMD0

	select EXYNOS4_SETUP_I2C1
@@ -255,6 +263,7 @@ config MACH_NURI 
	select S5P_DEV_MFC

	select S5P_DEV_USB_EHCI

	select S5P_SETUP_MIPIPHY

	select EXYNOS4_DEV_DMA

	select EXYNOS4_DEV_PD

	select EXYNOS4_SETUP_FIMC

	select EXYNOS4_SETUP_FIMD0
@@ -287,6 +296,7 @@ config MACH_ORIGEN 
	select S5P_DEV_USB_EHCI

	select SAMSUNG_DEV_BACKLIGHT

	select SAMSUNG_DEV_PWM

	select EXYNOS4_DEV_DMA

	select EXYNOS4_DEV_PD

	select EXYNOS4_SETUP_FIMD0

	select EXYNOS4_SETUP_SDHCI

arch/arm/mach-exynos/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ obj- := 
# Core support for EXYNOS4 system



obj-$(CONFIG_ARCH_EXYNOS4)	+= cpu.o init.o clock.o irq-combiner.o setup-i2c0.o

obj-$(CONFIG_ARCH_EXYNOS4)	+= irq-eint.o dma.o pmu.o

obj-$(CONFIG_ARCH_EXYNOS4)	+= irq-eint.o pmu.o

obj-$(CONFIG_CPU_EXYNOS4210)	+= clock-exynos4210.o

obj-$(CONFIG_SOC_EXYNOS4212)	+= clock-exynos4212.o

obj-$(CONFIG_PM)		+= pm.o
@@ -44,6 +44,7 @@ obj-$(CONFIG_EXYNOS4_DEV_AHCI) += dev-ahci.o 
obj-$(CONFIG_EXYNOS4_DEV_PD)		+= dev-pd.o

obj-$(CONFIG_EXYNOS4_DEV_SYSMMU)	+= dev-sysmmu.o

obj-$(CONFIG_EXYNOS4_DEV_DWMCI)		+= dev-dwmci.o

obj-$(CONFIG_EXYNOS4_DEV_DMA)		+= dma.o



obj-$(CONFIG_EXYNOS4_SETUP_FIMC)	+= setup-fimc.o

obj-$(CONFIG_EXYNOS4_SETUP_FIMD0)	+= setup-fimd0.o

arch/arm/mach-exynos/dma.c

+4 −0
Original line number Diff line number Diff line
@@ -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>
@@ -140,6 +141,9 @@ struct amba_device exynos4_device_pdma1 = { 


static int __init exynos4_dma_init(void)

{

	if (of_have_populated_dt())

		return 0;



	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);