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

Commit 3dbe6d4c authored by Andrzej Pietrasiewicz's avatar Andrzej Pietrasiewicz Committed by Kukjin Kim
Browse files

ARM: EXYNOS: add support JPEG 



This patch adds platform_device, clock, map for JPEG

Signed-off-by: default avatarAndrzej Pietrasiewicz <andrzej.p@samsung.com>
Signed-off-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent 2bde0b08

arch/arm/mach-exynos/clock.c

+5 −0
Original line number Diff line number Diff line
@@ -469,6 +469,11 @@ static struct clk init_clocks_off[] = { 
		.devname	= "s5p-mipi-csis.1",

		.enable		= exynos4_clk_ip_cam_ctrl,

		.ctrlbit	= (1 << 5),

	}, {

		.name		= "jpeg",

		.id		= 0,

		.enable		= exynos4_clk_ip_cam_ctrl,

		.ctrlbit	= (1 << 6),

	}, {

		.name		= "fimc",

		.devname	= "exynos4-fimc.0",

arch/arm/mach-exynos/include/mach/map.h

+3 −0
Original line number Diff line number Diff line
@@ -31,6 +31,8 @@ 
#define EXYNOS4_PA_FIMC2		0x11820000

#define EXYNOS4_PA_FIMC3		0x11830000



#define EXYNOS4_PA_JPEG			0x11840000



#define EXYNOS4_PA_G2D			0x12800000



#define EXYNOS4_PA_I2S0			0x03830000
@@ -165,6 +167,7 @@ 
#define S5P_PA_FIMC1			EXYNOS4_PA_FIMC1

#define S5P_PA_FIMC2			EXYNOS4_PA_FIMC2

#define S5P_PA_FIMC3			EXYNOS4_PA_FIMC3

#define S5P_PA_JPEG			EXYNOS4_PA_JPEG

#define S5P_PA_G2D			EXYNOS4_PA_G2D

#define S5P_PA_FIMD0			EXYNOS4_PA_FIMD0

#define S5P_PA_HDMI			EXYNOS4_PA_HDMI

arch/arm/plat-s5p/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -80,6 +80,11 @@ config S5P_DEV_FIMC3 
	help

	  Compile in platform device definitions for FIMC controller 3



config S5P_DEV_JPEG

	bool

	help

	  Compile in platform device definitions for JPEG codec



config S5P_DEV_G2D

	bool

	help

arch/arm/plat-samsung/devs.c

+18 −0
Original line number Diff line number Diff line
@@ -296,6 +296,24 @@ struct platform_device s5p_device_g2d = { 
};

#endif /* CONFIG_S5P_DEV_G2D */



#ifdef CONFIG_S5P_DEV_JPEG

static struct resource s5p_jpeg_resource[] = {

	[0] = DEFINE_RES_MEM(S5P_PA_JPEG, SZ_4K),

	[1] = DEFINE_RES_IRQ(IRQ_JPEG),

};



struct platform_device s5p_device_jpeg = {

	.name		= "s5p-jpeg",

	.id		= 0,

	.num_resources	= ARRAY_SIZE(s5p_jpeg_resource),

	.resource	= s5p_jpeg_resource,

	.dev		= {

		.dma_mask		= &samsung_device_dma_mask,

		.coherent_dma_mask	= DMA_BIT_MASK(32),

	},

};

#endif /*  CONFIG_S5P_DEV_JPEG */



/* FIMD0 */



#ifdef CONFIG_S5P_DEV_FIMD0

arch/arm/plat-samsung/include/plat/devs.h

+1 −0
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ extern struct platform_device s5p_device_fimc1; 
extern struct platform_device s5p_device_fimc2;

extern struct platform_device s5p_device_fimc3;

extern struct platform_device s5p_device_fimc_md;

extern struct platform_device s5p_device_jpeg;

extern struct platform_device s5p_device_g2d;

extern struct platform_device s5p_device_fimd0;

extern struct platform_device s5p_device_hdmi;