* [PATCHv3 0/3] ARM: Exynos: JPEG board definition and device register
@ 2012-02-01 11:19 Andrzej Pietrasiewicz
2012-02-01 11:19 ` [PATCHv3 1/3] ARM: Exynos: JPEG board definition Andrzej Pietrasiewicz
` (2 more replies)
0 siblings, 3 replies; 9+ messages in thread
From: Andrzej Pietrasiewicz @ 2012-02-01 11:19 UTC (permalink / raw)
To: linux-samsung-soc
Cc: Andrzej Pietrasiewicz, Kyungmin Park, Kukjin Kim,
Marek Szyprowski
Dear All,
This patch series adds board definition code and device registration code
for JPEG IP found in Exynos4 SoC on universal_c210 and nuri boards.
It includes changes after Tushar's review - thanks, Tushar.
Andrzej Pietrasiewicz (3):
ARM: Exynos: JPEG board definition
ARM: Exynos: Register JPEG on universal_c210
ARM: Exynos: Register JPEG on nuri
arch/arm/mach-exynos/Kconfig | 2 ++
arch/arm/mach-exynos/clock.c | 5 +++++
arch/arm/mach-exynos/include/mach/map.h | 3 +++
arch/arm/mach-exynos/mach-nuri.c | 2 ++
arch/arm/mach-exynos/mach-universal_c210.c | 2 ++
arch/arm/plat-s5p/Kconfig | 5 +++++
arch/arm/plat-samsung/devs.c | 18 ++++++++++++++++++
arch/arm/plat-samsung/include/plat/devs.h | 1 +
8 files changed, 38 insertions(+), 0 deletions(-)
^ permalink raw reply [flat|nested] 9+ messages in thread* [PATCHv3 1/3] ARM: Exynos: JPEG board definition 2012-02-01 11:19 [PATCHv3 0/3] ARM: Exynos: JPEG board definition and device register Andrzej Pietrasiewicz @ 2012-02-01 11:19 ` Andrzej Pietrasiewicz 2012-02-09 12:27 ` Kukjin Kim 2012-03-10 10:50 ` Kukjin Kim 2012-02-01 11:19 ` [PATCHv3 2/3] ARM: Exynos: Register JPEG on universal_c210 Andrzej Pietrasiewicz 2012-02-01 11:19 ` [PATCHv3 3/3] ARM: Exynos: Register JPEG on nuri Andrzej Pietrasiewicz 2 siblings, 2 replies; 9+ messages in thread From: Andrzej Pietrasiewicz @ 2012-02-01 11:19 UTC (permalink / raw) To: linux-samsung-soc Cc: Andrzej Pietrasiewicz, Kyungmin Park, Kukjin Kim, Marek Szyprowski ARM: Exynos: JPEG board definition Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> --- arch/arm/mach-exynos/clock.c | 5 +++++ arch/arm/mach-exynos/include/mach/map.h | 3 +++ arch/arm/plat-s5p/Kconfig | 5 +++++ arch/arm/plat-samsung/devs.c | 18 ++++++++++++++++++ arch/arm/plat-samsung/include/plat/devs.h | 1 + 5 files changed, 32 insertions(+), 0 deletions(-) diff --git a/arch/arm/mach-exynos/clock.c b/arch/arm/mach-exynos/clock.c index 5a8c42e..e5d446a 100644 --- a/arch/arm/mach-exynos/clock.c +++ b/arch/arm/mach-exynos/clock.c @@ -470,6 +470,11 @@ static struct clk init_clocks_off[] = { .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", .enable = exynos4_clk_ip_cam_ctrl, diff --git a/arch/arm/mach-exynos/include/mach/map.h b/arch/arm/mach-exynos/include/mach/map.h index 7df9e74..5a9e656 100644 --- a/arch/arm/mach-exynos/include/mach/map.h +++ b/arch/arm/mach-exynos/include/mach/map.h @@ -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 @@ -164,6 +166,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 diff --git a/arch/arm/plat-s5p/Kconfig b/arch/arm/plat-s5p/Kconfig index e7fec78..7a30869 100644 --- a/arch/arm/plat-s5p/Kconfig +++ b/arch/arm/plat-s5p/Kconfig @@ -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 diff --git a/arch/arm/plat-samsung/devs.c b/arch/arm/plat-samsung/devs.c index 145580a..1121372 100644 --- a/arch/arm/plat-samsung/devs.c +++ b/arch/arm/plat-samsung/devs.c @@ -295,6 +295,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 diff --git a/arch/arm/plat-samsung/include/plat/devs.h b/arch/arm/plat-samsung/include/plat/devs.h index bb45848..5e7972d 100644 --- a/arch/arm/plat-samsung/include/plat/devs.h +++ b/arch/arm/plat-samsung/include/plat/devs.h @@ -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; -- 1.7.0.4 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* RE: [PATCHv3 1/3] ARM: Exynos: JPEG board definition 2012-02-01 11:19 ` [PATCHv3 1/3] ARM: Exynos: JPEG board definition Andrzej Pietrasiewicz @ 2012-02-09 12:27 ` Kukjin Kim 2012-02-09 14:46 ` Marek Szyprowski 2012-03-10 10:50 ` Kukjin Kim 1 sibling, 1 reply; 9+ messages in thread From: Kukjin Kim @ 2012-02-09 12:27 UTC (permalink / raw) To: 'Andrzej Pietrasiewicz', linux-samsung-soc Cc: 'Kyungmin Park', 'Marek Szyprowski' Andrzej Pietrasiewicz wrote: > > ARM: Exynos: JPEG board definition > [...] > > +#define EXYNOS4_PA_JPEG 0x11840000 > + > #define EXYNOS4_PA_G2D 0x12800000 > > #define EXYNOS4_PA_I2S0 0x03830000 > @@ -164,6 +166,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 I'm not sure we _really_ need to re-define for JPEG. Why not just use EXYNOS4_PA_JPEG? Thanks. Best regards, Kgene. -- Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd. ^ permalink raw reply [flat|nested] 9+ messages in thread
* RE: [PATCHv3 1/3] ARM: Exynos: JPEG board definition 2012-02-09 12:27 ` Kukjin Kim @ 2012-02-09 14:46 ` Marek Szyprowski 2012-03-09 19:02 ` Kukjin Kim 0 siblings, 1 reply; 9+ messages in thread From: Marek Szyprowski @ 2012-02-09 14:46 UTC (permalink / raw) To: 'Kukjin Kim', Andrzej Pietrasiewicz, linux-samsung-soc Cc: 'Kyungmin Park' Hello, On Thursday, February 09, 2012 1:28 PM Kukjin Kim wrote: > > ARM: Exynos: JPEG board definition > > > > [...] > > > > > +#define EXYNOS4_PA_JPEG 0x11840000 > > + > > #define EXYNOS4_PA_G2D 0x12800000 > > > > #define EXYNOS4_PA_I2S0 0x03830000 > > @@ -164,6 +166,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 > > I'm not sure we _really_ need to re-define for JPEG. > Why not just use EXYNOS4_PA_JPEG? The s5p-jpeg driver can be also used on S5PV210 so this approach seems to be fine, the patch only lacks definitions for the S5PV210 series. Best regards -- Marek Szyprowski Samsung Poland R&D Center ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCHv3 1/3] ARM: Exynos: JPEG board definition 2012-02-09 14:46 ` Marek Szyprowski @ 2012-03-09 19:02 ` Kukjin Kim 0 siblings, 0 replies; 9+ messages in thread From: Kukjin Kim @ 2012-03-09 19:02 UTC (permalink / raw) To: Marek Szyprowski Cc: 'Kukjin Kim', Andrzej Pietrasiewicz, linux-samsung-soc, 'Kyungmin Park' 2012-02-09 오전 6:46, Marek Szyprowski 쓴 글: > Hello, > > On Thursday, February 09, 2012 1:28 PM Kukjin Kim wrote: > >>> ARM: Exynos: JPEG board definition >>> >> >> [...] >> >>> >>> +#define EXYNOS4_PA_JPEG 0x11840000 >>> + >>> #define EXYNOS4_PA_G2D 0x12800000 >>> >>> #define EXYNOS4_PA_I2S0 0x03830000 >>> @@ -164,6 +166,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 >> >> I'm not sure we _really_ need to re-define for JPEG. >> Why not just use EXYNOS4_PA_JPEG? > > The s5p-jpeg driver can be also used on S5PV210 so this approach seems > to be fine, the patch only lacks definitions for the S5PV210 series. > I mean, if we use still this style, re-definition for physical address and interrupt number, it will break one kernel image with others. Anyway, I will apply this and will sort it out next time. Thanks. Best regards, Kgene. -- Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd. ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCHv3 1/3] ARM: Exynos: JPEG board definition 2012-02-01 11:19 ` [PATCHv3 1/3] ARM: Exynos: JPEG board definition Andrzej Pietrasiewicz 2012-02-09 12:27 ` Kukjin Kim @ 2012-03-10 10:50 ` Kukjin Kim 1 sibling, 0 replies; 9+ messages in thread From: Kukjin Kim @ 2012-03-10 10:50 UTC (permalink / raw) To: Andrzej Pietrasiewicz Cc: linux-samsung-soc, Kyungmin Park, Kukjin Kim, Marek Szyprowski On 02/01/12 03:19, Andrzej Pietrasiewicz wrote: > ARM: Exynos: JPEG board definition > Please adding comments in detail next time. > Signed-off-by: Andrzej Pietrasiewicz<andrzej.p@samsung.com> > Signed-off-by: Kyungmin Park<kyungmin.park@samsung.com> > --- > arch/arm/mach-exynos/clock.c | 5 +++++ > arch/arm/mach-exynos/include/mach/map.h | 3 +++ > arch/arm/plat-s5p/Kconfig | 5 +++++ > arch/arm/plat-samsung/devs.c | 18 ++++++++++++++++++ > arch/arm/plat-samsung/include/plat/devs.h | 1 + > 5 files changed, 32 insertions(+), 0 deletions(-) > > diff --git a/arch/arm/mach-exynos/clock.c b/arch/arm/mach-exynos/clock.c > index 5a8c42e..e5d446a 100644 > --- a/arch/arm/mach-exynos/clock.c > +++ b/arch/arm/mach-exynos/clock.c > @@ -470,6 +470,11 @@ static struct clk init_clocks_off[] = { > .enable = exynos4_clk_ip_cam_ctrl, > .ctrlbit = (1<< 5), > }, { > + .name = "jpeg", > + .id = 0, > + .enable = exynos4_clk_ip_cam_ctrl, > + .ctrlbit = (1<< 6), Please use tab... > + }, { > .name = "fimc", > .devname = "exynos4-fimc.0", > .enable = exynos4_clk_ip_cam_ctrl, > diff --git a/arch/arm/mach-exynos/include/mach/map.h b/arch/arm/mach-exynos/include/mach/map.h > index 7df9e74..5a9e656 100644 > --- a/arch/arm/mach-exynos/include/mach/map.h > +++ b/arch/arm/mach-exynos/include/mach/map.h > @@ -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 > @@ -164,6 +166,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 > diff --git a/arch/arm/plat-s5p/Kconfig b/arch/arm/plat-s5p/Kconfig > index e7fec78..7a30869 100644 > --- a/arch/arm/plat-s5p/Kconfig > +++ b/arch/arm/plat-s5p/Kconfig > @@ -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 > diff --git a/arch/arm/plat-samsung/devs.c b/arch/arm/plat-samsung/devs.c > index 145580a..1121372 100644 > --- a/arch/arm/plat-samsung/devs.c > +++ b/arch/arm/plat-samsung/devs.c > @@ -295,6 +295,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 > diff --git a/arch/arm/plat-samsung/include/plat/devs.h b/arch/arm/plat-samsung/include/plat/devs.h > index bb45848..5e7972d 100644 > --- a/arch/arm/plat-samsung/include/plat/devs.h > +++ b/arch/arm/plat-samsung/include/plat/devs.h > @@ -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; Applied and I fixed when I apply this. Thanks. Best regards, Kgene. -- Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd. ^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCHv3 2/3] ARM: Exynos: Register JPEG on universal_c210 2012-02-01 11:19 [PATCHv3 0/3] ARM: Exynos: JPEG board definition and device register Andrzej Pietrasiewicz 2012-02-01 11:19 ` [PATCHv3 1/3] ARM: Exynos: JPEG board definition Andrzej Pietrasiewicz @ 2012-02-01 11:19 ` Andrzej Pietrasiewicz 2012-02-09 12:30 ` Kukjin Kim 2012-02-01 11:19 ` [PATCHv3 3/3] ARM: Exynos: Register JPEG on nuri Andrzej Pietrasiewicz 2 siblings, 1 reply; 9+ messages in thread From: Andrzej Pietrasiewicz @ 2012-02-01 11:19 UTC (permalink / raw) To: linux-samsung-soc Cc: Andrzej Pietrasiewicz, Kyungmin Park, Kukjin Kim, Marek Szyprowski ARM: Exynos: Register JPEG on universal_c210 Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> --- arch/arm/mach-exynos/Kconfig | 1 + arch/arm/mach-exynos/mach-universal_c210.c | 2 ++ 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig index bd4600e..042803a 100644 --- a/arch/arm/mach-exynos/Kconfig +++ b/arch/arm/mach-exynos/Kconfig @@ -232,6 +232,7 @@ config MACH_UNIVERSAL_C210 select S5P_DEV_FIMC3 select S5P_DEV_G2D select S5P_DEV_CSIS0 + select S5P_DEV_JPEG select S5P_DEV_FIMD0 select S3C_DEV_HSMMC select S3C_DEV_HSMMC2 diff --git a/arch/arm/mach-exynos/mach-universal_c210.c b/arch/arm/mach-exynos/mach-universal_c210.c index dd75101..4c6dd86 100644 --- a/arch/arm/mach-exynos/mach-universal_c210.c +++ b/arch/arm/mach-exynos/mach-universal_c210.c @@ -980,6 +980,7 @@ static struct platform_device *universal_devices[] __initdata = { &universal_gpio_keys, &s5p_device_onenand, &s5p_device_fimd0, + &s5p_device_jpeg, &s5p_device_mfc, &s5p_device_mfc_l, &s5p_device_mfc_r, @@ -1045,6 +1046,7 @@ static void __init universal_machine_init(void) s5p_device_mfc.dev.parent = &exynos4_device_pd[PD_MFC].dev; s5p_device_fimd0.dev.parent = &exynos4_device_pd[PD_LCD0].dev; + s5p_device_jpeg.dev.parent = &exynos4_device_pd[PD_CAM].dev; s5p_device_fimc0.dev.parent = &exynos4_device_pd[PD_CAM].dev; s5p_device_fimc1.dev.parent = &exynos4_device_pd[PD_CAM].dev; s5p_device_fimc2.dev.parent = &exynos4_device_pd[PD_CAM].dev; -- 1.7.0.4 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* RE: [PATCHv3 2/3] ARM: Exynos: Register JPEG on universal_c210 2012-02-01 11:19 ` [PATCHv3 2/3] ARM: Exynos: Register JPEG on universal_c210 Andrzej Pietrasiewicz @ 2012-02-09 12:30 ` Kukjin Kim 0 siblings, 0 replies; 9+ messages in thread From: Kukjin Kim @ 2012-02-09 12:30 UTC (permalink / raw) To: 'Andrzej Pietrasiewicz', linux-samsung-soc Cc: 'Kyungmin Park', 'Marek Szyprowski' Andrzej Pietrasiewicz wrote: > > ARM: Exynos: Register JPEG on universal_c210 > [...] > > + s5p_device_jpeg.dev.parent = &exynos4_device_pd[PD_CAM].dev; > s5p_device_fimc0.dev.parent = &exynos4_device_pd[PD_CAM].dev; > s5p_device_fimc1.dev.parent = &exynos4_device_pd[PD_CAM].dev; > s5p_device_fimc2.dev.parent = &exynos4_device_pd[PD_CAM].dev; No, we moved to use generic power domain. See v3.4-for-rafael branch in my tree and it has been merged into linux-next via pm tree. Thanks. Best regards, Kgene. -- Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd. ^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCHv3 3/3] ARM: Exynos: Register JPEG on nuri 2012-02-01 11:19 [PATCHv3 0/3] ARM: Exynos: JPEG board definition and device register Andrzej Pietrasiewicz 2012-02-01 11:19 ` [PATCHv3 1/3] ARM: Exynos: JPEG board definition Andrzej Pietrasiewicz 2012-02-01 11:19 ` [PATCHv3 2/3] ARM: Exynos: Register JPEG on universal_c210 Andrzej Pietrasiewicz @ 2012-02-01 11:19 ` Andrzej Pietrasiewicz 2 siblings, 0 replies; 9+ messages in thread From: Andrzej Pietrasiewicz @ 2012-02-01 11:19 UTC (permalink / raw) To: linux-samsung-soc Cc: Andrzej Pietrasiewicz, Kyungmin Park, Kukjin Kim, Marek Szyprowski ARM: Exynos: Register JPEG on nuri Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> --- arch/arm/mach-exynos/Kconfig | 1 + arch/arm/mach-exynos/mach-nuri.c | 2 ++ 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig index 042803a..d8ab22f 100644 --- a/arch/arm/mach-exynos/Kconfig +++ b/arch/arm/mach-exynos/Kconfig @@ -271,6 +271,7 @@ config MACH_NURI select S3C_DEV_I2C3 select S3C_DEV_I2C5 select S5P_DEV_CSIS0 + select S5P_DEV_JPEG select S5P_DEV_FIMC0 select S5P_DEV_FIMC1 select S5P_DEV_FIMC2 diff --git a/arch/arm/mach-exynos/mach-nuri.c b/arch/arm/mach-exynos/mach-nuri.c index 165c876..adeb166 100644 --- a/arch/arm/mach-exynos/mach-nuri.c +++ b/arch/arm/mach-exynos/mach-nuri.c @@ -1260,6 +1260,7 @@ static struct platform_device *nuri_devices[] __initdata = { &i2c9_gpio, &s3c_device_adc, &s5p_device_g2d, + &s5p_device_jpeg, &s3c_device_rtc, &s5p_device_mfc, &s5p_device_mfc_l, @@ -1319,6 +1320,7 @@ static void __init nuri_machine_init(void) s5p_device_mfc.dev.parent = &exynos4_device_pd[PD_MFC].dev; s5p_device_fimd0.dev.parent = &exynos4_device_pd[PD_LCD0].dev; + s5p_device_jpeg.dev.parent = &exynos4_device_pd[PD_CAM].dev; s5p_device_fimc0.dev.parent = &exynos4_device_pd[PD_CAM].dev; s5p_device_fimc1.dev.parent = &exynos4_device_pd[PD_CAM].dev; s5p_device_fimc2.dev.parent = &exynos4_device_pd[PD_CAM].dev; -- 1.7.0.4 ^ permalink raw reply related [flat|nested] 9+ messages in thread
end of thread, other threads:[~2012-03-10 10:50 UTC | newest] Thread overview: 9+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2012-02-01 11:19 [PATCHv3 0/3] ARM: Exynos: JPEG board definition and device register Andrzej Pietrasiewicz 2012-02-01 11:19 ` [PATCHv3 1/3] ARM: Exynos: JPEG board definition Andrzej Pietrasiewicz 2012-02-09 12:27 ` Kukjin Kim 2012-02-09 14:46 ` Marek Szyprowski 2012-03-09 19:02 ` Kukjin Kim 2012-03-10 10:50 ` Kukjin Kim 2012-02-01 11:19 ` [PATCHv3 2/3] ARM: Exynos: Register JPEG on universal_c210 Andrzej Pietrasiewicz 2012-02-09 12:30 ` Kukjin Kim 2012-02-01 11:19 ` [PATCHv3 3/3] ARM: Exynos: Register JPEG on nuri Andrzej Pietrasiewicz
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.