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

Commit 20901f74 authored by Sachin Kamat's avatar Sachin Kamat Committed by Kukjin Kim
Browse files

ARM: dts: Add MFC codec support for EXYNOS4 DT machines 



Signed-off-by: default avatarSachin Kamat <sachin.kamat@linaro.org>
Reviewed-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Tested-by: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent 43afcbad

arch/arm/boot/dts/exynos4.dtsi

+8 −0
Original line number Original line Diff line number Diff line
@@ -131,6 +131,14 @@ 
		status = "disabled";

		status = "disabled";

	};

	};





	mfc: codec@13400000 {

		compatible = "samsung,mfc-v5";

		reg = <0x13400000 0x10000>;

		interrupts = <0 94 0>;

		samsung,power-domain = <&pd_mfc>;

		status = "disabled";

	};



	serial@13800000 {

	serial@13800000 {

		compatible = "samsung,exynos4210-uart";

		compatible = "samsung,exynos4210-uart";

		reg = <0x13800000 0x100>;

		reg = <0x13800000 0x100>;

arch/arm/mach-exynos/Kconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -410,6 +410,7 @@ config MACH_EXYNOS4_DT 
	select HAVE_SAMSUNG_KEYPAD if INPUT_KEYBOARD

	select HAVE_SAMSUNG_KEYPAD if INPUT_KEYBOARD

	select PINCTRL

	select PINCTRL

	select PINCTRL_EXYNOS

	select PINCTRL_EXYNOS

	select S5P_DEV_MFC

	select USE_OF

	select USE_OF

	help

	help

	  Machine support for Samsung Exynos4 machine with device tree enabled.

	  Machine support for Samsung Exynos4 machine with device tree enabled.

arch/arm/mach-exynos/mach-exynos4-dt.c

+17 −0
Original line number Original line Diff line number Diff line
@@ -12,13 +12,16 @@ 
*/

*/





#include <linux/of_platform.h>

#include <linux/of_platform.h>

#include <linux/of_fdt.h>

#include <linux/serial_core.h>

#include <linux/serial_core.h>

#include <linux/memblock.h>





#include <asm/mach/arch.h>

#include <asm/mach/arch.h>

#include <mach/map.h>

#include <mach/map.h>





#include <plat/cpu.h>

#include <plat/cpu.h>

#include <plat/regs-serial.h>

#include <plat/regs-serial.h>

#include <plat/mfc.h>





#include "common.h"

#include "common.h"
@@ -113,6 +116,7 @@ static const struct of_dev_auxdata exynos4_auxdata_lookup[] __initconst = { 
			"exynos-sysmmu.14", NULL), /* FIMC-LITE0(4x12) */

			"exynos-sysmmu.14", NULL), /* FIMC-LITE0(4x12) */

	OF_DEV_AUXDATA("samsung,exynos-sysmmu", 0x123C0000,

	OF_DEV_AUXDATA("samsung,exynos-sysmmu", 0x123C0000,

			"exynos-sysmmu.15", NULL), /* FIMC-LITE1(4x12) */

			"exynos-sysmmu.15", NULL), /* FIMC-LITE1(4x12) */

	OF_DEV_AUXDATA("samsung,mfc-v5", 0x13400000, "s5p-mfc", NULL),

	{},

	{},

};

};
@@ -135,6 +139,18 @@ static char const *exynos4_dt_compat[] __initdata = { 
	NULL

	NULL

};

};





static void __init exynos4_reserve(void)

{

#ifdef CONFIG_S5P_DEV_MFC

	struct s5p_mfc_dt_meminfo mfc_mem;



	/* Reserve memory for MFC only if it's available */

	mfc_mem.compatible = "samsung,mfc-v5";

	if (of_scan_flat_dt(s5p_fdt_find_mfc_mem, &mfc_mem))

		s5p_mfc_reserve_mem(mfc_mem.roff, mfc_mem.rsize, mfc_mem.loff,

				mfc_mem.lsize);

#endif

}

DT_MACHINE_START(EXYNOS4210_DT, "Samsung Exynos4 (Flattened Device Tree)")

DT_MACHINE_START(EXYNOS4210_DT, "Samsung Exynos4 (Flattened Device Tree)")

	/* Maintainer: Thomas Abraham <thomas.abraham@linaro.org> */

	/* Maintainer: Thomas Abraham <thomas.abraham@linaro.org> */

	.smp		= smp_ops(exynos_smp_ops),

	.smp		= smp_ops(exynos_smp_ops),
@@ -145,4 +161,5 @@ DT_MACHINE_START(EXYNOS4210_DT, "Samsung Exynos4 (Flattened Device Tree)") 
	.init_time	= exynos4_timer_init,

	.init_time	= exynos4_timer_init,

	.dt_compat	= exynos4_dt_compat,

	.dt_compat	= exynos4_dt_compat,

	.restart        = exynos4_restart,

	.restart        = exynos4_restart,

	.reserve	= exynos4_reserve,

MACHINE_END
 
MACHINE_END