From: Kukjin Kim Date: Sat, 12 May 2012 06:31:37 +0000 (+0900) Subject: Merge branch 'next/devel-samsung-iommu' into next/devel-samsung X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ad28536a898fbdc8c57d64348e310e1bda776963;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git Merge branch 'next/devel-samsung-iommu' into next/devel-samsung Conflicts: arch/arm/mach-exynos/Makefile --- ad28536a898fbdc8c57d64348e310e1bda776963 diff --cc arch/arm/mach-exynos/Makefile index f67e882b9dab,272625231c73..bd7e7654a250 --- a/arch/arm/mach-exynos/Makefile +++ b/arch/arm/mach-exynos/Makefile @@@ -50,11 -50,10 +50,11 @@@ obj-$(CONFIG_MACH_EXYNOS5_DT) += mach- obj-y += dev-uart.o obj-$(CONFIG_ARCH_EXYNOS4) += dev-audio.o obj-$(CONFIG_EXYNOS4_DEV_AHCI) += dev-ahci.o - obj-$(CONFIG_EXYNOS_DEV_DRM) += dev-drm.o - obj-$(CONFIG_EXYNOS4_DEV_SYSMMU) += dev-sysmmu.o -obj-$(CONFIG_EXYNOS_DEV_SYSMMU) += dev-sysmmu.o obj-$(CONFIG_EXYNOS4_DEV_DWMCI) += dev-dwmci.o obj-$(CONFIG_EXYNOS4_DEV_DMA) += dma.o obj-$(CONFIG_EXYNOS4_DEV_USB_OHCI) += dev-ohci.o ++obj-$(CONFIG_EXYNOS_DEV_DRM) += dev-drm.o ++obj-$(CONFIG_EXYNOS_DEV_SYSMMU) += dev-sysmmu.o obj-$(CONFIG_ARCH_EXYNOS) += setup-i2c0.o obj-$(CONFIG_EXYNOS4_SETUP_FIMC) += setup-fimc.o diff --cc arch/arm/mach-exynos/include/mach/map.h index 6e6d11ff352a,69f2ea6fb0d2..0e2292d04550 --- a/arch/arm/mach-exynos/include/mach/map.h +++ b/arch/arm/mach-exynos/include/mach/map.h @@@ -89,12 -89,9 +89,13 @@@ #define EXYNOS4_PA_MDMA1 0x12840000 #define EXYNOS4_PA_PDMA0 0x12680000 #define EXYNOS4_PA_PDMA1 0x12690000 +#define EXYNOS5_PA_MDMA0 0x10800000 +#define EXYNOS5_PA_MDMA1 0x11C10000 +#define EXYNOS5_PA_PDMA0 0x121A0000 +#define EXYNOS5_PA_PDMA1 0x121B0000 #define EXYNOS4_PA_SYSMMU_MDMA 0x10A40000 + #define EXYNOS4_PA_SYSMMU_2D_ACP 0x10A40000 #define EXYNOS4_PA_SYSMMU_SSS 0x10A50000 #define EXYNOS4_PA_SYSMMU_FIMC0 0x11A20000 #define EXYNOS4_PA_SYSMMU_FIMC1 0x11A30000 diff --cc arch/arm/plat-samsung/include/plat/devs.h index 62e6251e4b19,4067d1dd7f1c..61ca2f356c52 --- a/arch/arm/plat-samsung/include/plat/devs.h +++ b/arch/arm/plat-samsung/include/plat/devs.h @@@ -133,10 -133,7 +133,9 @@@ extern struct platform_device exynos4_d extern struct platform_device exynos4_device_pcm2; extern struct platform_device exynos4_device_pd[]; extern struct platform_device exynos4_device_spdif; - extern struct platform_device exynos4_device_sysmmu; +extern struct platform_device exynos_device_drm; + extern struct platform_device samsung_asoc_dma; extern struct platform_device samsung_asoc_idma; extern struct platform_device samsung_device_keypad;