d41bde8818
Pull s5p-mfc changes from media tree so the arm/mach-exynos code could be removed. The bindings are converted to generic reserved memory bindings. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABAgAGBQJXVWQ8AAoJEME3ZuaGi4PXGWIP/3FwCkH8XNJIDLGZ/RJq/b1+ YI9ixVOW9E3vdDgk3I3vLG+jL6bUVicJSS47L/DscN4CyNml6YNaNa+RJdB2pw+E hJJ3tcGz04jCLvk6+6abLEfpfPC40DkDVj7ZOKjzWypZYDFyjB018p2DECzc+RFf zVlY8P9OKeaBMZNCk2H2cT46NLTgL4dY3KR8y5TLUHsgYLVdLmU4QtCv/RiRnTcn OuzBTyLvVR97lup1mVf7zhE2OLkyskishKbYbMuD1I8flho22y4vJG998zSIIl5C Tz8MYJsVN1mFEjonJcbreNTAe4LB++F8tXcytCADHSGM2O9m04HeROdqqKUiPWrw hAG6DS+tVq7FqGBii3IlfTg08AG8uNoOzJ14Qc1BmcgEPlkpLMNHKgdNgzvJx7VB yukGUVUDBQTM19q1QwH3keIRfOWm030ODA/q24ExUVZ8TgWdjLWIz5/U2jyV4aph TKtwcruFXpCVwQ6gXWTyVb95Fre4miONqFRTOFWk1lbXDEk9fM8qL1ih4OUzKM5m khSNfAMeKHKxkXHSzsU9PBZp66jeqdQQIv6i2fnZhk4OMqYDz5iTTRGV+LaPkrQ+ 1Jz1VZ+0iKka30x/LhKtOlRuq6rPlIaXyPHrr/POfETVv3eG4OKTQJzVfX++tNCw CdJKxIKlT0lZtuwg0BWu =bfnE -----END PGP SIGNATURE----- Merge tag 'samsung-drivers-exynos-mfc-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/drivers Topic branch for Exynos MFC changes for v4.8: Pull s5p-mfc changes from media tree so the arm/mach-exynos code could be removed. The bindings are converted to generic reserved memory bindings. * tag 'samsung-drivers-exynos-mfc-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux: ARM: dts: exynos: Enable MFC device on Exynos4412 Odroid boards ARM: dts: exynos: Convert MFC device to generic reserved memory bindings ARM: EXYNOS: Remove code for MFC custom reserved memory handling media: s5p-mfc: add iommu support media: s5p-mfc: replace custom reserved memory handling code with generic one media: s5p-mfc: use generic reserved memory bindings of: reserved_mem: add support for using more than one region for given device media: set proper max seg size for devices on Exynos SoCs media: vb2-dma-contig: add helper for setting dma max seg size s5p-mfc: Fix race between s5p_mfc_probe() and s5p_mfc_open() s5p-mfc: Add release callback for memory region devs s5p-mfc: Set device name for reserved memory region devs Signed-off-by: Olof Johansson <olof@lixom.net>
25 lines
700 B
Makefile
25 lines
700 B
Makefile
# arch/arm/mach-exynos/Makefile
|
|
#
|
|
# Copyright (c) 2010-2011 Samsung Electronics Co., Ltd.
|
|
# http://www.samsung.com/
|
|
#
|
|
# Licensed under GPLv2
|
|
|
|
ccflags-$(CONFIG_ARCH_MULTIPLATFORM) += -I$(srctree)/$(src)/include -I$(srctree)/arch/arm/plat-samsung/include
|
|
|
|
# Core
|
|
|
|
obj-$(CONFIG_ARCH_EXYNOS) += exynos.o exynos-smc.o firmware.o
|
|
|
|
obj-$(CONFIG_EXYNOS_CPU_SUSPEND) += pm.o sleep.o
|
|
obj-$(CONFIG_PM_SLEEP) += suspend.o
|
|
|
|
obj-$(CONFIG_SMP) += platsmp.o headsmp.o
|
|
|
|
plus_sec := $(call as-instr,.arch_extension sec,+sec)
|
|
AFLAGS_exynos-smc.o :=-Wa,-march=armv7-a$(plus_sec)
|
|
AFLAGS_sleep.o :=-Wa,-march=armv7-a$(plus_sec)
|
|
|
|
obj-$(CONFIG_EXYNOS5420_MCPM) += mcpm-exynos.o
|
|
CFLAGS_mcpm-exynos.o += -march=armv7-a
|