[PATCH v3 0/8] Samsung S5P SoC camera interface driver

[PATCH v3 0/8] Samsung S5P SoC camera interface driver

[Sylwester Nawrocki]

Hello,

This is a third version of my patch series adding support for camera interface,
video output and video processing IP contained in Samsung's S3C/S5P SoCs.

Changes since v1:
- support for multiple SoC variants through the platform device name overriding
  (S5PC100 and SPV210 version definitions included)

Changes since v2:
- reworked register definition, minor synchronization fixes, whitespace cleanup
- removed support for FIFO mode output to the lcd controller due to
  hardware limitations (removed fifo link and platform data setup code
  and v4l2_subdevice in s3c-fb driver)


The following patch series contains:

[PATCH v3 1/8] ARM: Samsung: Add register definitions for Samsung S5P SoC camera interface
[PATCH v3 2/8] v4l: Add driver for Samsung S3C/S5P SoC video postprocessor
[PATCH v3 3/8] ARM: Samsung: Add platform definitions and helpers for FIMC driver
[PATCH v3 4/8] ARM: Samsung: Add common Aquila and GONI code
[PATCH v3 5/8] ARM: s5pv210: enable FIMC on Aquila
[PATCH v3 6/8] ARM: s5pv210: enable FIMC on Goni
[PATCH v3 7/8] ARM: S5PC100: enable FIMC on SMDKC100
[PATCH v3 8/8] ARM: s5pv210: Override FIMC driver name on Aquila board


Best regards,
--
Sylwester Nawrocki
Linux Platform Group
Samsung Poland R&D Center

[PATCH v3 1/8] ARM: Samsung: Add register definitions for Samsung S5P SoC camera interface

[Sylwester Nawrocki]

Add register definitions for the camera interface/video postprocessor
contained in Samsung's S5P SoC series.

Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Reviewed-by: Pawel Osciak <p.osciak@samsung.com>
Reviewed-by: Marek Szyprowski <m.szyprowski@samsung.com>
---
 arch/arm/plat-samsung/include/plat/regs-fimc.h |  294 ++++++++++++++++++++++++
 1 files changed, 294 insertions(+), 0 deletions(-)
 create mode 100644 arch/arm/plat-samsung/include/plat/regs-fimc.h

diff --git a/arch/arm/plat-samsung/include/plat/regs-fimc.h b/arch/arm/plat-samsung/include/plat/regs-fimc.h
new file mode 100644
index 0000000..7f3141c
--- /dev/null
+++ b/arch/arm/plat-samsung/include/plat/regs-fimc.h
@@ -0,0 +1,294 @@
+/* arch/arm/plat-s5p/include/plat/regs-fimc.h
+ *
+ * Register definition file for Samsung Camera Interface (FIMC) driver
+ *
+ * Copyright (c) 2010 Samsung Electronics
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#ifndef REGS_FIMC_H_
+#define REGS_FIMC_H_
+
+#define S5P_CIOYSA(__x)			(0x18 + (__x) * 4)
+#define S5P_CIOCBSA(__x)		(0x28 + (__x) * 4)
+#define S5P_CIOCRSA(__x)		(0x38 + (__x) * 4)
+
+/* Input source format */
+#define S5P_CISRCFMT			0x00
+#define S5P_CISRCFMT_ITU601_8BIT	(1 << 31)
+#define S5P_CISRCFMT_ITU601_16BIT	(1 << 29)
+#define S5P_CISRCFMT_ORDER422_YCBYCR	(0 << 14)
+#define S5P_CISRCFMT_ORDER422_YCRYCB	(1 << 14)
+#define S5P_CISRCFMT_ORDER422_CBYCRY	(2 << 14)
+#define S5P_CISRCFMT_ORDER422_CRYCBY	(3 << 14)
+#define S5P_CISRCFMT_HSIZE(x)		((x) << 16)
+#define S5P_CISRCFMT_VSIZE(x)		((x) << 0)
+
+/* Window offset */
+#define S5P_CIWDOFST			0x04
+#define S5P_CIWDOFST_WINOFSEN		(1 << 31)
+#define S5P_CIWDOFST_CLROVFIY		(1 << 30)
+#define S5P_CIWDOFST_CLROVRLB		(1 << 29)
+#define S5P_CIWDOFST_WINHOROFST_MASK	(0x7ff << 16)
+#define S5P_CIWDOFST_CLROVFICB		(1 << 15)
+#define S5P_CIWDOFST_CLROVFICR		(1 << 14)
+#define S5P_CIWDOFST_WINHOROFST(x)	((x) << 16)
+#define S5P_CIWDOFST_WINVEROFST(x)	((x) << 0)
+#define S5P_CIWDOFST_WINVEROFST_MASK	(0xfff << 0)
+
+/* Global control */
+#define S5P_CIGCTRL			0x08
+#define S5P_CIGCTRL_SWRST		(1 << 31)
+#define S5P_CIGCTRL_CAMRST_A		(1 << 30)
+#define S5P_CIGCTRL_SELCAM_ITU_A	(1 << 29)
+#define S5P_CIGCTRL_SELCAM_ITU_MASK	(1 << 29)
+#define S5P_CIGCTRL_TESTPAT_NORMAL	(0 << 27)
+#define S5P_CIGCTRL_TESTPAT_COLOR_BAR	(1 << 27)
+#define S5P_CIGCTRL_TESTPAT_HOR_INC	(2 << 27)
+#define S5P_CIGCTRL_TESTPAT_VER_INC	(3 << 27)
+#define S5P_CIGCTRL_TESTPAT_MASK	(3 << 27)
+#define S5P_CIGCTRL_TESTPAT_SHIFT	(27)
+#define S5P_CIGCTRL_INVPOLPCLK		(1 << 26)
+#define S5P_CIGCTRL_INVPOLVSYNC		(1 << 25)
+#define S5P_CIGCTRL_INVPOLHREF		(1 << 24)
+#define S5P_CIGCTRL_IRQ_OVFEN		(1 << 22)
+#define S5P_CIGCTRL_HREF_MASK		(1 << 21)
+#define S5P_CIGCTRL_IRQ_LEVEL		(1 << 20)
+#define S5P_CIGCTRL_IRQ_CLR		(1 << 19)
+#define S5P_CIGCTRL_IRQ_ENABLE		(1 << 16)
+#define S5P_CIGCTRL_SHDW_DISABLE	(1 << 12)
+#define S5P_CIGCTRL_SELCAM_MIPI_A	(1 << 7)
+#define S5P_CIGCTRL_CAMIF_SELWB		(1 << 6)
+#define S5P_CIGCTRL_INVPOLHSYNC		(1 << 4)
+#define S5P_CIGCTRL_SELCAM_MIPI		(1 << 3)
+#define S5P_CIGCTRL_INTERLACE		(1 << 0)
+
+/* Window offset 2 */
+#define S5P_CIWDOFST2			0x14
+#define S5P_CIWDOFST2_HOROFF_MASK	(0xfff << 16)
+#define S5P_CIWDOFST2_VEROFF_MASK	(0xfff << 0)
+#define S5P_CIWDOFST2_HOROFF(x)		((x) << 16)
+#define S5P_CIWDOFST2_VEROFF(x)		((x) << 0)
+
+/* Output DMA Y plane start address */
+#define S5P_CIOYSA1			0x18
+#define S5P_CIOYSA2			0x1c
+#define S5P_CIOYSA3			0x20
+#define S5P_CIOYSA4			0x24
+
+/* Output DMA Cb plane start address */
+#define S5P_CIOCBSA1			0x28
+#define S5P_CIOCBSA2			0x2c
+#define S5P_CIOCBSA3			0x30
+#define S5P_CIOCBSA4			0x34
+
+/* Output DMA Cr plane start address */
+#define S5P_CIOCRSA1			0x38
+#define S5P_CIOCRSA2			0x3c
+#define S5P_CIOCRSA3			0x40
+#define S5P_CIOCRSA4			0x44
+
+/* Target image format */
+#define S5P_CITRGFMT			0x48
+#define S5P_CITRGFMT_INROT90		(1 << 31)
+#define S5P_CITRGFMT_YCBCR420		(0 << 29)
+#define S5P_CITRGFMT_YCBCR422		(1 << 29)
+#define S5P_CITRGFMT_YCBCR422_1P	(2 << 29)
+#define S5P_CITRGFMT_RGB		(3 << 29)
+#define S5P_CITRGFMT_FMT_MASK		(3 << 29)
+#define S5P_CITRGFMT_HSIZE_MASK		(0xfff << 16)
+#define S5P_CITRGFMT_FLIP_SHIFT		(14)
+#define S5P_CITRGFMT_FLIP_NORMAL	(0 << 14)
+#define S5P_CITRGFMT_FLIP_X_MIRROR	(1 << 14)
+#define S5P_CITRGFMT_FLIP_Y_MIRROR	(2 << 14)
+#define S5P_CITRGFMT_FLIP_180		(3 << 14)
+#define S5P_CITRGFMT_FLIP_MASK		(3 << 14)
+#define S5P_CITRGFMT_OUTROT90		(1 << 13)
+#define S5P_CITRGFMT_VSIZE_MASK		(0xfff << 0)
+#define S5P_CITRGFMT_HSIZE(x)		((x) << 16)
+#define S5P_CITRGFMT_VSIZE(x)		((x) << 0)
+
+/* Output DMA control */
+#define S5P_CIOCTRL			0x4c
+#define S5P_CIOCTRL_ORDER422_MASK	(3 << 0)
+#define S5P_CIOCTRL_ORDER422_CRYCBY	(0 << 0)
+#define S5P_CIOCTRL_ORDER422_YCRYCB	(1 << 0)
+#define S5P_CIOCTRL_ORDER422_CBYCRY	(2 << 0)
+#define S5P_CIOCTRL_ORDER422_YCBYCR	(3 << 0)
+#define S5P_CIOCTRL_LASTIRQ_ENABLE	(1 << 2)
+#define S5P_CIOCTRL_YCBCR_3PLANE	(0 << 3)
+#define S5P_CIOCTRL_YCBCR_2PLANE	(1 << 3)
+#define S5P_CIOCTRL_YCBCR_PLANE_MASK	(1 << 3)
+#define S5P_CIOCTRL_ORDER2P_SHIFT	(24)
+#define S5P_CIOCTRL_ORDER2P_MASK	(3 << 24)
+#define S5P_CIOCTRL_ORDER422_2P_LSB_CRCB (0 << 24)
+
+/* Pre-scaler control 1 */
+#define S5P_CISCPRERATIO		0x50
+#define S5P_CISCPRERATIO_SHFACTOR(x)	((x) << 28)
+#define S5P_CISCPRERATIO_HOR(x)		((x) << 16)
+#define S5P_CISCPRERATIO_VER(x)		((x) << 0)
+
+#define S5P_CISCPREDST			0x54
+#define S5P_CISCPREDST_WIDTH(x)		((x) << 16)
+#define S5P_CISCPREDST_HEIGHT(x)	((x) << 0)
+
+/* Main scaler control */
+#define S5P_CISCCTRL			0x58
+#define S5P_CISCCTRL_SCALERBYPASS	(1 << 31)
+#define S5P_CISCCTRL_SCALEUP_H		(1 << 30)
+#define S5P_CISCCTRL_SCALEUP_V		(1 << 29)
+#define S5P_CISCCTRL_CSCR2Y_WIDE	(1 << 28)
+#define S5P_CISCCTRL_CSCY2R_WIDE	(1 << 27)
+#define S5P_CISCCTRL_LCDPATHEN_FIFO	(1 << 26)
+#define S5P_CISCCTRL_INTERLACE		(1 << 25)
+#define S5P_CISCCTRL_SCALERSTART	(1 << 15)
+#define S5P_CISCCTRL_INRGB_FMT_RGB565	(0 << 13)
+#define S5P_CISCCTRL_INRGB_FMT_RGB666	(1 << 13)
+#define S5P_CISCCTRL_INRGB_FMT_RGB888	(2 << 13)
+#define S5P_CISCCTRL_INRGB_FMT_MASK	(3 << 13)
+#define S5P_CISCCTRL_OUTRGB_FMT_RGB565	(0 << 11)
+#define S5P_CISCCTRL_OUTRGB_FMT_RGB666	(1 << 11)
+#define S5P_CISCCTRL_OUTRGB_FMT_RGB888	(2 << 11)
+#define S5P_CISCCTRL_OUTRGB_FMT_MASK	(3 << 11)
+#define S5P_CISCCTRL_RGB_EXT		(1 << 10)
+#define S5P_CISCCTRL_ONE2ONE		(1 << 9)
+#define S5P_CISCCTRL_SC_HORRATIO(x)	((x) << 16)
+#define S5P_CISCCTRL_SC_VERRATIO(x)	((x) << 0)
+
+/* Target area */
+#define S5P_CITAREA			0x5c
+#define S5P_CITAREA_MASK		0x0fffffff
+
+/* General status */
+#define S5P_CISTATUS			0x64
+#define S5P_CISTATUS_OVFIY		(1 << 31)
+#define S5P_CISTATUS_OVFICB		(1 << 30)
+#define S5P_CISTATUS_OVFICR		(1 << 29)
+#define S5P_CISTATUS_VSYNC		(1 << 28)
+#define S5P_CISTATUS_WINOFF_EN		(1 << 25)
+#define S5P_CISTATUS_IMGCPT_EN		(1 << 22)
+#define S5P_CISTATUS_IMGCPT_SCEN	(1 << 21)
+#define S5P_CISTATUS_VSYNC_A		(1 << 20)
+#define S5P_CISTATUS_VSYNC_B		(1 << 19)
+#define S5P_CISTATUS_OVRLB		(1 << 18)
+#define S5P_CISTATUS_FRAME_END		(1 << 17)
+#define S5P_CISTATUS_LASTCAPT_END	(1 << 16)
+#define S5P_CISTATUS_VVALID_A		(1 << 15)
+#define S5P_CISTATUS_VVALID_B		(1 << 14)
+
+/* Image capture control */
+#define S5P_CIIMGCPT			0xc0
+#define S5P_CIIMGCPT_IMGCPTEN		(1 << 31)
+#define S5P_CIIMGCPT_IMGCPTEN_SC	(1 << 30)
+#define S5P_CIIMGCPT_CPT_FREN_ENABLE	(1 << 25)
+#define S5P_CIIMGCPT_CPT_FRMOD_CNT	(1 << 18)
+
+/* Frame capture sequence */
+#define S5P_CICPTSEQ			0xc4
+
+/* Image effect */
+#define S5P_CIIMGEFF			0xd0
+#define S5P_CIIMGEFF_IE_DISABLE		(0 << 30)
+#define S5P_CIIMGEFF_IE_ENABLE		(1 << 30)
+#define S5P_CIIMGEFF_IE_SC_BEFORE	(0 << 29)
+#define S5P_CIIMGEFF_IE_SC_AFTER	(1 << 29)
+#define S5P_CIIMGEFF_FIN_BYPASS		(0 << 26)
+#define S5P_CIIMGEFF_FIN_ARBITRARY	(1 << 26)
+#define S5P_CIIMGEFF_FIN_NEGATIVE	(2 << 26)
+#define S5P_CIIMGEFF_FIN_ARTFREEZE	(3 << 26)
+#define S5P_CIIMGEFF_FIN_EMBOSSING	(4 << 26)
+#define S5P_CIIMGEFF_FIN_SILHOUETTE	(5 << 26)
+#define S5P_CIIMGEFF_FIN_MASK		(7 << 26)
+#define S5P_CIIMGEFF_PAT_CBCR_MASK	((0xff < 13) | (0xff < 0))
+#define S5P_CIIMGEFF_PAT_CB(x)		((x) << 13)
+#define S5P_CIIMGEFF_PAT_CR(x)		((x) << 0)
+
+/* Input DMA Y/Cb/Cr plane start address 0 */
+#define S5P_CIIYSA0			0xd4
+#define S5P_CIICBSA0			0xd8
+#define S5P_CIICRSA0			0xdc
+
+/* Real input DMA image size */
+#define S5P_CIREAL_ISIZE		0xf8
+#define S5P_CIREAL_ISIZE_AUTOLOAD_EN	(1 << 31)
+#define S5P_CIREAL_ISIZE_ADDR_CH_DIS	(1 << 30)
+#define S5P_CIREAL_ISIZE_HEIGHT(x)	((x) << 16)
+#define S5P_CIREAL_ISIZE_WIDTH(x)	((x) << 0)
+
+
+/* Input DMA control */
+#define S5P_MSCTRL			0xfc
+#define S5P_MSCTRL_IN_BURST_COUNT_MASK	(3 << 24)
+#define S5P_MSCTRL_2P_IN_ORDER_MASK	(3 << 16)
+#define S5P_MSCTRL_2P_IN_ORDER_SHIFT	16
+#define S5P_MSCTRL_C_INT_IN_3PLANE	(0 << 15)
+#define S5P_MSCTRL_C_INT_IN_2PLANE	(1 << 15)
+#define S5P_MSCTRL_C_INT_IN_MASK	(1 << 15)
+#define S5P_MSCTRL_FLIP_SHIFT		13
+#define S5P_MSCTRL_FLIP_MASK		(3 << 13)
+#define S5P_MSCTRL_FLIP_NORMAL		(0 << 13)
+#define S5P_MSCTRL_FLIP_X_MIRROR	(1 << 13)
+#define S5P_MSCTRL_FLIP_Y_MIRROR	(2 << 13)
+#define S5P_MSCTRL_FLIP_180		(3 << 13)
+#define S5P_MSCTRL_ORDER422_SHIFT	4
+#define S5P_MSCTRL_ORDER422_CRYCBY	(0 << 4)
+#define S5P_MSCTRL_ORDER422_YCRYCB	(1 << 4)
+#define S5P_MSCTRL_ORDER422_CBYCRY	(2 << 4)
+#define S5P_MSCTRL_ORDER422_YCBYCR	(3 << 4)
+#define S5P_MSCTRL_ORDER422_MASK	(3 << 4)
+#define S5P_MSCTRL_INPUT_EXTCAM		(0 << 3)
+#define S5P_MSCTRL_INPUT_MEMORY		(1 << 3)
+#define S5P_MSCTRL_INPUT_MASK		(1 << 3)
+#define S5P_MSCTRL_INFORMAT_YCBCR420	(0 << 1)
+#define S5P_MSCTRL_INFORMAT_YCBCR422	(1 << 1)
+#define S5P_MSCTRL_INFORMAT_YCBCR422_1P	(2 << 1)
+#define S5P_MSCTRL_INFORMAT_RGB		(3 << 1)
+#define S5P_MSCTRL_INFORMAT_MASK	(3 << 1)
+#define S5P_MSCTRL_ENVID		(1 << 0)
+#define S5P_MSCTRL_FRAME_COUNT(x)	((x) << 24)
+
+/* Input DMA Y/Cb/Cr plane start address 1 */
+#define S5P_CIIYSA1			0x144
+#define S5P_CIICBSA1			0x148
+#define S5P_CIICRSA1			0x14c
+
+/* Output DMA Y/Cb/Cr offset */
+#define S5P_CIOYOFF			0x168
+#define S5P_CIOCBOFF			0x16c
+#define S5P_CIOCROFF			0x170
+
+/* Input DMA Y/Cb/Cr offset */
+#define S5P_CIIYOFF			0x174
+#define S5P_CIICBOFF			0x178
+#define S5P_CIICROFF			0x17c
+
+#define S5P_CIO_OFFS_VER(x)		((x) << 16)
+#define S5P_CIO_OFFS_HOR(x)		((x) << 0)
+
+/* Input DMA original image size */
+#define S5P_ORGISIZE			0x180
+
+/* Output DMA original image size */
+#define S5P_ORGOSIZE			0x184
+
+#define S5P_ORIG_SIZE_VER(x)		((x) << 16)
+#define S5P_ORIG_SIZE_HOR(x)		((x) << 0)
+
+/* Real output DMA image size (extension register) */
+#define S5P_CIEXTEN			0x188
+
+#define S5P_CIDMAPARAM			0x18c
+#define S5P_CIDMAPARAM_R_LINEAR		(0 << 29)
+#define S5P_CIDMAPARAM_R_64X32		(3 << 29)
+#define S5P_CIDMAPARAM_W_LINEAR		(0 << 13)
+#define S5P_CIDMAPARAM_W_64X32		(3 << 13)
+#define S5P_CIDMAPARAM_TILE_MASK	((3 << 29) | (3 << 13))
+
+/* MIPI CSI image format */
+#define S5P_CSIIMGFMT			0x194
+
+#endif /* REGS_FIMC_H_ */
-- 
1.7.2

[PATCH v3 1/8] ARM: Samsung: Add register definitions for Samsung S5P SoC camera interface

[Kukjin Kim]

Sylwester Nawrocki wrote:
> 
> Add register definitions for the camera interface/video postprocessor
> contained in Samsung's S5P SoC series.
> 
> Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
> Reviewed-by: Pawel Osciak <p.osciak@samsung.com>
> Reviewed-by: Marek Szyprowski <m.szyprowski@samsung.com>
> ---
>  arch/arm/plat-samsung/include/plat/regs-fimc.h |  294
> ++++++++++++++++++++++++
>  1 files changed, 294 insertions(+), 0 deletions(-)
>  create mode 100644 arch/arm/plat-samsung/include/plat/regs-fimc.h
> 
> diff --git a/arch/arm/plat-samsung/include/plat/regs-fimc.h
b/arch/arm/plat-
> samsung/include/plat/regs-fimc.h
> new file mode 100644
> index 0000000..7f3141c
> --- /dev/null
> +++ b/arch/arm/plat-samsung/include/plat/regs-fimc.h
> @@ -0,0 +1,294 @@
> +/* arch/arm/plat-s5p/include/plat/regs-fimc.h
> + *
> + * Register definition file for Samsung Camera Interface (FIMC) driver
> + *
> + * Copyright (c) 2010 Samsung Electronics
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License version 2 as
> + * published by the Free Software Foundation.
> + */
> +
> +#ifndef REGS_FIMC_H_
> +#define REGS_FIMC_H_
> +
> +#define S5P_CIOYSA(__x)			(0x18 + (__x) * 4)
> +#define S5P_CIOCBSA(__x)		(0x28 + (__x) * 4)
> +#define S5P_CIOCRSA(__x)		(0x38 + (__x) * 4)
> +
> +/* Input source format */
> +#define S5P_CISRCFMT			0x00
> +#define S5P_CISRCFMT_ITU601_8BIT	(1 << 31)
> +#define S5P_CISRCFMT_ITU601_16BIT	(1 << 29)
> +#define S5P_CISRCFMT_ORDER422_YCBYCR	(0 << 14)
> +#define S5P_CISRCFMT_ORDER422_YCRYCB	(1 << 14)
> +#define S5P_CISRCFMT_ORDER422_CBYCRY	(2 << 14)
> +#define S5P_CISRCFMT_ORDER422_CRYCBY	(3 << 14)
> +#define S5P_CISRCFMT_HSIZE(x)		((x) << 16)
> +#define S5P_CISRCFMT_VSIZE(x)		((x) << 0)
> +
> +/* Window offset */
> +#define S5P_CIWDOFST			0x04
> +#define S5P_CIWDOFST_WINOFSEN		(1 << 31)
> +#define S5P_CIWDOFST_CLROVFIY		(1 << 30)
> +#define S5P_CIWDOFST_CLROVRLB		(1 << 29)
> +#define S5P_CIWDOFST_WINHOROFST_MASK	(0x7ff << 16)
> +#define S5P_CIWDOFST_CLROVFICB		(1 << 15)
> +#define S5P_CIWDOFST_CLROVFICR		(1 << 14)
> +#define S5P_CIWDOFST_WINHOROFST(x)	((x) << 16)
> +#define S5P_CIWDOFST_WINVEROFST(x)	((x) << 0)
> +#define S5P_CIWDOFST_WINVEROFST_MASK	(0xfff << 0)
> +
> +/* Global control */
> +#define S5P_CIGCTRL			0x08
> +#define S5P_CIGCTRL_SWRST		(1 << 31)
> +#define S5P_CIGCTRL_CAMRST_A		(1 << 30)
> +#define S5P_CIGCTRL_SELCAM_ITU_A	(1 << 29)
> +#define S5P_CIGCTRL_SELCAM_ITU_MASK	(1 << 29)
> +#define S5P_CIGCTRL_TESTPAT_NORMAL	(0 << 27)
> +#define S5P_CIGCTRL_TESTPAT_COLOR_BAR	(1 << 27)
> +#define S5P_CIGCTRL_TESTPAT_HOR_INC	(2 << 27)
> +#define S5P_CIGCTRL_TESTPAT_VER_INC	(3 << 27)
> +#define S5P_CIGCTRL_TESTPAT_MASK	(3 << 27)
> +#define S5P_CIGCTRL_TESTPAT_SHIFT	(27)
> +#define S5P_CIGCTRL_INVPOLPCLK		(1 << 26)
> +#define S5P_CIGCTRL_INVPOLVSYNC		(1 << 25)
> +#define S5P_CIGCTRL_INVPOLHREF		(1 << 24)
> +#define S5P_CIGCTRL_IRQ_OVFEN		(1 << 22)
> +#define S5P_CIGCTRL_HREF_MASK		(1 << 21)
> +#define S5P_CIGCTRL_IRQ_LEVEL		(1 << 20)
> +#define S5P_CIGCTRL_IRQ_CLR		(1 << 19)
> +#define S5P_CIGCTRL_IRQ_ENABLE		(1 << 16)
> +#define S5P_CIGCTRL_SHDW_DISABLE	(1 << 12)
> +#define S5P_CIGCTRL_SELCAM_MIPI_A	(1 << 7)
> +#define S5P_CIGCTRL_CAMIF_SELWB		(1 << 6)
> +#define S5P_CIGCTRL_INVPOLHSYNC		(1 << 4)
> +#define S5P_CIGCTRL_SELCAM_MIPI		(1 << 3)
> +#define S5P_CIGCTRL_INTERLACE		(1 << 0)
> +
> +/* Window offset 2 */
> +#define S5P_CIWDOFST2			0x14
> +#define S5P_CIWDOFST2_HOROFF_MASK	(0xfff << 16)
> +#define S5P_CIWDOFST2_VEROFF_MASK	(0xfff << 0)
> +#define S5P_CIWDOFST2_HOROFF(x)		((x) << 16)
> +#define S5P_CIWDOFST2_VEROFF(x)		((x) << 0)
> +
> +/* Output DMA Y plane start address */
> +#define S5P_CIOYSA1			0x18
> +#define S5P_CIOYSA2			0x1c
> +#define S5P_CIOYSA3			0x20
> +#define S5P_CIOYSA4			0x24
> +
> +/* Output DMA Cb plane start address */
> +#define S5P_CIOCBSA1			0x28
> +#define S5P_CIOCBSA2			0x2c
> +#define S5P_CIOCBSA3			0x30
> +#define S5P_CIOCBSA4			0x34
> +
> +/* Output DMA Cr plane start address */
> +#define S5P_CIOCRSA1			0x38
> +#define S5P_CIOCRSA2			0x3c
> +#define S5P_CIOCRSA3			0x40
> +#define S5P_CIOCRSA4			0x44
> +
> +/* Target image format */
> +#define S5P_CITRGFMT			0x48
> +#define S5P_CITRGFMT_INROT90		(1 << 31)
> +#define S5P_CITRGFMT_YCBCR420		(0 << 29)
> +#define S5P_CITRGFMT_YCBCR422		(1 << 29)
> +#define S5P_CITRGFMT_YCBCR422_1P	(2 << 29)
> +#define S5P_CITRGFMT_RGB		(3 << 29)
> +#define S5P_CITRGFMT_FMT_MASK		(3 << 29)
> +#define S5P_CITRGFMT_HSIZE_MASK		(0xfff << 16)
> +#define S5P_CITRGFMT_FLIP_SHIFT		(14)
> +#define S5P_CITRGFMT_FLIP_NORMAL	(0 << 14)
> +#define S5P_CITRGFMT_FLIP_X_MIRROR	(1 << 14)
> +#define S5P_CITRGFMT_FLIP_Y_MIRROR	(2 << 14)
> +#define S5P_CITRGFMT_FLIP_180		(3 << 14)
> +#define S5P_CITRGFMT_FLIP_MASK		(3 << 14)
> +#define S5P_CITRGFMT_OUTROT90		(1 << 13)
> +#define S5P_CITRGFMT_VSIZE_MASK		(0xfff << 0)
> +#define S5P_CITRGFMT_HSIZE(x)		((x) << 16)
> +#define S5P_CITRGFMT_VSIZE(x)		((x) << 0)
> +
> +/* Output DMA control */
> +#define S5P_CIOCTRL			0x4c
> +#define S5P_CIOCTRL_ORDER422_MASK	(3 << 0)
> +#define S5P_CIOCTRL_ORDER422_CRYCBY	(0 << 0)
> +#define S5P_CIOCTRL_ORDER422_YCRYCB	(1 << 0)
> +#define S5P_CIOCTRL_ORDER422_CBYCRY	(2 << 0)
> +#define S5P_CIOCTRL_ORDER422_YCBYCR	(3 << 0)
> +#define S5P_CIOCTRL_LASTIRQ_ENABLE	(1 << 2)
> +#define S5P_CIOCTRL_YCBCR_3PLANE	(0 << 3)
> +#define S5P_CIOCTRL_YCBCR_2PLANE	(1 << 3)
> +#define S5P_CIOCTRL_YCBCR_PLANE_MASK	(1 << 3)
> +#define S5P_CIOCTRL_ORDER2P_SHIFT	(24)
> +#define S5P_CIOCTRL_ORDER2P_MASK	(3 << 24)
> +#define S5P_CIOCTRL_ORDER422_2P_LSB_CRCB (0 << 24)
> +
> +/* Pre-scaler control 1 */
> +#define S5P_CISCPRERATIO		0x50
> +#define S5P_CISCPRERATIO_SHFACTOR(x)	((x) << 28)
> +#define S5P_CISCPRERATIO_HOR(x)		((x) << 16)
> +#define S5P_CISCPRERATIO_VER(x)		((x) << 0)
> +
> +#define S5P_CISCPREDST			0x54
> +#define S5P_CISCPREDST_WIDTH(x)		((x) << 16)
> +#define S5P_CISCPREDST_HEIGHT(x)	((x) << 0)
> +
> +/* Main scaler control */
> +#define S5P_CISCCTRL			0x58
> +#define S5P_CISCCTRL_SCALERBYPASS	(1 << 31)
> +#define S5P_CISCCTRL_SCALEUP_H		(1 << 30)
> +#define S5P_CISCCTRL_SCALEUP_V		(1 << 29)
> +#define S5P_CISCCTRL_CSCR2Y_WIDE	(1 << 28)
> +#define S5P_CISCCTRL_CSCY2R_WIDE	(1 << 27)
> +#define S5P_CISCCTRL_LCDPATHEN_FIFO	(1 << 26)
> +#define S5P_CISCCTRL_INTERLACE		(1 << 25)
> +#define S5P_CISCCTRL_SCALERSTART	(1 << 15)
> +#define S5P_CISCCTRL_INRGB_FMT_RGB565	(0 << 13)
> +#define S5P_CISCCTRL_INRGB_FMT_RGB666	(1 << 13)
> +#define S5P_CISCCTRL_INRGB_FMT_RGB888	(2 << 13)
> +#define S5P_CISCCTRL_INRGB_FMT_MASK	(3 << 13)
> +#define S5P_CISCCTRL_OUTRGB_FMT_RGB565	(0 << 11)
> +#define S5P_CISCCTRL_OUTRGB_FMT_RGB666	(1 << 11)
> +#define S5P_CISCCTRL_OUTRGB_FMT_RGB888	(2 << 11)
> +#define S5P_CISCCTRL_OUTRGB_FMT_MASK	(3 << 11)
> +#define S5P_CISCCTRL_RGB_EXT		(1 << 10)
> +#define S5P_CISCCTRL_ONE2ONE		(1 << 9)
> +#define S5P_CISCCTRL_SC_HORRATIO(x)	((x) << 16)
> +#define S5P_CISCCTRL_SC_VERRATIO(x)	((x) << 0)
> +
> +/* Target area */
> +#define S5P_CITAREA			0x5c
> +#define S5P_CITAREA_MASK		0x0fffffff
> +
> +/* General status */
> +#define S5P_CISTATUS			0x64
> +#define S5P_CISTATUS_OVFIY		(1 << 31)
> +#define S5P_CISTATUS_OVFICB		(1 << 30)
> +#define S5P_CISTATUS_OVFICR		(1 << 29)
> +#define S5P_CISTATUS_VSYNC		(1 << 28)
> +#define S5P_CISTATUS_WINOFF_EN		(1 << 25)
> +#define S5P_CISTATUS_IMGCPT_EN		(1 << 22)
> +#define S5P_CISTATUS_IMGCPT_SCEN	(1 << 21)
> +#define S5P_CISTATUS_VSYNC_A		(1 << 20)
> +#define S5P_CISTATUS_VSYNC_B		(1 << 19)
> +#define S5P_CISTATUS_OVRLB		(1 << 18)
> +#define S5P_CISTATUS_FRAME_END		(1 << 17)
> +#define S5P_CISTATUS_LASTCAPT_END	(1 << 16)
> +#define S5P_CISTATUS_VVALID_A		(1 << 15)
> +#define S5P_CISTATUS_VVALID_B		(1 << 14)
> +
> +/* Image capture control */
> +#define S5P_CIIMGCPT			0xc0
> +#define S5P_CIIMGCPT_IMGCPTEN		(1 << 31)
> +#define S5P_CIIMGCPT_IMGCPTEN_SC	(1 << 30)
> +#define S5P_CIIMGCPT_CPT_FREN_ENABLE	(1 << 25)
> +#define S5P_CIIMGCPT_CPT_FRMOD_CNT	(1 << 18)
> +
> +/* Frame capture sequence */
> +#define S5P_CICPTSEQ			0xc4
> +
> +/* Image effect */
> +#define S5P_CIIMGEFF			0xd0
> +#define S5P_CIIMGEFF_IE_DISABLE		(0 << 30)
> +#define S5P_CIIMGEFF_IE_ENABLE		(1 << 30)
> +#define S5P_CIIMGEFF_IE_SC_BEFORE	(0 << 29)
> +#define S5P_CIIMGEFF_IE_SC_AFTER	(1 << 29)
> +#define S5P_CIIMGEFF_FIN_BYPASS		(0 << 26)
> +#define S5P_CIIMGEFF_FIN_ARBITRARY	(1 << 26)
> +#define S5P_CIIMGEFF_FIN_NEGATIVE	(2 << 26)
> +#define S5P_CIIMGEFF_FIN_ARTFREEZE	(3 << 26)
> +#define S5P_CIIMGEFF_FIN_EMBOSSING	(4 << 26)
> +#define S5P_CIIMGEFF_FIN_SILHOUETTE	(5 << 26)
> +#define S5P_CIIMGEFF_FIN_MASK		(7 << 26)
> +#define S5P_CIIMGEFF_PAT_CBCR_MASK	((0xff < 13) | (0xff < 0))
> +#define S5P_CIIMGEFF_PAT_CB(x)		((x) << 13)
> +#define S5P_CIIMGEFF_PAT_CR(x)		((x) << 0)
> +
> +/* Input DMA Y/Cb/Cr plane start address 0 */
> +#define S5P_CIIYSA0			0xd4
> +#define S5P_CIICBSA0			0xd8
> +#define S5P_CIICRSA0			0xdc
> +
> +/* Real input DMA image size */
> +#define S5P_CIREAL_ISIZE		0xf8
> +#define S5P_CIREAL_ISIZE_AUTOLOAD_EN	(1 << 31)
> +#define S5P_CIREAL_ISIZE_ADDR_CH_DIS	(1 << 30)
> +#define S5P_CIREAL_ISIZE_HEIGHT(x)	((x) << 16)
> +#define S5P_CIREAL_ISIZE_WIDTH(x)	((x) << 0)
> +
> +
> +/* Input DMA control */
> +#define S5P_MSCTRL			0xfc
> +#define S5P_MSCTRL_IN_BURST_COUNT_MASK	(3 << 24)
> +#define S5P_MSCTRL_2P_IN_ORDER_MASK	(3 << 16)
> +#define S5P_MSCTRL_2P_IN_ORDER_SHIFT	16
> +#define S5P_MSCTRL_C_INT_IN_3PLANE	(0 << 15)
> +#define S5P_MSCTRL_C_INT_IN_2PLANE	(1 << 15)
> +#define S5P_MSCTRL_C_INT_IN_MASK	(1 << 15)
> +#define S5P_MSCTRL_FLIP_SHIFT		13
> +#define S5P_MSCTRL_FLIP_MASK		(3 << 13)
> +#define S5P_MSCTRL_FLIP_NORMAL		(0 << 13)
> +#define S5P_MSCTRL_FLIP_X_MIRROR	(1 << 13)
> +#define S5P_MSCTRL_FLIP_Y_MIRROR	(2 << 13)
> +#define S5P_MSCTRL_FLIP_180		(3 << 13)
> +#define S5P_MSCTRL_ORDER422_SHIFT	4
> +#define S5P_MSCTRL_ORDER422_CRYCBY	(0 << 4)
> +#define S5P_MSCTRL_ORDER422_YCRYCB	(1 << 4)
> +#define S5P_MSCTRL_ORDER422_CBYCRY	(2 << 4)
> +#define S5P_MSCTRL_ORDER422_YCBYCR	(3 << 4)
> +#define S5P_MSCTRL_ORDER422_MASK	(3 << 4)
> +#define S5P_MSCTRL_INPUT_EXTCAM		(0 << 3)
> +#define S5P_MSCTRL_INPUT_MEMORY		(1 << 3)
> +#define S5P_MSCTRL_INPUT_MASK		(1 << 3)
> +#define S5P_MSCTRL_INFORMAT_YCBCR420	(0 << 1)
> +#define S5P_MSCTRL_INFORMAT_YCBCR422	(1 << 1)
> +#define S5P_MSCTRL_INFORMAT_YCBCR422_1P	(2 << 1)
> +#define S5P_MSCTRL_INFORMAT_RGB		(3 << 1)
> +#define S5P_MSCTRL_INFORMAT_MASK	(3 << 1)
> +#define S5P_MSCTRL_ENVID		(1 << 0)
> +#define S5P_MSCTRL_FRAME_COUNT(x)	((x) << 24)
> +
> +/* Input DMA Y/Cb/Cr plane start address 1 */
> +#define S5P_CIIYSA1			0x144
> +#define S5P_CIICBSA1			0x148
> +#define S5P_CIICRSA1			0x14c
> +
> +/* Output DMA Y/Cb/Cr offset */
> +#define S5P_CIOYOFF			0x168
> +#define S5P_CIOCBOFF			0x16c
> +#define S5P_CIOCROFF			0x170
> +
> +/* Input DMA Y/Cb/Cr offset */
> +#define S5P_CIIYOFF			0x174
> +#define S5P_CIICBOFF			0x178
> +#define S5P_CIICROFF			0x17c
> +
> +#define S5P_CIO_OFFS_VER(x)		((x) << 16)
> +#define S5P_CIO_OFFS_HOR(x)		((x) << 0)
> +
> +/* Input DMA original image size */
> +#define S5P_ORGISIZE			0x180
> +
> +/* Output DMA original image size */
> +#define S5P_ORGOSIZE			0x184
> +
> +#define S5P_ORIG_SIZE_VER(x)		((x) << 16)
> +#define S5P_ORIG_SIZE_HOR(x)		((x) << 0)
> +
> +/* Real output DMA image size (extension register) */
> +#define S5P_CIEXTEN			0x188
> +
> +#define S5P_CIDMAPARAM			0x18c
> +#define S5P_CIDMAPARAM_R_LINEAR		(0 << 29)
> +#define S5P_CIDMAPARAM_R_64X32		(3 << 29)
> +#define S5P_CIDMAPARAM_W_LINEAR		(0 << 13)
> +#define S5P_CIDMAPARAM_W_64X32		(3 << 13)
> +#define S5P_CIDMAPARAM_TILE_MASK	((3 << 29) | (3 << 13))
> +
> +/* MIPI CSI image format */
> +#define S5P_CSIIMGFMT			0x194
> +
> +#endif /* REGS_FIMC_H_ */
> --

Looks ok...however, I'm still thinking whether really need all these
definitions.

Hmm...

Thanks.

Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.

[PATCH v3 1/8] ARM: Samsung: Add register definitions for Samsung S5P SoC camera interface

[Pawel Osciak]

Hello,

>Kukjin Kim <kgene.kim@samsung.com> wrote:
>Sylwester Nawrocki wrote:
>>
>> Add register definitions for the camera interface/video postprocessor
>> contained in Samsung's S5P SoC series.
>>
>> Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
>> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
>> Reviewed-by: Pawel Osciak <p.osciak@samsung.com>
>> Reviewed-by: Marek Szyprowski <m.szyprowski@samsung.com>
>> ---
>>  arch/arm/plat-samsung/include/plat/regs-fimc.h |  294
>> ++++++++++++++++++++++++
>>  1 files changed, 294 insertions(+), 0 deletions(-)
>>  create mode 100644 arch/arm/plat-samsung/include/plat/regs-fimc.h
>>
>> diff --git a/arch/arm/plat-samsung/include/plat/regs-fimc.h
>b/arch/arm/plat-
>> samsung/include/plat/regs-fimc.h
>> new file mode 100644
>> index 0000000..7f3141c
>> --- /dev/null
>> +++ b/arch/arm/plat-samsung/include/plat/regs-fimc.h
>> @@ -0,0 +1,294 @@
>> +/* arch/arm/plat-s5p/include/plat/regs-fimc.h
>> + *
>> + * Register definition file for Samsung Camera Interface (FIMC) driver

<snip>

>
>Looks ok...however, I'm still thinking whether really need all these
>definitions.
>
>Hmm...
>

Well, some of them are indeed unused, but it's not an uncommon practice in
kernel and might help future developers.


Best regards
--
Pawel Osciak
Linux Platform Group
Samsung Poland R&D Center

[PATCH v3 1/8] ARM: Samsung: Add register definitions for Samsung S5P SoC camera interface

[Russell King - ARM Linux]

On Mon, Aug 02, 2010 at 12:32:20PM +0200, Pawel Osciak wrote:
> Well, some of them are indeed unused, but it's not an uncommon practice in
> kernel and might help future developers.

On the other hand, arch/arm is getting soo big that we need to do
something about this - and one solution is to avoid unnecessary
definitions that we're not using.

Another good idea is to put definitions along side the drivers which
they're relevant to - maybe in a local driver-name.h file which
driver-name.c includes, or maybe even within driver-name.c if they're
not excessive.  This has the advantage of distributing the "bloat" to
where its actually used, and means that the driver isn't dependent so
much on arch/arm or even the SoC itself.

Take a look at arch/arm/mach-vexpress/include/mach/ct-ca9x4.h and
arch/arm/mach-vexpress/include/mach/motherboard.h - these are the only
two files which contain platform definitions which are actually used
for Versatile Express.  Compare that with
arch/arm/mach-realview/include/mach/platform.h which contains lots
more...

[PATCH v3 1/8] ARM: Samsung: Add register definitions for Samsung S5P SoC camera interface

[Marek Szyprowski]

Hello,

On Monday, August 02, 2010 12:52 PM Russell King wrote:

> On Mon, Aug 02, 2010 at 12:32:20PM +0200, Pawel Osciak wrote:
> > Well, some of them are indeed unused, but it's not an uncommon practice
> in
> > kernel and might help future developers.
> 
> On the other hand, arch/arm is getting soo big that we need to do
> something about this - and one solution is to avoid unnecessary
> definitions that we're not using.
> 
> Another good idea is to put definitions along side the drivers which
> they're relevant to - maybe in a local driver-name.h file which
> driver-name.c includes, or maybe even within driver-name.c if they're
> not excessive.  This has the advantage of distributing the "bloat" to
> where its actually used, and means that the driver isn't dependent so
> much on arch/arm or even the SoC itself.

Well, with FIMC driver we just followed the style from other Samsung
drivers. Just take a look at video/s3c-fb or usb/gadget/s3c-hsotg.c.
I personally like to keep the same style for all drivers for Samsung
IPs. Changing the style of all of them requires some amount of work,
that would delay this particular driver even more so we will definitely
miss the merge window.

Best regards
--
Marek Szyprowski
Samsung Poland R&D Center

[PATCH v3 1/8] ARM: Samsung: Add register definitions for Samsung S5P SoC camera interface

[Mauro Carvalho Chehab]

Em 02-08-2010 07:52, Russell King - ARM Linux escreveu:
> On Mon, Aug 02, 2010 at 12:32:20PM +0200, Pawel Osciak wrote:
>> Well, some of them are indeed unused, but it's not an uncommon practice in
>> kernel and might help future developers.
> 
> On the other hand, arch/arm is getting soo big that we need to do
> something about this - and one solution is to avoid unnecessary
> definitions that we're not using.
> 
> Another good idea is to put definitions along side the drivers which
> they're relevant to - maybe in a local driver-name.h file which
> driver-name.c includes, or maybe even within driver-name.c if they're
> not excessive.  This has the advantage of distributing the "bloat" to
> where its actually used, and means that the driver isn't dependent so
> much on arch/arm or even the SoC itself.

Very much appreciated from my side. It is very hard to sync changes that
happen via arm trees when merging from my tree. There were several cases
in the past were I needed to coordinate with an ARM maintainer about when
he would merge from his tree, as the patches I had on media tree were
highly dependent on the patches at arch.

On several cases, I suspect that we had git bisect breakages (compilation
or driver miss-functioning) due to those sync issues between two trees.

A per-driver *.h file makes things easier, as such header file can be
merged/maintained together with the subsystem tree where the driver belongs.

> Take a look at arch/arm/mach-vexpress/include/mach/ct-ca9x4.h and
> arch/arm/mach-vexpress/include/mach/motherboard.h - these are the only
> two files which contain platform definitions which are actually used
> for Versatile Express.  Compare that with
> arch/arm/mach-realview/include/mach/platform.h which contains lots
> more...
> --
> To unsubscribe from this list: send the line "unsubscribe linux-media" in
> the body of a message to majordomo at vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

Cheers,
Mauro

[PATCH v3 1/8] ARM: Samsung: Add register definitions for Samsung S5P SoC camera interface

[Russell King - ARM Linux]

On Mon, Aug 02, 2010 at 08:51:06AM -0300, Mauro Carvalho Chehab wrote:
> Em 02-08-2010 07:52, Russell King - ARM Linux escreveu:
> > On Mon, Aug 02, 2010 at 12:32:20PM +0200, Pawel Osciak wrote:
> >> Well, some of them are indeed unused, but it's not an uncommon practice in
> >> kernel and might help future developers.
> > 
> > On the other hand, arch/arm is getting soo big that we need to do
> > something about this - and one solution is to avoid unnecessary
> > definitions that we're not using.
> > 
> > Another good idea is to put definitions along side the drivers which
> > they're relevant to - maybe in a local driver-name.h file which
> > driver-name.c includes, or maybe even within driver-name.c if they're
> > not excessive.  This has the advantage of distributing the "bloat" to
> > where its actually used, and means that the driver isn't dependent so
> > much on arch/arm or even the SoC itself.
> 
> Very much appreciated from my side. It is very hard to sync changes that
> happen via arm trees when merging from my tree. There were several cases
> in the past were I needed to coordinate with an ARM maintainer about when
> he would merge from his tree, as the patches I had on media tree were
> highly dependent on the patches at arch.

That's a separate problem - one which occurs when there's platform
code in arch/arm/ which shares a common data structure with driver
code under drivers/.

I don't think there's an easy resolution to that one, because if
you split the arch/arm/ change (which may depend on other arch/arm/
changes) from the drivers/ change, someone ends up losing no matter
where the header file with the common data structure is placed.

One answer to that is to kill the idea that every ARM architecture
needs to define their own watchdog platform data - and instead
replace it with a shared watchdog_platform_data structure, much like
the flash_platform_data structure in arch/arm/include/asm/mach/flash.h
(which'd would be nice to be under include/linux ...)

[PATCH v3 1/8] ARM: Samsung: Add register definitions for Samsung S5P SoC camera interface

[Pawel Osciak]

>Russell King - ARM Linux <linux@arm.linux.org.uk> wrote:
>On Mon, Aug 02, 2010 at 12:32:20PM +0200, Pawel Osciak wrote:
>> Well, some of them are indeed unused, but it's not an uncommon practice in
>> kernel and might help future developers.
>
>On the other hand, arch/arm is getting soo big that we need to do
>something about this - and one solution is to avoid unnecessary
>definitions that we're not using.
>
>Another good idea is to put definitions along side the drivers which
>they're relevant to - maybe in a local driver-name.h file which
>driver-name.c includes, or maybe even within driver-name.c if they're
>not excessive.  This has the advantage of distributing the "bloat" to
>where its actually used, and means that the driver isn't dependent so
>much on arch/arm or even the SoC itself.
>
>Take a look at arch/arm/mach-vexpress/include/mach/ct-ca9x4.h and
>arch/arm/mach-vexpress/include/mach/motherboard.h - these are the only
>two files which contain platform definitions which are actually used
>for Versatile Express.  Compare that with
>arch/arm/mach-realview/include/mach/platform.h which contains lots
>more...

So basically, what you and Mauro are recommending is that we move the *.h
file with register definitions to drivers/media?


Best regards
--
Pawel Osciak
Linux Platform Group
Samsung Poland R&D Center

[PATCH v3 1/8] ARM: Samsung: Add register definitions for Samsung S5P SoC camera interface

[Russell King - ARM Linux]

On Mon, Aug 02, 2010 at 02:08:42PM +0200, Pawel Osciak wrote:
> >Russell King - ARM Linux <linux@arm.linux.org.uk> wrote:
> >On Mon, Aug 02, 2010 at 12:32:20PM +0200, Pawel Osciak wrote:
> >> Well, some of them are indeed unused, but it's not an uncommon practice in
> >> kernel and might help future developers.
> >
> >On the other hand, arch/arm is getting soo big that we need to do
> >something about this - and one solution is to avoid unnecessary
> >definitions that we're not using.
> >
> >Another good idea is to put definitions along side the drivers which
> >they're relevant to - maybe in a local driver-name.h file which
> >driver-name.c includes, or maybe even within driver-name.c if they're
> >not excessive.  This has the advantage of distributing the "bloat" to
> >where its actually used, and means that the driver isn't dependent so
> >much on arch/arm or even the SoC itself.
> >
> >Take a look at arch/arm/mach-vexpress/include/mach/ct-ca9x4.h and
> >arch/arm/mach-vexpress/include/mach/motherboard.h - these are the only
> >two files which contain platform definitions which are actually used
> >for Versatile Express.  Compare that with
> >arch/arm/mach-realview/include/mach/platform.h which contains lots
> >more...
> 
> So basically, what you and Mauro are recommending is that we move the *.h
> file with register definitions to drivers/media?

What I'm suggesting is what's been pretty standard in Linux for a long
time.  Take a look at: drivers/net/3c503.[ch], or for a more recent
driver, drivers/net/e1000/*.[ch].  Or drivers/mmc/host/mmci.[ch]

Putting definitions which are only used by one driver in arch/arm/*/include
is silly.

[PATCH v3 1/8] ARM: Samsung: Add register definitions for Samsung S5P SoC camera interface

[Kukjin Kim]

Russell King wrote:
> 
> On Mon, Aug 02, 2010 at 02:08:42PM +0200, Pawel Osciak wrote:
> > >Russell King - ARM Linux <linux@arm.linux.org.uk> wrote:
> > >On Mon, Aug 02, 2010 at 12:32:20PM +0200, Pawel Osciak wrote:
> > >> Well, some of them are indeed unused, but it's not an uncommon
practice in
> > >> kernel and might help future developers.
> > >
> > >On the other hand, arch/arm is getting soo big that we need to do
> > >something about this - and one solution is to avoid unnecessary
> > >definitions that we're not using.
> > >
> > >Another good idea is to put definitions along side the drivers which
> > >they're relevant to - maybe in a local driver-name.h file which
> > >driver-name.c includes, or maybe even within driver-name.c if they're
> > >not excessive.  This has the advantage of distributing the "bloat" to
> > >where its actually used, and means that the driver isn't dependent so
> > >much on arch/arm or even the SoC itself.
> > >
> > >Take a look at arch/arm/mach-vexpress/include/mach/ct-ca9x4.h and
> > >arch/arm/mach-vexpress/include/mach/motherboard.h - these are the only
> > >two files which contain platform definitions which are actually used
> > >for Versatile Express.  Compare that with
> > >arch/arm/mach-realview/include/mach/platform.h which contains lots
> > >more...
> >
> > So basically, what you and Mauro are recommending is that we move the
*.h
> > file with register definitions to drivers/media?
> 
> What I'm suggesting is what's been pretty standard in Linux for a long
> time.  Take a look at: drivers/net/3c503.[ch], or for a more recent
> driver, drivers/net/e1000/*.[ch].  Or drivers/mmc/host/mmci.[ch]
> 
I agree with Russell's opinion.
I don't want to add unnecessary(or unavailable in arch/arm) definitions in
arch/arm/*/include

> Putting definitions which are only used by one driver in
arch/arm/*/include
> is silly.

Thanks.

Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.

[PATCH v3 1/8] ARM: Samsung: Add register definitions for Samsung S5P SoC camera interface

[Kyungmin Park]

On Tue, Aug 3, 2010 at 9:46 AM, Kukjin Kim <kgene.kim@samsung.com> wrote:
> Russell King wrote:
>>
>> On Mon, Aug 02, 2010 at 02:08:42PM +0200, Pawel Osciak wrote:
>> > >Russell King - ARM Linux <linux@arm.linux.org.uk> wrote:
>> > >On Mon, Aug 02, 2010 at 12:32:20PM +0200, Pawel Osciak wrote:
>> > >> Well, some of them are indeed unused, but it's not an uncommon
> practice in
>> > >> kernel and might help future developers.
>> > >
>> > >On the other hand, arch/arm is getting soo big that we need to do
>> > >something about this - and one solution is to avoid unnecessary
>> > >definitions that we're not using.
>> > >
>> > >Another good idea is to put definitions along side the drivers which
>> > >they're relevant to - maybe in a local driver-name.h file which
>> > >driver-name.c includes, or maybe even within driver-name.c if they're
>> > >not excessive. ?This has the advantage of distributing the "bloat" to
>> > >where its actually used, and means that the driver isn't dependent so
>> > >much on arch/arm or even the SoC itself.
>> > >
>> > >Take a look at arch/arm/mach-vexpress/include/mach/ct-ca9x4.h and
>> > >arch/arm/mach-vexpress/include/mach/motherboard.h - these are the only
>> > >two files which contain platform definitions which are actually used
>> > >for Versatile Express. ?Compare that with
>> > >arch/arm/mach-realview/include/mach/platform.h which contains lots
>> > >more...
>> >
>> > So basically, what you and Mauro are recommending is that we move the
> *.h
>> > file with register definitions to drivers/media?
>>
>> What I'm suggesting is what's been pretty standard in Linux for a long
>> time. ?Take a look at: drivers/net/3c503.[ch], or for a more recent
>> driver, drivers/net/e1000/*.[ch]. ?Or drivers/mmc/host/mmci.[ch]
>>
> I agree with Russell's opinion.
> I don't want to add unnecessary(or unavailable in arch/arm) definitions in
> arch/arm/*/include
>
>> Putting definitions which are only used by one driver in
> arch/arm/*/include
>> is silly.

I also happy with this method.

Thank you,
Kyungmin Park

[PATCH v3 2/8] v4l: Add driver for Samsung S3C/S5P SoC video postprocessor

[Sylwester Nawrocki]

This driver exports a video device node per each camera interface/
video postprocessor (FIMC) device contained in Samsung S3C/S5P SoC series.
The driver is based on v4l2-mem2mem framework.

Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Reviewed-by: Pawel Osciak <p.osciak@samsung.com>
Reviewed-by: Marek Szyprowski <m.szyprowski@samsung.com>
---
 drivers/media/video/Kconfig                  |   20 +
 drivers/media/video/Makefile                 |    1 +
 drivers/media/video/samsung/fimc/Makefile    |    3 +
 drivers/media/video/samsung/fimc/fimc-core.c | 1568 ++++++++++++++++++++++++++
 drivers/media/video/samsung/fimc/fimc-core.h |  490 ++++++++
 drivers/media/video/samsung/fimc/fimc-reg.c  |  571 ++++++++++
 include/linux/videodev2.h                    |    1 +
 7 files changed, 2654 insertions(+), 0 deletions(-)
 create mode 100644 drivers/media/video/samsung/fimc/Makefile
 create mode 100644 drivers/media/video/samsung/fimc/fimc-core.c
 create mode 100644 drivers/media/video/samsung/fimc/fimc-core.h
 create mode 100644 drivers/media/video/samsung/fimc/fimc-reg.c

diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index bdbc9d3..5895646 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -969,6 +969,16 @@ config VIDEO_OMAP2
 	---help---
 	  This is a v4l2 driver for the TI OMAP2 camera capture interface
 
+config  VIDEO_SAMSUNG_FIMC
+	tristate "Samsung S3C/S5P FIMC (video postprocessor) driver"
+	depends on VIDEO_DEV && VIDEO_V4L2
+	select VIDEOBUF_DMA_CONTIG
+	select V4L2_MEM2MEM_DEV
+	default n
+	help
+	  This is a v4l2 driver for the S3C/S5P camera interface
+	  (video postprocessor).
+
 #
 # USB Multimedia device configuration
 #
@@ -1150,4 +1160,14 @@ config VIDEO_MEM2MEM_TESTDEV
 	  This is a virtual test device for the memory-to-memory driver
 	  framework.
 
+config  VIDEO_SAMSUNG_FIMC
+	tristate "Samsung S3C/S5P FIMC (video postprocessor) driver"
+	depends on VIDEO_DEV && VIDEO_V4L2
+	select VIDEOBUF_DMA_CONTIG
+	select V4L2_MEM2MEM_DEV
+	default n
+	help
+	  This is a v4l2 driver for the S3C/S5P camera interface
+	  (video postprocessor)
+
 endif # V4L_MEM2MEM_DRIVERS
diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile
index cc93859..e4c2e1f 100644
--- a/drivers/media/video/Makefile
+++ b/drivers/media/video/Makefile
@@ -165,6 +165,7 @@ obj-$(CONFIG_VIDEO_MX1)			+= mx1_camera.o
 obj-$(CONFIG_VIDEO_MX3)			+= mx3_camera.o
 obj-$(CONFIG_VIDEO_PXA27x)		+= pxa_camera.o
 obj-$(CONFIG_VIDEO_SH_MOBILE_CEU)	+= sh_mobile_ceu_camera.o
+obj-$(CONFIG_VIDEO_SAMSUNG_FIMC) 	+= samsung/fimc/
 
 obj-$(CONFIG_ARCH_DAVINCI)		+= davinci/
 
diff --git a/drivers/media/video/samsung/fimc/Makefile b/drivers/media/video/samsung/fimc/Makefile
new file mode 100644
index 0000000..7804ebf
--- /dev/null
+++ b/drivers/media/video/samsung/fimc/Makefile
@@ -0,0 +1,3 @@
+
+obj-$(CONFIG_VIDEO_SAMSUNG_FIMC) := samsung-fimc.o
+samsung-fimc-y := fimc-core.o fimc-reg.o
diff --git a/drivers/media/video/samsung/fimc/fimc-core.c b/drivers/media/video/samsung/fimc/fimc-core.c
new file mode 100644
index 0000000..a108b1b
--- /dev/null
+++ b/drivers/media/video/samsung/fimc/fimc-core.c
@@ -0,0 +1,1568 @@
+/*
+ * S5P camera interface (video postprocessor) driver
+ *
+ * Copyright (c) 2010 Samsung Electronics
+ *
+ * Sylwester Nawrocki, <s.nawrocki@samsung.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published
+ * by the Free Software Foundiation. either version 2 of the License,
+ * or (at your option) any later version.
+ */
+
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/version.h>
+#include <linux/types.h>
+#include <linux/errno.h>
+#include <linux/bug.h>
+#include <linux/interrupt.h>
+#include <linux/device.h>
+#include <linux/platform_device.h>
+#include <linux/list.h>
+#include <linux/io.h>
+#include <linux/slab.h>
+#include <linux/clk.h>
+#include <media/v4l2-ioctl.h>
+#include <media/videobuf-dma-contig.h>
+
+#include "fimc-core.h"
+
+static char *fimc_clock_name[NUM_FIMC_CLOCKS] = { "sclk_fimc", "fimc" };
+
+struct fimc_fmt fimc_formats[] = {
+	{
+		.name	= "RGB565",
+		.fourcc	= V4L2_PIX_FMT_RGB565X,
+		.depth	= 16,
+		.color	= S5P_FIMC_RGB565,
+		.buff_cnt = 1,
+		.planes_cnt = 1
+	}, {
+		.name	= "RGB666",
+		.fourcc	= V4L2_PIX_FMT_RGB666,
+		.depth	= 32,
+		.color	= S5P_FIMC_RGB666,
+		.buff_cnt = 1,
+		.planes_cnt = 1
+	}, {
+		.name = "XRGB-8-8-8-8, 24 bpp",
+		.fourcc	= V4L2_PIX_FMT_RGB24,
+		.depth = 32,
+		.color	= S5P_FIMC_RGB888,
+		.buff_cnt = 1,
+		.planes_cnt = 1
+	}, {
+		.name	= "YUV 4:2:2 packed, YCbYCr",
+		.fourcc	= V4L2_PIX_FMT_YUYV,
+		.depth	= 16,
+		.color	= S5P_FIMC_YCBYCR422,
+		.buff_cnt = 1,
+		.planes_cnt = 1
+		}, {
+		.name	= "YUV 4:2:2 packed, CbYCrY",
+		.fourcc	= V4L2_PIX_FMT_UYVY,
+		.depth	= 16,
+		.color	= S5P_FIMC_CBYCRY422,
+		.buff_cnt = 1,
+		.planes_cnt = 1
+	}, {
+		.name	= "YUV 4:2:2 packed, CrYCbY",
+		.fourcc	= V4L2_PIX_FMT_VYUY,
+		.depth	= 16,
+		.color	= S5P_FIMC_CRYCBY422,
+		.buff_cnt = 1,
+		.planes_cnt = 1
+	}, {
+		.name	= "YUV 4:2:2 packed, YCrYCb",
+		.fourcc	= V4L2_PIX_FMT_YVYU,
+		.depth	= 16,
+		.color	= S5P_FIMC_YCRYCB422,
+		.buff_cnt = 1,
+		.planes_cnt = 1
+	}, {
+		.name	= "YUV 4:2:2 planar, Y/Cb/Cr",
+		.fourcc	= V4L2_PIX_FMT_YUV422P,
+		.depth	= 12,
+		.color	= S5P_FIMC_YCBCR422,
+		.buff_cnt = 1,
+		.planes_cnt = 3
+	}, {
+		.name	= "YUV 4:2:2 planar, Y/CbCr",
+		.fourcc	= V4L2_PIX_FMT_NV16,
+		.depth	= 16,
+		.color	= S5P_FIMC_YCBCR422,
+		.buff_cnt = 1,
+		.planes_cnt = 2
+	}, {
+		.name	= "YUV 4:2:2 planar, Y/CrCb",
+		.fourcc	= V4L2_PIX_FMT_NV61,
+		.depth	= 16,
+		.color	= S5P_FIMC_RGB565,
+		.buff_cnt = 1,
+		.planes_cnt = 2
+	}, {
+		.name	= "YUV 4:2:0 planar, YCbCr",
+		.fourcc	= V4L2_PIX_FMT_YUV420,
+		.depth	= 12,
+		.color	= S5P_FIMC_YCBCR420,
+		.buff_cnt = 1,
+		.planes_cnt = 3
+	}, {
+		.name	= "YUV 4:2:0 planar, Y/CbCr",
+		.fourcc	= V4L2_PIX_FMT_NV12,
+		.depth	= 12,
+		.color	= S5P_FIMC_YCBCR420,
+		.buff_cnt = 1,
+		.planes_cnt = 2
+	}
+ };
+
+static struct v4l2_queryctrl fimc_ctrls[] = {
+	{
+		.id		= V4L2_CID_HFLIP,
+		.type		= V4L2_CTRL_TYPE_BOOLEAN,
+		.name		= "Horizontal flip",
+		.minimum	= 0,
+		.maximum	= 1,
+		.default_value	= 0,
+	},
+	{
+		.id		= V4L2_CID_VFLIP,
+		.type		= V4L2_CTRL_TYPE_BOOLEAN,
+		.name		= "Vertical flip",
+		.minimum	= 0,
+		.maximum	= 1,
+		.default_value	= 0,
+	},
+	{
+		.id		= V4L2_CID_ROTATE,
+		.type		= V4L2_CTRL_TYPE_INTEGER,
+		.name		= "Rotation (CCW)",
+		.minimum	= 0,
+		.maximum	= 270,
+		.step		= 90,
+		.default_value	= 0,
+	},
+};
+
+
+static struct v4l2_queryctrl *get_ctrl(int id)
+{
+	int i;
+
+	for (i = 0; i < ARRAY_SIZE(fimc_ctrls); ++i)
+		if (id == fimc_ctrls[i].id)
+			return &fimc_ctrls[i];
+	return NULL;
+}
+
+int fimc_check_scaler_ratio(struct v4l2_rect *r, struct fimc_frame *f)
+{
+	int ret = 0;
+	if (r->width > f->width) {
+		if (f->width > (r->width * SCALER_MAX_HRATIO))
+			ret = 1;
+	} else {
+		if ((f->width * SCALER_MAX_HRATIO) < r->width)
+			ret = 1;
+	}
+
+	if (r->height > f->height) {
+		if (f->height > (r->height * SCALER_MAX_VRATIO))
+			ret = 1;
+	} else {
+		if ((f->height * SCALER_MAX_VRATIO) < r->height)
+			ret = 1;
+	}
+
+	return ret;
+}
+
+static int fimc_get_scaler_factor(u32 src, u32 tar, u32 *ratio, u32 *shift)
+{
+	if (src >= tar * 64) {
+		return -EINVAL;
+	} else if (src >= tar * 32) {
+		*ratio = 32;
+		*shift = 5;
+	} else if (src >= tar * 16) {
+		*ratio = 16;
+		*shift = 4;
+	} else if (src >= tar * 8) {
+		*ratio = 8;
+		*shift = 3;
+	} else if (src >= tar * 4) {
+		*ratio = 4;
+		*shift = 2;
+	} else if (src >= tar * 2) {
+		*ratio = 2;
+		*shift = 1;
+	} else {
+		*ratio = 1;
+		*shift = 0;
+	}
+
+	return 0;
+}
+
+int fimc_set_scaler_info(struct fimc_ctx *ctx)
+{
+	struct fimc_scaler *sc = &ctx->scaler;
+	struct fimc_frame *s_frame = &ctx->s_frame;
+	struct fimc_frame *d_frame = &ctx->d_frame;
+	int tx, ty, sx, sy;
+	int ret;
+
+	tx = d_frame->width;
+	ty = d_frame->height;
+	if (tx <= 0 || ty <= 0) {
+		v4l2_err(&ctx->fimc_dev->m2m.v4l2_dev,
+			"invalid target size: %d x %d", tx, ty);
+		return -EINVAL;
+	}
+
+	sx = s_frame->width;
+	sy = s_frame->height;
+	if (sx <= 0 || sy <= 0) {
+		err("invalid source size: %d x %d", sx, sy);
+		return -EINVAL;
+	}
+
+	sc->real_width = sx;
+	sc->real_height = sy;
+	dbg("sx= %d, sy= %d, tx= %d, ty= %d", sx, sy, tx, ty);
+
+	ret = fimc_get_scaler_factor(sx, tx, &sc->pre_hratio, &sc->hfactor);
+	if (ret)
+		return ret;
+
+	ret = fimc_get_scaler_factor(sy, ty,  &sc->pre_vratio, &sc->vfactor);
+	if (ret)
+		return ret;
+
+	sc->pre_dst_width = sx / sc->pre_hratio;
+	sc->pre_dst_height = sy / sc->pre_vratio;
+
+	sc->main_hratio = (sx << 8) / (tx << sc->hfactor);
+	sc->main_vratio = (sy << 8) / (ty << sc->vfactor);
+
+	sc->scaleup_h = (tx >= sx) ? 1 : 0;
+	sc->scaleup_v = (ty >= sy) ? 1 : 0;
+
+	/* check to see if input and output size/format differ */
+	if (s_frame->fmt->color == d_frame->fmt->color
+		&& s_frame->width == d_frame->width
+		&& s_frame->height == d_frame->height)
+		sc->copy_mode = 1;
+	else
+		sc->copy_mode = 0;
+
+	return 0;
+}
+
+
+static irqreturn_t fimc_isr(int irq, void *priv)
+{
+	struct fimc_vid_buffer *src_buf, *dst_buf;
+	struct fimc_dev *fimc = (struct fimc_dev *)priv;
+	struct fimc_ctx *ctx;
+
+	BUG_ON(!fimc);
+	fimc_hw_clear_irq(fimc);
+
+	spin_lock(&fimc->slock);
+
+	if (test_and_clear_bit(ST_M2M_PEND, &fimc->state)) {
+		ctx = v4l2_m2m_get_curr_priv(fimc->m2m.m2m_dev);
+		if (!ctx || !ctx->m2m_ctx)
+			goto isr_unlock;
+		src_buf = v4l2_m2m_src_buf_remove(ctx->m2m_ctx);
+		dst_buf = v4l2_m2m_dst_buf_remove(ctx->m2m_ctx);
+		if (src_buf && dst_buf) {
+			spin_lock(&fimc->irqlock);
+			src_buf->vb.state = dst_buf->vb.state =  VIDEOBUF_DONE;
+			wake_up(&src_buf->vb.done);
+			wake_up(&dst_buf->vb.done);
+			spin_unlock(&fimc->irqlock);
+			v4l2_m2m_job_finish(fimc->m2m.m2m_dev, ctx->m2m_ctx);
+		}
+	}
+
+isr_unlock:
+	spin_unlock(&fimc->slock);
+	return IRQ_HANDLED;
+}
+
+static void fimc_dma_run(void *priv)
+{
+	struct fimc_ctx *ctx = priv;
+	struct fimc_dev *fimc = ctx->fimc_dev;
+	unsigned long flags;
+	u32 ret;
+
+	if (WARN(!ctx, "null hardware context"))
+		return;
+
+	spin_lock_irqsave(&ctx->slock, flags);
+	set_bit(ST_M2M_PEND, &fimc->state);
+
+	ctx->state |= (FIMC_SRC_ADDR | FIMC_DST_ADDR);
+	ret = fimc_prepare_config(ctx, ctx->state);
+	if (ret) {
+		err("general configuration error");
+		goto dma_unlock;
+	}
+
+	if (fimc->m2m.ctx != ctx)
+		ctx->state |= FIMC_PARAMS;
+
+	fimc_hw_set_input_addr(fimc, &ctx->s_frame.paddr);
+
+	if (ctx->state & FIMC_PARAMS) {
+		fimc_hw_set_input_path(ctx);
+		fimc_hw_set_in_dma(ctx);
+		if (fimc_set_scaler_info(ctx)) {
+			err("scaler configuration error");
+			goto dma_unlock;
+		}
+		fimc_hw_set_prescaler(ctx);
+		fimc_hw_set_scaler(ctx);
+		fimc_hw_set_target_format(ctx);
+		fimc_hw_set_rotation(ctx);
+		fimc_hw_set_effect(ctx);
+	}
+
+	fimc_hw_set_output_path(ctx);
+	if (ctx->state & (FIMC_DST_ADDR | FIMC_PARAMS))
+		fimc_hw_set_output_addr(fimc, &ctx->d_frame.paddr);
+
+	if (ctx->state & FIMC_PARAMS)
+		fimc_hw_set_out_dma(ctx);
+
+	if (ctx->scaler.enabled)
+		fimc_hw_start_scaler(fimc);
+	fimc_hw_en_capture(ctx);
+
+	ctx->state = 0;
+	fimc_hw_start_in_dma(fimc);
+
+	fimc->m2m.ctx = ctx;
+
+dma_unlock:
+	spin_unlock_irqrestore(&ctx->slock, flags);
+}
+
+/* Nothing done in job_abort. */
+static void fimc_job_abort(void *priv) {}
+
+/* Set order for 1 and 2 plane YCBCR 4:2:2 formats. */
+static void fimc_set_yuv_order(struct fimc_ctx *ctx)
+{
+	/* The one only mode supported in SoC. */
+	ctx->in_order_2p = S5P_FIMC_LSB_CRCB;
+	ctx->out_order_2p = S5P_FIMC_LSB_CRCB;
+
+	/* Set order for 1 plane input formats. */
+	switch (ctx->s_frame.fmt->color) {
+	case S5P_FIMC_YCRYCB422:
+		ctx->in_order_1p = S5P_FIMC_IN_YCRYCB;
+		break;
+	case S5P_FIMC_CBYCRY422:
+		ctx->in_order_1p = S5P_FIMC_IN_CBYCRY;
+		break;
+	case S5P_FIMC_CRYCBY422:
+		ctx->in_order_1p = S5P_FIMC_IN_CRYCBY;
+		break;
+	case S5P_FIMC_YCBYCR422:
+	default:
+		ctx->in_order_1p = S5P_FIMC_IN_YCBYCR;
+		break;
+	}
+	dbg("ctx->in_order_1p= %d", ctx->in_order_1p);
+
+	switch (ctx->d_frame.fmt->color) {
+	case S5P_FIMC_YCRYCB422:
+		ctx->out_order_1p = S5P_FIMC_OUT_YCRYCB;
+		break;
+	case S5P_FIMC_CBYCRY422:
+		ctx->out_order_1p = S5P_FIMC_OUT_CBYCRY;
+		break;
+	case S5P_FIMC_CRYCBY422:
+		ctx->out_order_1p = S5P_FIMC_OUT_CRYCBY;
+		break;
+	case S5P_FIMC_YCBYCR422:
+	default:
+		ctx->out_order_1p = S5P_FIMC_OUT_YCBYCR;
+		break;
+	}
+	dbg("ctx->out_order_1p= %d", ctx->out_order_1p);
+}
+
+/**
+ * fimc_prepare_config - check dimensions, operation and color mode
+ *			 and pre-calculate offset and the scaling coefficients.
+ *
+ * @ctx: hardware context information
+ * @flags: flags indicating which parameters to check/update
+ *
+ * Return: 0 if dimensions are valid or non zero otherwise.
+ */
+int fimc_prepare_config(struct fimc_ctx *ctx, u32 flags)
+{
+	struct fimc_frame *s_frame, *d_frame;
+	struct fimc_vid_buffer *buf = NULL;
+	struct samsung_fimc_variant *variant = ctx->fimc_dev->variant;
+	int ret = 0;
+
+	s_frame = &ctx->s_frame;
+	d_frame = &ctx->d_frame;
+
+	if (flags & FIMC_PARAMS) {
+		if ((ctx->out_path == FIMC_DMA) &&
+			(ctx->rotation == 90 || ctx->rotation == 270)) {
+			swap(d_frame->f_width, d_frame->f_height);
+			swap(d_frame->width, d_frame->height);
+		}
+
+		/* Prepare the output offset ratios for scaler. */
+		d_frame->dma_offset.y_h = d_frame->offs_h;
+		if (!variant->pix_hoff)
+			d_frame->dma_offset.y_h *= (d_frame->fmt->depth >> 3);
+
+		d_frame->dma_offset.y_v = d_frame->offs_v;
+
+		d_frame->dma_offset.cb_h = d_frame->offs_h;
+		d_frame->dma_offset.cb_v = d_frame->offs_v;
+
+		d_frame->dma_offset.cr_h = d_frame->offs_h;
+		d_frame->dma_offset.cr_v = d_frame->offs_v;
+
+		if (!variant->pix_hoff && d_frame->fmt->planes_cnt == 3) {
+			d_frame->dma_offset.cb_h >>= 1;
+			d_frame->dma_offset.cb_v >>= 1;
+			d_frame->dma_offset.cr_h >>= 1;
+			d_frame->dma_offset.cr_v >>= 1;
+		}
+
+		dbg("out offset: color= %d, y_h= %d, y_v= %d",
+			d_frame->fmt->color,
+			d_frame->dma_offset.y_h, d_frame->dma_offset.y_v);
+
+		/* Prepare the input offset ratios for scaler. */
+		s_frame->dma_offset.y_h = s_frame->offs_h;
+		if (!variant->pix_hoff)
+			s_frame->dma_offset.y_h *= (s_frame->fmt->depth >> 3);
+		s_frame->dma_offset.y_v = s_frame->offs_v;
+
+		s_frame->dma_offset.cb_h = s_frame->offs_h;
+		s_frame->dma_offset.cb_v = s_frame->offs_v;
+
+		s_frame->dma_offset.cr_h = s_frame->offs_h;
+		s_frame->dma_offset.cr_v = s_frame->offs_v;
+
+		if (!variant->pix_hoff && s_frame->fmt->planes_cnt == 3) {
+			s_frame->dma_offset.cb_h >>= 1;
+			s_frame->dma_offset.cb_v >>= 1;
+			s_frame->dma_offset.cr_h >>= 1;
+			s_frame->dma_offset.cr_v >>= 1;
+		}
+
+		dbg("in offset: color= %d, y_h= %d, y_v= %d",
+			s_frame->fmt->color, s_frame->dma_offset.y_h,
+			s_frame->dma_offset.y_v);
+
+		fimc_set_yuv_order(ctx);
+
+		/* Check against the scaler ratio. */
+		if (s_frame->height > (SCALER_MAX_VRATIO * d_frame->height) ||
+		    s_frame->width > (SCALER_MAX_HRATIO * d_frame->width)) {
+			err("out of scaler range");
+			return -EINVAL;
+		}
+	}
+
+	/* Input DMA mode is not allowed when the scaler is disabled. */
+	ctx->scaler.enabled = 1;
+
+	if (flags & FIMC_SRC_ADDR) {
+		buf = v4l2_m2m_next_src_buf(ctx->m2m_ctx);
+		ret = fimc_prepare_addr(ctx, buf,
+			V4L2_BUF_TYPE_VIDEO_OUTPUT);
+		if (ret)
+			return ret;
+	}
+
+	if (flags & FIMC_DST_ADDR) {
+		buf = v4l2_m2m_next_dst_buf(ctx->m2m_ctx);
+		ret = fimc_prepare_addr(ctx, buf,
+			V4L2_BUF_TYPE_VIDEO_CAPTURE);
+	}
+
+	return ret;
+}
+
+/* The color format (planes_cnt, buff_cnt) must be already configured. */
+int fimc_prepare_addr(struct fimc_ctx *ctx,
+		struct fimc_vid_buffer *buf, enum v4l2_buf_type type)
+{
+	struct fimc_frame *frame;
+	struct fimc_addr *paddr;
+	u32 pix_size;
+	int ret = 0;
+
+	ctx_m2m_get_frame(frame, ctx, type);
+	paddr = &frame->paddr;
+
+	if (!buf)
+		return -EINVAL;
+
+	pix_size = frame->width * frame->height;
+
+	dbg("buff_cnt= %d, planes_cnt= %d, frame->size= %d, pix_size= %d",
+		frame->fmt->buff_cnt, frame->fmt->planes_cnt,
+		frame->size, pix_size);
+
+	if (frame->fmt->buff_cnt == 1) {
+		paddr->y = videobuf_to_dma_contig(&buf->vb);
+		switch (frame->fmt->planes_cnt) {
+		case 1:
+			paddr->cb = 0;
+			paddr->cr = 0;
+			break;
+		case 2:
+			/* decompose Y into Y/Cb */
+			paddr->cb = (u32)(paddr->y + pix_size);
+			paddr->cr = 0;
+			break;
+		case 3:
+			paddr->cb = (u32)(paddr->y + pix_size);
+			/* decompose Y into Y/Cb/Cr */
+			if (S5P_FIMC_YCBCR420 == frame->fmt->color)
+				paddr->cr = (u32)(paddr->cb
+						+ (pix_size >> 2));
+			else /* 422 */
+				paddr->cr = (u32)(paddr->cb
+						+ (pix_size >> 1));
+			break;
+		default:
+			return -EINVAL;
+		}
+	}
+
+	dbg("PHYS_ADDR: type= %d, y= 0x%X  cb= 0x%X cr= 0x%X ret= %d",
+	type, paddr->y, paddr->cb, paddr->cr, ret);
+
+	return ret;
+}
+
+static void fimc_buf_release(struct videobuf_queue *vq,
+				    struct videobuf_buffer *vb)
+{
+	videobuf_dma_contig_free(vq, vb);
+	vb->state = VIDEOBUF_NEEDS_INIT;
+}
+
+static int fimc_buf_setup(struct videobuf_queue *vq, unsigned int *count,
+				unsigned int *size)
+{
+	struct fimc_ctx *ctx = vq->priv_data;
+	struct fimc_frame *frame;
+
+	ctx_m2m_get_frame(frame, ctx, vq->type);
+
+	*size = (frame->width * frame->height * frame->fmt->depth) >> 3;
+	if (0 == *count)
+		*count = 1;
+	return 0;
+}
+
+static int fimc_buf_prepare(struct videobuf_queue *vq,
+		struct videobuf_buffer *vb, enum v4l2_field field)
+{
+	struct fimc_ctx *ctx = vq->priv_data;
+	struct v4l2_device *v4l2_dev = &ctx->fimc_dev->m2m.v4l2_dev;
+	struct fimc_frame *frame;
+	int ret;
+
+	ctx_m2m_get_frame(frame, ctx, vq->type);
+
+	if (vb->baddr) {
+		if (vb->bsize < frame->size) {
+			v4l2_err(v4l2_dev,
+				"User-provided buffer too small (%d < %d)\n",
+				 vb->bsize, frame->size);
+			WARN_ON(1);
+			return -EINVAL;
+		}
+	} else if (vb->state != VIDEOBUF_NEEDS_INIT
+		   && vb->bsize < frame->size) {
+		return -EINVAL;
+	}
+
+	vb->width       = frame->width;
+	vb->height      = frame->height;
+	vb->bytesperline = (frame->width * frame->fmt->depth) >> 3;
+	vb->size        = frame->size;
+	vb->field       = field;
+
+	if (VIDEOBUF_NEEDS_INIT == vb->state) {
+		ret = videobuf_iolock(vq, vb, NULL);
+		if (ret) {
+			v4l2_err(v4l2_dev, "Iolock failed\n");
+			fimc_buf_release(vq, vb);
+			return ret;
+		}
+	}
+	vb->state = VIDEOBUF_PREPARED;
+
+	return 0;
+}
+
+static void fimc_buf_queue(struct videobuf_queue *vq,
+				  struct videobuf_buffer *vb)
+{
+	struct fimc_ctx *ctx = vq->priv_data;
+	v4l2_m2m_buf_queue(ctx->m2m_ctx, vq, vb);
+}
+
+struct videobuf_queue_ops fimc_qops = {
+	.buf_setup	= fimc_buf_setup,
+	.buf_prepare	= fimc_buf_prepare,
+	.buf_queue	= fimc_buf_queue,
+	.buf_release	= fimc_buf_release,
+};
+
+static int fimc_m2m_querycap(struct file *file, void *priv,
+			   struct v4l2_capability *cap)
+{
+	struct fimc_ctx *ctx = file->private_data;
+	struct fimc_dev *fimc = ctx->fimc_dev;
+
+	strncpy(cap->driver, fimc->pdev->name, sizeof(cap->driver) - 1);
+	strncpy(cap->card, fimc->pdev->name, sizeof(cap->card) - 1);
+	cap->bus_info[0] = 0;
+	cap->version = KERNEL_VERSION(1, 0, 0);
+	cap->capabilities = V4L2_CAP_STREAMING |
+		V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_VIDEO_OUTPUT;
+
+	return 0;
+}
+
+int fimc_m2m_enum_fmt(struct file *file, void *priv, struct v4l2_fmtdesc *f)
+{
+	struct fimc_fmt *fmt;
+
+	if (f->index >= ARRAY_SIZE(fimc_formats))
+		return -EINVAL;
+
+	fmt = &fimc_formats[f->index];
+	strncpy(f->description, fmt->name, sizeof(f->description) - 1);
+	f->pixelformat = fmt->fourcc;
+	return 0;
+}
+
+static int fimc_m2m_g_fmt(struct file *file, void *priv, struct v4l2_format *f)
+{
+	struct fimc_ctx *ctx = priv;
+	struct fimc_frame *frame;
+
+	ctx_m2m_get_frame(frame, ctx, f->type);
+
+	f->fmt.pix.width	= frame->width;
+	f->fmt.pix.height	= frame->height;
+	f->fmt.pix.field	= V4L2_FIELD_NONE;
+	f->fmt.pix.pixelformat	= frame->fmt->fourcc;
+
+	return 0;
+}
+
+struct fimc_fmt *find_format(struct v4l2_format *f)
+{
+	struct fimc_fmt *fmt;
+	unsigned int i;
+
+	for (i = 0; i < ARRAY_SIZE(fimc_formats); ++i) {
+		fmt = &fimc_formats[i];
+		if (fmt->fourcc == f->fmt.pix.pixelformat)
+			break;
+	}
+	if (i == ARRAY_SIZE(fimc_formats))
+		return NULL;
+
+	return fmt;
+}
+
+static int fimc_m2m_try_fmt(struct file *file, void *priv,
+			     struct v4l2_format *f)
+{
+	struct fimc_fmt *fmt;
+	u32 max_width, max_height, mod_x, mod_y;
+	struct fimc_ctx *ctx = priv;
+	struct fimc_dev *fimc = ctx->fimc_dev;
+	struct v4l2_pix_format *pix = &f->fmt.pix;
+	struct samsung_fimc_variant *variant = fimc->variant;
+
+	fmt = find_format(f);
+	if (!fmt) {
+		v4l2_err(&fimc->m2m.v4l2_dev,
+			 "Fourcc format (0x%X) invalid.\n",  pix->pixelformat);
+		return -EINVAL;
+	}
+
+	if (pix->field == V4L2_FIELD_ANY)
+		pix->field = V4L2_FIELD_NONE;
+	else if (V4L2_FIELD_NONE != pix->field)
+		return -EINVAL;
+
+	if (f->type == V4L2_BUF_TYPE_VIDEO_OUTPUT) {
+		max_width = variant->scaler_dis_w;
+		max_height = variant->scaler_dis_w;
+		mod_x = variant->min_inp_pixsize;
+		mod_y = variant->min_inp_pixsize;
+	} else if (f->type == V4L2_BUF_TYPE_VIDEO_CAPTURE) {
+		max_width = variant->out_rot_dis_w;
+		max_height = variant->out_rot_dis_w;
+		mod_x = variant->min_out_pixsize;
+		mod_y = variant->min_out_pixsize;
+	} else {
+		err("Wrong stream type (%d)", f->type);
+		return -EINVAL;
+	}
+
+	dbg("max_w= %d, max_h= %d", max_width, max_height);
+
+	if (pix->height > max_height)
+		pix->height = max_height;
+	if (pix->width > max_width)
+		pix->width = max_width;
+
+	if (tiled_fmt(fmt)) {
+		mod_x = 64; /* 64x32 tile */
+		mod_y = 32;
+	}
+
+	dbg("mod_x= 0x%X, mod_y= 0x%X", mod_x, mod_y);
+
+	pix->width = (pix->width == 0) ? mod_x : ALIGN(pix->width, mod_x);
+	pix->height = (pix->height == 0) ? mod_y : ALIGN(pix->height, mod_y);
+
+	if (pix->bytesperline == 0 ||
+	    pix->bytesperline * 8 / fmt->depth > pix->width)
+		pix->bytesperline = (pix->width * fmt->depth) >> 3;
+
+	if (pix->sizeimage == 0)
+		pix->sizeimage = pix->height * pix->bytesperline;
+
+	dbg("pix->bytesperline= %d, fmt->depth= %d",
+	    pix->bytesperline, fmt->depth);
+
+	return 0;
+}
+
+
+static int fimc_m2m_s_fmt(struct file *file, void *priv, struct v4l2_format *f)
+{
+	struct fimc_ctx *ctx = priv;
+	struct v4l2_device *v4l2_dev = &ctx->fimc_dev->m2m.v4l2_dev;
+	struct videobuf_queue *src_vq, *dst_vq;
+	struct fimc_frame *frame;
+	struct v4l2_pix_format *pix;
+	unsigned long flags;
+	int ret = 0;
+
+	BUG_ON(!ctx);
+
+	ret = fimc_m2m_try_fmt(file, priv, f);
+	if (ret)
+		return ret;
+
+	mutex_lock(&ctx->fimc_dev->lock);
+
+	src_vq = v4l2_m2m_get_src_vq(ctx->m2m_ctx);
+	dst_vq = v4l2_m2m_get_dst_vq(ctx->m2m_ctx);
+
+	mutex_lock(&src_vq->vb_lock);
+	mutex_lock(&dst_vq->vb_lock);
+
+	if (f->type == V4L2_BUF_TYPE_VIDEO_OUTPUT) {
+		if (videobuf_queue_is_busy(src_vq)) {
+			v4l2_err(v4l2_dev, "%s queue busy\n", __func__);
+			ret = -EBUSY;
+			goto s_fmt_out;
+		}
+		frame = &ctx->s_frame;
+		spin_lock_irqsave(&ctx->slock, flags);
+		ctx->state |= FIMC_SRC_FMT;
+		spin_unlock_irqrestore(&ctx->slock, flags);
+
+	} else if (f->type == V4L2_BUF_TYPE_VIDEO_CAPTURE) {
+		if (videobuf_queue_is_busy(dst_vq)) {
+			v4l2_err(v4l2_dev, "%s queue busy\n", __func__);
+			ret = -EBUSY;
+			goto s_fmt_out;
+		}
+		frame = &ctx->d_frame;
+		spin_lock_irqsave(&ctx->slock, flags);
+		ctx->state |= FIMC_DST_FMT;
+		spin_unlock_irqrestore(&ctx->slock, flags);
+	} else {
+		v4l2_err(&ctx->fimc_dev->m2m.v4l2_dev,
+			 "Wrong buffer/video queue type (%d)\n", f->type);
+		return -EINVAL;
+	}
+
+	pix = &f->fmt.pix;
+	frame->fmt = find_format(f);
+	if (!frame->fmt) {
+		ret = -EINVAL;
+		goto s_fmt_out;
+	}
+
+	frame->f_width = pix->bytesperline * 8 / frame->fmt->depth;
+	frame->f_height = pix->sizeimage/pix->bytesperline;
+	frame->width = pix->width;
+	frame->height = pix->height;
+	frame->o_width = pix->width;
+	frame->o_height = pix->height;
+	frame->offs_h = 0;
+	frame->offs_v = 0;
+	frame->size = (pix->width * pix->height * frame->fmt->depth) >> 3;
+	src_vq->field = dst_vq->field = pix->field;
+	spin_lock_irqsave(&ctx->slock, flags);
+	ctx->state |= FIMC_PARAMS;
+	spin_unlock_irqrestore(&ctx->slock, flags);
+
+	dbg("f_width= %d, f_height= %d", frame->f_width, frame->f_height);
+
+s_fmt_out:
+	mutex_unlock(&dst_vq->vb_lock);
+	mutex_unlock(&src_vq->vb_lock);
+	mutex_unlock(&ctx->fimc_dev->lock);
+	return ret;
+}
+
+static int fimc_m2m_reqbufs(struct file *file, void *priv,
+			  struct v4l2_requestbuffers *reqbufs)
+{
+	struct fimc_ctx *ctx = priv;
+	return v4l2_m2m_reqbufs(file, ctx->m2m_ctx, reqbufs);
+}
+
+static int fimc_m2m_querybuf(struct file *file, void *priv,
+			   struct v4l2_buffer *buf)
+{
+	struct fimc_ctx *ctx = priv;
+	return v4l2_m2m_querybuf(file, ctx->m2m_ctx, buf);
+}
+
+static int fimc_m2m_qbuf(struct file *file, void *priv,
+			  struct v4l2_buffer *buf)
+{
+	struct fimc_ctx *ctx = priv;
+
+	return v4l2_m2m_qbuf(file, ctx->m2m_ctx, buf);
+}
+
+static int fimc_m2m_dqbuf(struct file *file, void *priv,
+			   struct v4l2_buffer *buf)
+{
+	struct fimc_ctx *ctx = priv;
+	return v4l2_m2m_dqbuf(file, ctx->m2m_ctx, buf);
+}
+
+static int fimc_m2m_streamon(struct file *file, void *priv,
+			   enum v4l2_buf_type type)
+{
+	struct fimc_ctx *ctx = priv;
+	return v4l2_m2m_streamon(file, ctx->m2m_ctx, type);
+}
+
+static int fimc_m2m_streamoff(struct file *file, void *priv,
+			    enum v4l2_buf_type type)
+{
+	struct fimc_ctx *ctx = priv;
+	return v4l2_m2m_streamoff(file, ctx->m2m_ctx, type);
+}
+
+int fimc_m2m_queryctrl(struct file *file, void *priv,
+			    struct v4l2_queryctrl *qc)
+{
+	struct v4l2_queryctrl *c;
+	c = get_ctrl(qc->id);
+	if (!c)
+		return -EINVAL;
+	*qc = *c;
+	return 0;
+}
+
+int fimc_m2m_g_ctrl(struct file *file, void *priv,
+			 struct v4l2_control *ctrl)
+{
+	struct fimc_ctx *ctx = priv;
+
+	switch (ctrl->id) {
+	case V4L2_CID_HFLIP:
+		ctrl->value = (FLIP_X_AXIS & ctx->flip) ? 1 : 0;
+		break;
+	case V4L2_CID_VFLIP:
+		ctrl->value = (FLIP_Y_AXIS & ctx->flip) ? 1 : 0;
+		break;
+	case V4L2_CID_ROTATE:
+		ctrl->value = ctx->rotation;
+		break;
+	default:
+		v4l2_err(&ctx->fimc_dev->m2m.v4l2_dev, "Invalid control\n");
+		return -EINVAL;
+	}
+	dbg("ctrl->value= %d", ctrl->value);
+	return 0;
+}
+
+static int check_ctrl_val(struct fimc_ctx *ctx,
+			  struct v4l2_control *ctrl)
+{
+	struct v4l2_queryctrl *c;
+	c = get_ctrl(ctrl->id);
+	if (!c)
+		return -EINVAL;
+
+	if (ctrl->value < c->minimum || ctrl->value > c->maximum
+		|| (c->step != 0 && ctrl->value % c->step != 0)) {
+		v4l2_err(&ctx->fimc_dev->m2m.v4l2_dev,
+		"Invalid control value\n");
+		return -ERANGE;
+	}
+
+	return 0;
+}
+
+int fimc_m2m_s_ctrl(struct file *file, void *priv,
+			 struct v4l2_control *ctrl)
+{
+	struct fimc_ctx *ctx = priv;
+	struct samsung_fimc_variant *variant = ctx->fimc_dev->variant;
+	unsigned long flags;
+	int ret = 0;
+
+	ret = check_ctrl_val(ctx, ctrl);
+	if (ret)
+		return ret;
+
+	switch (ctrl->id) {
+	case V4L2_CID_HFLIP:
+		if (ctx->rotation != 0)
+			return 0;
+		if (ctrl->value)
+			ctx->flip |= FLIP_X_AXIS;
+		else
+			ctx->flip &= ~FLIP_X_AXIS;
+		break;
+
+	case V4L2_CID_VFLIP:
+		if (ctx->rotation != 0)
+			return 0;
+		if (ctrl->value)
+			ctx->flip |= FLIP_Y_AXIS;
+		else
+			ctx->flip &= ~FLIP_Y_AXIS;
+		break;
+
+	case V4L2_CID_ROTATE:
+		if (ctrl->value == 90 || ctrl->value == 270) {
+			if (ctx->out_path == FIMC_LCDFIFO &&
+			    !variant->has_inp_rot) {
+				return -EINVAL;
+			} else if (ctx->in_path == FIMC_DMA &&
+				   !variant->has_out_rot) {
+				return -EINVAL;
+			}
+		}
+		ctx->rotation = ctrl->value;
+		if (ctrl->value == 180)
+			ctx->flip = FLIP_XY_AXIS;
+		break;
+
+	default:
+		v4l2_err(&ctx->fimc_dev->m2m.v4l2_dev, "Invalid control\n");
+		return -EINVAL;
+	}
+	spin_lock_irqsave(&ctx->slock, flags);
+	ctx->state |= FIMC_PARAMS;
+	spin_unlock_irqrestore(&ctx->slock, flags);
+	return 0;
+}
+
+
+static int fimc_m2m_cropcap(struct file *file, void *fh,
+			     struct v4l2_cropcap *cr)
+{
+	struct fimc_frame *frame;
+	struct fimc_ctx *ctx = fh;
+
+	ctx_m2m_get_frame(frame, ctx, cr->type);
+
+	cr->bounds.left = 0;
+	cr->bounds.top = 0;
+	cr->bounds.width = frame->f_width;
+	cr->bounds.height = frame->f_height;
+	cr->defrect.left = frame->offs_h;
+	cr->defrect.top = frame->offs_v;
+	cr->defrect.width = frame->o_width;
+	cr->defrect.height = frame->o_height;
+	return 0;
+}
+
+static int fimc_m2m_g_crop(struct file *file, void *fh, struct v4l2_crop *cr)
+{
+	struct fimc_frame *frame;
+	struct fimc_ctx *ctx = file->private_data;
+
+	ctx_m2m_get_frame(frame, ctx, cr->type);
+
+	cr->c.left = frame->offs_h;
+	cr->c.top = frame->offs_v;
+	cr->c.width = frame->width;
+	cr->c.height = frame->height;
+
+	return 0;
+}
+
+static int fimc_m2m_s_crop(struct file *file, void *fh, struct v4l2_crop *cr)
+{
+	struct fimc_ctx *ctx = file->private_data;
+	struct fimc_dev *fimc = ctx->fimc_dev;
+	unsigned long flags;
+	struct fimc_frame *f;
+	u32 min_size;
+	int ret = 0;
+
+	if (cr->c.top < 0 || cr->c.left < 0) {
+		v4l2_err(&fimc->m2m.v4l2_dev,
+			"doesn't support negative values for top & left\n");
+		return -EINVAL;
+	}
+
+	if (cr->c.width  <= 0 || cr->c.height <= 0) {
+		v4l2_err(&fimc->m2m.v4l2_dev,
+			"crop width and height must be greater than 0\n");
+		return -EINVAL;
+	}
+
+	ctx_m2m_get_frame(f, ctx, cr->type);
+
+	/* Adjust to required pixel boundary. */
+	min_size = (cr->type == V4L2_BUF_TYPE_VIDEO_OUTPUT) ?
+		fimc->variant->min_inp_pixsize : fimc->variant->min_out_pixsize;
+
+	cr->c.width = round_down(cr->c.width, min_size);
+	cr->c.height = round_down(cr->c.height, min_size);
+	cr->c.left = round_down(cr->c.left + 1, min_size);
+	cr->c.top = round_down(cr->c.top + 1, min_size);
+
+	if ((cr->c.left + cr->c.width > f->o_width)
+		|| (cr->c.top + cr->c.height > f->o_height)) {
+		v4l2_err(&fimc->m2m.v4l2_dev, "Error in S_CROP params\n");
+		return -EINVAL;
+	}
+
+	spin_lock_irqsave(&ctx->slock, flags);
+	if ((ctx->state & FIMC_SRC_FMT) && (ctx->state & FIMC_DST_FMT)) {
+		/* Check for the pixel scaling ratio when cropping input img. */
+		if (cr->type == V4L2_BUF_TYPE_VIDEO_OUTPUT)
+			ret = fimc_check_scaler_ratio(&cr->c, &ctx->d_frame);
+		else if (cr->type == V4L2_BUF_TYPE_VIDEO_CAPTURE)
+			ret = fimc_check_scaler_ratio(&cr->c, &ctx->s_frame);
+
+		if (ret) {
+			spin_unlock_irqrestore(&ctx->slock, flags);
+			v4l2_err(&fimc->m2m.v4l2_dev,  "Out of scaler range");
+			return -EINVAL;
+		}
+	}
+	ctx->state |= FIMC_PARAMS;
+	spin_unlock_irqrestore(&ctx->slock, flags);
+
+	f->offs_h = cr->c.left;
+	f->offs_v = cr->c.top;
+	f->width = cr->c.width;
+	f->height = cr->c.height;
+	return 0;
+}
+
+static const struct v4l2_ioctl_ops fimc_m2m_ioctl_ops = {
+	.vidioc_querycap		= fimc_m2m_querycap,
+
+	.vidioc_enum_fmt_vid_cap	= fimc_m2m_enum_fmt,
+	.vidioc_enum_fmt_vid_out	= fimc_m2m_enum_fmt,
+
+	.vidioc_g_fmt_vid_cap		= fimc_m2m_g_fmt,
+	.vidioc_g_fmt_vid_out		= fimc_m2m_g_fmt,
+
+	.vidioc_try_fmt_vid_cap		= fimc_m2m_try_fmt,
+	.vidioc_try_fmt_vid_out		= fimc_m2m_try_fmt,
+
+	.vidioc_s_fmt_vid_cap		= fimc_m2m_s_fmt,
+	.vidioc_s_fmt_vid_out		= fimc_m2m_s_fmt,
+
+	.vidioc_reqbufs			= fimc_m2m_reqbufs,
+	.vidioc_querybuf		= fimc_m2m_querybuf,
+
+	.vidioc_qbuf			= fimc_m2m_qbuf,
+	.vidioc_dqbuf			= fimc_m2m_dqbuf,
+
+	.vidioc_streamon		= fimc_m2m_streamon,
+	.vidioc_streamoff		= fimc_m2m_streamoff,
+
+	.vidioc_queryctrl		= fimc_m2m_queryctrl,
+	.vidioc_g_ctrl			= fimc_m2m_g_ctrl,
+	.vidioc_s_ctrl			= fimc_m2m_s_ctrl,
+
+	.vidioc_g_crop			= fimc_m2m_g_crop,
+	.vidioc_s_crop			= fimc_m2m_s_crop,
+	.vidioc_cropcap			= fimc_m2m_cropcap
+
+};
+
+static void queue_init(void *priv, struct videobuf_queue *vq,
+		       enum v4l2_buf_type type)
+{
+	struct fimc_ctx *ctx = priv;
+	struct fimc_dev *fimc = ctx->fimc_dev;
+
+	videobuf_queue_dma_contig_init(vq, &fimc_qops,
+		fimc->m2m.v4l2_dev.dev,
+		&fimc->irqlock, type, V4L2_FIELD_NONE,
+		sizeof(struct fimc_vid_buffer), priv);
+}
+
+static int fimc_m2m_open(struct file *file)
+{
+	struct fimc_dev *fimc = video_drvdata(file);
+	struct fimc_ctx *ctx = NULL;
+	int err = 0;
+
+	mutex_lock(&fimc->lock);
+	fimc->m2m.refcnt++;
+	set_bit(ST_OUTDMA_RUN, &fimc->state);
+	mutex_unlock(&fimc->lock);
+
+
+	ctx = kzalloc(sizeof *ctx, GFP_KERNEL);
+	if (!ctx)
+		return -ENOMEM;
+
+	file->private_data = ctx;
+	ctx->fimc_dev = fimc;
+	/* default format */
+	ctx->s_frame.fmt = &fimc_formats[0];
+	ctx->d_frame.fmt = &fimc_formats[0];
+	/* per user process device context initialization */
+	ctx->state = 0;
+	ctx->flags = 0;
+	ctx->effect.type = S5P_FIMC_EFFECT_ORIGINAL;
+	ctx->in_path = FIMC_DMA;
+	ctx->out_path = FIMC_DMA;
+	spin_lock_init(&ctx->slock);
+
+	ctx->m2m_ctx = v4l2_m2m_ctx_init(ctx, fimc->m2m.m2m_dev, queue_init);
+	if (IS_ERR(ctx->m2m_ctx)) {
+		err = PTR_ERR(ctx->m2m_ctx);
+		kfree(ctx);
+	}
+	return err;
+}
+
+static int fimc_m2m_release(struct file *file)
+{
+	struct fimc_ctx *ctx = file->private_data;
+	struct fimc_dev *fimc = ctx->fimc_dev;
+
+	v4l2_m2m_ctx_release(ctx->m2m_ctx);
+	kfree(ctx);
+	mutex_lock(&fimc->lock);
+	if (--fimc->m2m.refcnt <= 0)
+		clear_bit(ST_OUTDMA_RUN, &fimc->state);
+	mutex_unlock(&fimc->lock);
+	return 0;
+}
+
+static unsigned int fimc_m2m_poll(struct file *file,
+				     struct poll_table_struct *wait)
+{
+	struct fimc_ctx *ctx = file->private_data;
+	return v4l2_m2m_poll(file, ctx->m2m_ctx, wait);
+}
+
+
+static int fimc_m2m_mmap(struct file *file, struct vm_area_struct *vma)
+{
+	struct fimc_ctx *ctx = file->private_data;
+	return v4l2_m2m_mmap(file, ctx->m2m_ctx, vma);
+}
+
+static const struct v4l2_file_operations fimc_m2m_fops = {
+	.owner		= THIS_MODULE,
+	.open		= fimc_m2m_open,
+	.release	= fimc_m2m_release,
+	.poll		= fimc_m2m_poll,
+	.ioctl		= video_ioctl2,
+	.mmap		= fimc_m2m_mmap,
+};
+
+static struct v4l2_m2m_ops m2m_ops = {
+	.device_run	= fimc_dma_run,
+	.job_abort	= fimc_job_abort,
+};
+
+
+static int fimc_register_m2m_device(struct fimc_dev *fimc)
+{
+	struct video_device *vfd;
+	struct platform_device *pdev;
+	struct v4l2_device *v4l2_dev;
+	int ret = 0;
+
+	if (!fimc)
+		return -ENODEV;
+
+	pdev = fimc->pdev;
+	v4l2_dev = &fimc->m2m.v4l2_dev;
+
+	/* set name if it is empty */
+	if (!v4l2_dev->name[0])
+		snprintf(v4l2_dev->name, sizeof(v4l2_dev->name),
+			 "%s.%d.v4l2_m2m", MODULE_NAME, fimc->id);
+
+	ret = v4l2_device_register(&pdev->dev, v4l2_dev);
+	if (ret)
+		return ret;;
+
+	vfd = video_device_alloc();
+	if (!vfd) {
+		v4l2_err(v4l2_dev, "Failed to allocate video device\n");
+		goto err_m2m_r1;
+	}
+
+	vfd->fops	= &fimc_m2m_fops;
+	vfd->ioctl_ops	= &fimc_m2m_ioctl_ops;
+	vfd->minor	= -1;
+	vfd->release	= video_device_release;
+
+	snprintf(vfd->name, sizeof(vfd->name), "%s.%d:v4l2_m2m",
+		 MODULE_NAME, fimc->id);
+
+	ret = video_register_device(vfd, VFL_TYPE_GRABBER, -1);
+	if (ret) {
+		v4l2_err(v4l2_dev,
+			 "%s(): failed to register video device\n", __func__);
+		goto err_m2m_r2;
+	}
+	video_set_drvdata(vfd, fimc);
+	fimc->m2m.vfd = vfd;
+	v4l2_info(v4l2_dev,
+		  "FIMC m2m driver registered as /dev/video%d\n", vfd->num);
+
+	platform_set_drvdata(pdev, fimc);
+
+	fimc->m2m.m2m_dev = v4l2_m2m_init(&m2m_ops);
+
+	if (IS_ERR(fimc->m2m.m2m_dev)) {
+		v4l2_err(v4l2_dev, "failed to initialize v4l2-m2m device\n");
+		ret = PTR_ERR(fimc->m2m.m2m_dev);
+		goto err_m2m_r3;
+	}
+	return 0;
+
+err_m2m_r1:
+	v4l2_device_unregister(&fimc->m2m.v4l2_dev);
+err_m2m_r2:
+	video_device_release(fimc->m2m.vfd);
+err_m2m_r3:
+	video_unregister_device(fimc->m2m.vfd);
+
+	return ret;
+}
+
+static void fimc_unregister_m2m_device(struct fimc_dev *fimc)
+{
+	if (fimc) {
+		v4l2_m2m_release(fimc->m2m.m2m_dev);
+		video_unregister_device(fimc->m2m.vfd);
+		video_device_release(fimc->m2m.vfd);
+		v4l2_device_unregister(&fimc->m2m.v4l2_dev);
+	}
+}
+
+static void fimc_clk_release(struct fimc_dev *fimc)
+{
+	int i;
+	for (i = 0; i < NUM_FIMC_CLOCKS; i++) {
+		if (fimc->clock[i]) {
+			clk_disable(fimc->clock[i]);
+			clk_put(fimc->clock[i]);
+		}
+	}
+}
+
+static int fimc_clk_get(struct fimc_dev *fimc)
+{
+	int i;
+	for (i = 0; i < NUM_FIMC_CLOCKS; i++) {
+		fimc->clock[i] = clk_get(&fimc->pdev->dev, fimc_clock_name[i]);
+		if (IS_ERR(fimc->clock[i])) {
+			dev_err(&fimc->pdev->dev,
+				"failed to get fimc clock: %s\n",
+				fimc_clock_name[i]);
+			return -ENXIO;
+		}
+		clk_enable(fimc->clock[i]);
+	}
+	return 0;
+}
+
+static int fimc_probe(struct platform_device *pdev)
+{
+	struct fimc_dev *fimc;
+	struct resource *res;
+	struct samsung_fimc_driverdata *drv_data;
+	int ret = 0;
+
+	dev_dbg(&pdev->dev, "%s():\n", __func__);
+
+	drv_data = (struct samsung_fimc_driverdata *)
+		platform_get_device_id(pdev)->driver_data;
+
+	if (pdev->id >= drv_data->devs_cnt) {
+		dev_err(&pdev->dev, "Invalid platform device id: %d\n",
+			pdev->id);
+		return -EINVAL;
+	}
+
+	fimc = kzalloc(sizeof(struct fimc_dev), GFP_KERNEL);
+	if (!fimc)
+		return -ENOMEM;
+
+	fimc->id = pdev->id;
+	fimc->variant = drv_data->variant[fimc->id];
+	fimc->pdev = pdev;
+	fimc->state = ST_IDLE;
+
+	spin_lock_init(&fimc->irqlock);
+	spin_lock_init(&fimc->slock);
+
+	mutex_init(&fimc->lock);
+
+	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+	if (!res) {
+		dev_err(&pdev->dev, "failed to find the registers\n");
+		ret = -ENOENT;
+		goto err_info;
+	}
+
+	fimc->regs_res = request_mem_region(res->start, resource_size(res),
+			dev_name(&pdev->dev));
+	if (!fimc->regs_res) {
+		dev_err(&pdev->dev, "failed to obtain register region\n");
+		ret = -ENOENT;
+		goto err_info;
+	}
+
+	fimc->regs = ioremap(res->start, resource_size(res));
+	if (!fimc->regs) {
+		dev_err(&pdev->dev, "failed to map registers\n");
+		ret = -ENXIO;
+		goto err_req_region;
+	}
+
+	ret = fimc_clk_get(fimc);
+	if (ret)
+		goto err_regs_unmap;
+
+	res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
+	if (!res) {
+		dev_err(&pdev->dev, "failed to get IRQ resource\n");
+		ret = -ENXIO;
+		goto err_clk;
+	}
+	fimc->irq = res->start;
+
+	fimc_hw_reset(fimc);
+
+	ret = request_irq(fimc->irq, fimc_isr, 0, pdev->name, fimc);
+	if (ret) {
+		dev_err(&pdev->dev, "failed to install irq (%d)\n", ret);
+		goto err_clk;
+	}
+
+	fimc->work_queue = create_workqueue(dev_name(&fimc->pdev->dev));
+	if (!fimc->work_queue)
+		goto err_irq;
+
+	ret = fimc_register_m2m_device(fimc);
+	if (ret)
+		goto err_wq;
+
+	fimc_hw_en_lastirq(fimc, true);
+
+	dev_dbg(&pdev->dev, "%s(): fimc-%d registered successfully\n",
+		__func__, fimc->id);
+
+	return 0;
+
+err_wq:
+	destroy_workqueue(fimc->work_queue);
+err_irq:
+	free_irq(fimc->irq, fimc);
+err_clk:
+	fimc_clk_release(fimc);
+err_regs_unmap:
+	iounmap(fimc->regs);
+err_req_region:
+	release_resource(fimc->regs_res);
+	kfree(fimc->regs_res);
+err_info:
+	dev_err(&pdev->dev, "failed to install\n");
+	return ret;
+}
+
+static int __devexit fimc_remove(struct platform_device *pdev)
+{
+	struct fimc_dev *fimc =
+		(struct fimc_dev *)platform_get_drvdata(pdev);
+
+	v4l2_info(&fimc->m2m.v4l2_dev, "Removing %s\n", pdev->name);
+
+	free_irq(fimc->irq, fimc);
+
+	fimc_hw_reset(fimc);
+
+	fimc_unregister_m2m_device(fimc);
+	fimc_clk_release(fimc);
+	iounmap(fimc->regs);
+	release_resource(fimc->regs_res);
+	kfree(fimc->regs_res);
+	kfree(fimc);
+	return 0;
+}
+
+static struct samsung_fimc_variant fimc01_variant_s5p = {
+	.has_inp_rot	= 1,
+	.has_out_rot	= 1,
+	.min_inp_pixsize = 16,
+	.min_out_pixsize = 16,
+
+	.scaler_en_w	= 3264,
+	.scaler_dis_w	= 8192,
+	.in_rot_en_h	= 1920,
+	.in_rot_dis_w	= 8192,
+	.out_rot_en_w	= 1920,
+	.out_rot_dis_w	= 4224,
+};
+
+static struct samsung_fimc_variant fimc2_variant_s5p = {
+	.min_inp_pixsize = 16,
+	.min_out_pixsize = 16,
+
+	.scaler_en_w	= 4224,
+	.scaler_dis_w	= 8192,
+	.in_rot_en_h	= 1920,
+	.in_rot_dis_w	= 8192,
+	.out_rot_en_w	= 1920,
+	.out_rot_dis_w	= 4224,
+};
+
+static struct samsung_fimc_variant fimc01_variant_s5pv210 = {
+	.has_inp_rot	= 1,
+	.has_out_rot	= 1,
+	.min_inp_pixsize = 16,
+	.min_out_pixsize = 32,
+
+	.scaler_en_w	= 4224,
+	.scaler_dis_w	= 8192,
+	.in_rot_en_h	= 1920,
+	.in_rot_dis_w	= 8192,
+	.out_rot_en_w	= 1920,
+	.out_rot_dis_w	= 4224,
+};
+
+static struct samsung_fimc_variant fimc2_variant_s5pv210 = {
+	.min_inp_pixsize = 16,
+	.min_out_pixsize = 32,
+
+	.scaler_en_w	= 1920,
+	.scaler_dis_w	= 8192,
+	.in_rot_en_h	= 1280,
+	.in_rot_dis_w	= 8192,
+	.out_rot_en_w	= 1280,
+	.out_rot_dis_w	= 1920,
+};
+
+static struct samsung_fimc_driverdata fimc_drvdata_s5p = {
+	.variant = {
+		[0] = &fimc01_variant_s5p,
+		[1] = &fimc01_variant_s5p,
+		[2] = &fimc2_variant_s5p,
+	},
+	.devs_cnt = 3
+};
+
+static struct samsung_fimc_driverdata fimc_drvdata_s5pv210 = {
+	.variant = {
+		[0] = &fimc01_variant_s5pv210,
+		[1] = &fimc01_variant_s5pv210,
+		[2] = &fimc2_variant_s5pv210,
+	},
+	.devs_cnt = 3
+};
+
+static struct platform_device_id fimc_driver_ids[] = {
+	{
+		.name		= "s5p-fimc",
+		.driver_data	= (unsigned long)&fimc_drvdata_s5p,
+	}, {
+		.name		= "s5pv210-fimc",
+		.driver_data	= (unsigned long)&fimc_drvdata_s5pv210,
+	},
+	{},
+};
+MODULE_DEVICE_TABLE(platform, s3c_fimc_driver_ids);
+
+static struct platform_driver fimc_driver = {
+	.probe		= fimc_probe,
+	.remove	= __devexit_p(fimc_remove),
+	.id_table	= fimc_driver_ids,
+	.driver = {
+		.name	= MODULE_NAME,
+		.owner	= THIS_MODULE,
+	}
+};
+
+static char banner[] __initdata = KERN_INFO
+	"S5PC Camera Interface V4L2 Driver, (c) 2010 Samsung Electronics\n";
+
+static int __init fimc_init(void)
+{
+	u32 ret;
+	printk(banner);
+
+	ret = platform_driver_register(&fimc_driver);
+	if (ret) {
+		printk(KERN_ERR "FIMC platform driver register failed\n");
+		return -1;
+	}
+	return 0;
+}
+
+static void __exit fimc_exit(void)
+{
+	platform_driver_unregister(&fimc_driver);
+}
+
+module_init(fimc_init);
+module_exit(fimc_exit);
+
+MODULE_AUTHOR("Sylwester Nawrocki, s.nawrocki at samsung.com");
+MODULE_DESCRIPTION("S3C/S5P FIMC (video postprocessor) driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/media/video/samsung/fimc/fimc-core.h b/drivers/media/video/samsung/fimc/fimc-core.h
new file mode 100644
index 0000000..f93d0edd
--- /dev/null
+++ b/drivers/media/video/samsung/fimc/fimc-core.h
@@ -0,0 +1,490 @@
+/*
+ * Copyright (c) 2010 Samsung Electronics
+ *
+ * Sylwester Nawrocki, <s.nawrocki@samsung.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#ifndef FIMC_CORE_H_
+#define FIMC_CORE_H_
+
+#include <linux/types.h>
+#include <plat/fimc.h>
+#include <plat/regs-fimc.h>
+#include <media/videobuf-core.h>
+#include <media/v4l2-device.h>
+#include <media/v4l2-mem2mem.h>
+#include <linux/videodev2.h>
+
+#define err(fmt, args...) \
+	printk(KERN_ERR "%s:%d: " fmt "\n", __func__, __LINE__, ##args)
+
+#ifdef DEBUG
+#define dbg(fmt, args...) \
+	printk(KERN_DEBUG "%s:%d: " fmt "\n", __func__, __LINE__, ##args)
+#else
+#define dbg(fmt, args...)
+#endif
+
+#define ctx_m2m_get_frame(frame, ctx, type) do { \
+	if (V4L2_BUF_TYPE_VIDEO_OUTPUT == (type)) { \
+		frame = &(ctx)->s_frame; \
+	} else if (V4L2_BUF_TYPE_VIDEO_CAPTURE == (type)) { \
+		frame = &(ctx)->d_frame; \
+	} else { \
+		v4l2_err(&(ctx)->fimc_dev->m2m.v4l2_dev,\
+			"Wrong buffer/video queue type (%d)\n", type); \
+		return -EINVAL; \
+	} \
+} while (0)
+
+#define NUM_FIMC_CLOCKS		2
+#define MODULE_NAME		"s5p-fimc"
+#define FIMC_MAX_DEVS		3
+#define FIMC_MAX_OUT_BUFS	4
+#define SCALER_MAX_HRATIO	64
+#define SCALER_MAX_VRATIO	64
+
+enum {
+	ST_IDLE,
+	ST_OUTDMA_RUN,
+	ST_M2M_PEND,
+};
+
+#define fimc_m2m_active(dev) test_bit(ST_OUTDMA_RUN, &(dev)->state)
+#define fimc_m2m_pending(dev) test_bit(ST_M2M_PEND, &(dev)->state)
+
+enum fimc_datapath {
+	FIMC_ITU_CAM_A,
+	FIMC_ITU_CAM_B,
+	FIMC_MIPI_CAM,
+	FIMC_DMA,
+	FIMC_LCDFIFO,
+	FIMC_WRITEBACK
+};
+
+enum fimc_color_fmt {
+	S5P_FIMC_RGB565,
+	S5P_FIMC_RGB666,
+	S5P_FIMC_RGB888,
+	S5P_FIMC_YCBCR420,
+	S5P_FIMC_YCBCR422,
+	S5P_FIMC_YCBYCR422,
+	S5P_FIMC_YCRYCB422,
+	S5P_FIMC_CBYCRY422,
+	S5P_FIMC_CRYCBY422,
+	S5P_FIMC_RGB30_LOCAL,
+	S5P_FIMC_YCBCR444_LOCAL,
+	S5P_FIMC_MAX_COLOR = S5P_FIMC_YCBCR444_LOCAL,
+	S5P_FIMC_COLOR_MASK = 0x0F,
+};
+
+/* Y/Cb/Cr components order at DMA output for 1 plane YCbCr 4:2:2 formats. */
+#define	S5P_FIMC_OUT_CRYCBY	S5P_CIOCTRL_ORDER422_CRYCBY
+#define	S5P_FIMC_OUT_CBYCRY	S5P_CIOCTRL_ORDER422_YCRYCB
+#define	S5P_FIMC_OUT_YCRYCB	S5P_CIOCTRL_ORDER422_CBYCRY
+#define	S5P_FIMC_OUT_YCBYCR	S5P_CIOCTRL_ORDER422_YCBYCR
+
+/* Input Y/Cb/Cr components order for 1 plane YCbCr 4:2:2 color formats. */
+#define	S5P_FIMC_IN_CRYCBY	S5P_MSCTRL_ORDER422_CRYCBY
+#define	S5P_FIMC_IN_CBYCRY	S5P_MSCTRL_ORDER422_YCRYCB
+#define	S5P_FIMC_IN_YCRYCB	S5P_MSCTRL_ORDER422_CBYCRY
+#define	S5P_FIMC_IN_YCBYCR	S5P_MSCTRL_ORDER422_YCBYCR
+
+/* Cb/Cr chrominance components order for 2 plane Y/CbCr 4:2:2 formats. */
+#define	S5P_FIMC_LSB_CRCB	S5P_CIOCTRL_ORDER422_2P_LSB_CRCB
+
+/* The embedded image effect selection */
+#define	S5P_FIMC_EFFECT_ORIGINAL	S5P_CIIMGEFF_FIN_BYPASS
+#define	S5P_FIMC_EFFECT_ARBITRARY	S5P_CIIMGEFF_FIN_ARBITRARY
+#define	S5P_FIMC_EFFECT_NEGATIVE	S5P_CIIMGEFF_FIN_NEGATIVE
+#define	S5P_FIMC_EFFECT_ARTFREEZE	S5P_CIIMGEFF_FIN_ARTFREEZE
+#define	S5P_FIMC_EFFECT_EMBOSSING	S5P_CIIMGEFF_FIN_EMBOSSING
+#define	S5P_FIMC_EFFECT_SIKHOUETTE	S5P_CIIMGEFF_FIN_SILHOUETTE
+
+/* The hardware context state. */
+#define	FIMC_PARAMS			(1 << 0)
+#define	FIMC_SRC_ADDR			(1 << 1)
+#define	FIMC_DST_ADDR			(1 << 2)
+#define	FIMC_SRC_FMT			(1 << 3)
+#define	FIMC_DST_FMT			(1 << 4)
+
+/* Image conversion flags */
+#define	FIMC_IN_DMA_ACCESS_TILED	(1 << 0)
+#define	FIMC_IN_DMA_ACCESS_LINEAR	(0 << 0)
+#define	FIMC_OUT_DMA_ACCESS_TILED	(1 << 1)
+#define	FIMC_OUT_DMA_ACCESS_LINEAR	(0 << 1)
+#define	FIMC_SCAN_MODE_PROGRESSIVE	(0 << 2)
+#define	FIMC_SCAN_MODE_INTERLACED	(1 << 2)
+/* YCbCr data dynamic range for RGB-YUV color conversion. Y/Cb/Cr: (0 ~ 255) */
+#define	FIMC_COLOR_RANGE_WIDE		(0 << 3)
+/* Y (16 ~ 235), Cb/Cr (16 ~ 240) */
+#define	FIMC_COLOR_RANGE_NARROW		(1 << 3)
+
+#define	FLIP_NONE			0
+#define	FLIP_X_AXIS			1
+#define	FLIP_Y_AXIS			2
+#define	FLIP_XY_AXIS			(FLIP_X_AXIS | FLIP_Y_AXIS)
+
+/**
+ * struct fimc_fmt - the driver's internal color format data
+ * @name: format description
+ * @fourcc: the fourcc code for this format
+ * @color: the corresponding fimc_color_fmt
+ * @depth: number of bits per pixel
+ * @buff_cnt: number of physically non-contiguous data planes
+ * @planes_cnt: number of physically contiguous data planes
+ */
+struct fimc_fmt {
+	char	*name;
+	u32	fourcc;
+	u32	color;
+	u32	depth;
+	u16	buff_cnt;
+	u16	planes_cnt;
+};
+
+/**
+ * struct fimc_dma_offset - pixel offset information for DMA
+ * @y_h:	y value horizontal offset
+ * @y_v:	y value vertical offset
+ * @cb_h:	cb value horizontal offset
+ * @cb_v:	cb value vertical offset
+ * @cr_h:	cr value horizontal offset
+ * @cr_v:	cr value vertical offset
+ */
+struct fimc_dma_offset {
+	int	y_h;
+	int	y_v;
+	int	cb_h;
+	int	cb_v;
+	int	cr_h;
+	int	cr_v;
+};
+
+/**
+ * struct fimc_effect - the configuration data for the "Arbitrary" image effect
+ * @type:	effect type
+ * @pat_cb:	cr value when type is "arbitrary"
+ * @pat_cr:	cr value when type is "arbitrary"
+ */
+struct fimc_effect {
+	u32	type;
+	u8	pat_cb;
+	u8	pat_cr;
+};
+
+/**
+ * struct fimc_scaler - the configuration data for FIMC inetrnal scaler
+ *
+ * @enabled:		the flag set when the scaler is used
+ * @hfactor:		horizontal shift factor
+ * @vfactor:		vertical shift factor
+ * @pre_hratio:		horizontal ratio of the prescaler
+ * @pre_vratio:		vertical ratio of the prescaler
+ * @pre_dst_width:	the prescaler's destination width
+ * @pre_dst_height:	the prescaler's destination height
+ * @scaleup_h:		flag indicating scaling up horizontally
+ * @scaleup_v:		flag indicating scaling up vertically
+ * @main_hratio:	the main scaler's horizontal ratio
+ * @main_vratio:	the main scaler's vertical ratio
+ * @real_width:		source width - offset
+ * @real_height:	source height - offset
+ * @copy_mode:		flag set if one-to-one mode is used, i.e. no scaling
+ *			and color format conversion
+ */
+struct fimc_scaler {
+	u32	enabled;
+	u32	hfactor;
+	u32	vfactor;
+	u32	pre_hratio;
+	u32	pre_vratio;
+	u32	pre_dst_width;
+	u32	pre_dst_height;
+	u32	scaleup_h;
+	u32	scaleup_v;
+	u32	main_hratio;
+	u32	main_vratio;
+	u32	real_width;
+	u32	real_height;
+	u32	copy_mode;
+};
+
+/**
+ * struct fimc_addr - the FIMC physical address set for DMA
+ *
+ * @y:	 luminance plane physical address
+ * @cb:	 Cb plane physical address
+ * @cr:	 Cr plane physical address
+ */
+struct fimc_addr {
+	u32	y;
+	u32	cb;
+	u32	cr;
+};
+
+/**
+ * struct fimc_vid_buffer - the driver's video buffer
+ * @vb:	v4l videobuf buffer
+ */
+struct fimc_vid_buffer {
+	struct videobuf_buffer	vb;
+};
+
+/**
+ * struct fimc_frame - input/output frame format properties
+ *
+ * @f_width:	image full width (virtual screen size)
+ * @f_height:	image full height (virtual screen size)
+ * @o_width:	original image width as set by S_FMT
+ * @o_height:	original image height as set by S_FMT
+ * @offs_h:	image horizontal pixel offset
+ * @offs_v:	image vertical pixel offset
+ * @width:	image pixel width
+ * @height:	image pixel weight
+ * @paddr:	image frame buffer physical addresses
+ * @buf_cnt:	number of buffers depending on a color format
+ * @size:	image size in bytes
+ * @color:	color format
+ * @dma_offset:	DMA offset in bytes
+ */
+struct fimc_frame {
+	u32	f_width;
+	u32	f_height;
+	u32	o_width;
+	u32	o_height;
+	u32	offs_h;
+	u32	offs_v;
+	u32	width;
+	u32	height;
+	u32	size;
+	struct fimc_addr	paddr;
+	struct fimc_dma_offset	dma_offset;
+	struct fimc_fmt		*fmt;
+};
+
+/**
+ * struct fimc_m2m_device - v4l2 memory-to-memory device data
+ * @vfd: the video device node for v4l2 m2m mode
+ * @v4l2_dev: v4l2 device for m2m mode
+ * @m2m_dev: v4l2 memory-to-memory device data
+ * @ctx: hardware context data
+ * @refcnt: the reference counter
+ */
+struct fimc_m2m_device {
+	struct video_device	*vfd;
+	struct v4l2_device	v4l2_dev;
+	struct v4l2_m2m_dev	*m2m_dev;
+	struct fimc_ctx		*ctx;
+	int			refcnt;
+};
+
+/**
+ * struct samsung_fimc_variant - camera interface variant information
+ *
+ * @pix_hoff: indicate whether horizontal offset is in pixels or in bytes
+ * @has_inp_rot: set if has input rotator
+ * @has_out_rot: set if has output rotator
+ * @min_inp_pixsize: minimum input pixel size
+ * @min_out_pixsize: minimum output pixel size
+ * @scaler_en_w: maximum input pixel width when the scaler is enabled
+ * @scaler_dis_w: maximum input pixel width when the scaler is disabled
+ * @in_rot_en_h: maximum input width when the input rotator is used
+ * @in_rot_dis_w: maximum input width when the input rotator is used
+ * @out_rot_en_w: maximum output width for the output rotator enabled
+ * @out_rot_dis_w: maximum output width for the output rotator enabled
+ */
+struct samsung_fimc_variant {
+	unsigned int	pix_hoff:1;
+	unsigned int	has_inp_rot:1;
+	unsigned int	has_out_rot:1;
+
+	u16		min_inp_pixsize;
+	u16		min_out_pixsize;
+	u16		scaler_en_w;
+	u16		scaler_dis_w;
+	u16		in_rot_en_h;
+	u16		in_rot_dis_w;
+	u16		out_rot_en_w;
+	u16		out_rot_dis_w;
+};
+
+/**
+ * struct samsung_fimc_driverdata - per-device type driver data for init time.
+ *
+ * @variant: the variant information for this driver.
+ * @dev_cnt: number of fimc sub-devices available in SoC
+ */
+struct samsung_fimc_driverdata {
+	struct samsung_fimc_variant *variant[FIMC_MAX_DEVS];
+	int	devs_cnt;
+};
+
+struct fimc_ctx;
+
+/**
+ * struct fimc_subdev - abstraction for a FIMC entity
+ *
+ * @slock:	the spinlock protecting this data structure
+ * @lock:	the mutex protecting this data structure
+ * @pdev:	pointer to the FIMC platform device
+ * @id:		FIMC device index (0..2)
+ * @clock[]:	the clocks required for FIMC operation
+ * @regs:	the mapped hardware registers
+ * @regs_res:	the resource claimed for IO registers
+ * @irq:	interrupt number of the FIMC subdevice
+ * @irqlock:	spinlock protecting videbuffer queue
+ * @m2m:	memory-to-memory V4L2 device information
+ * @state:	the FIMC device state flags
+ */
+struct fimc_dev {
+	spinlock_t			slock;
+	struct mutex			lock;
+	struct platform_device		*pdev;
+	struct samsung_fimc_variant	*variant;
+	int				id;
+	struct clk			*clock[NUM_FIMC_CLOCKS];
+	void __iomem			*regs;
+	struct resource			*regs_res;
+	int				irq;
+	spinlock_t			irqlock;
+	struct workqueue_struct		*work_queue;
+	struct fimc_m2m_device		m2m;
+	unsigned long			state;
+};
+
+/**
+ * fimc_ctx - the device context data
+ *
+ * @lock:		mutex protecting this data structure
+ * @s_frame:		source frame properties
+ * @d_frame:		destination frame properties
+ * @out_order_1p:	output 1-plane YCBCR order
+ * @out_order_2p:	output 2-plane YCBCR order
+ * @in_order_1p		input 1-plane YCBCR order
+ * @in_order_2p:	input 2-plane YCBCR order
+ * @in_path:		input mode (DMA or camera)
+ * @out_path:		output mode (DMA or FIFO)
+ * @scaler:		image scaler properties
+ * @effect:		image effect
+ * @rotation:		image clockwise rotation in degrees
+ * @flip:		image flip mode
+ * @flags:		an additional flags for image conversion
+ * @state:		flags to keep track of user configuration
+ * @fimc_dev:		the FIMC device this context applies to
+ * @m2m_ctx:		memory-to-memory device context
+ */
+struct fimc_ctx {
+	spinlock_t		slock;
+	struct fimc_frame	s_frame;
+	struct fimc_frame	d_frame;
+	u32			out_order_1p;
+	u32			out_order_2p;
+	u32			in_order_1p;
+	u32			in_order_2p;
+	enum fimc_datapath	in_path;
+	enum fimc_datapath	out_path;
+	struct fimc_scaler	scaler;
+	struct fimc_effect	effect;
+	int			rotation;
+	u32			flip;
+	u32			flags;
+	u32			state;
+	struct fimc_dev		*fimc_dev;
+	struct v4l2_m2m_ctx	*m2m_ctx;
+};
+
+
+extern struct fimc_fmt fimc_formats[];
+extern struct videobuf_queue_ops fimc_qops;
+
+static inline int tiled_fmt(struct fimc_fmt *fmt)
+{
+	return 0;
+}
+
+static inline void fimc_hw_clear_irq(struct fimc_dev *dev)
+{
+	u32 cfg = readl(dev->regs + S5P_CIGCTRL);
+	cfg |= S5P_CIGCTRL_IRQ_CLR;
+	writel(cfg, dev->regs + S5P_CIGCTRL);
+}
+
+static inline void fimc_hw_start_scaler(struct fimc_dev *dev)
+{
+	u32 cfg = readl(dev->regs + S5P_CISCCTRL);
+	cfg |= S5P_CISCCTRL_SCALERSTART;
+	writel(cfg, dev->regs + S5P_CISCCTRL);
+}
+
+static inline void fimc_hw_stop_scaler(struct fimc_dev *dev)
+{
+	u32 cfg = readl(dev->regs + S5P_CISCCTRL);
+	cfg &= ~S5P_CISCCTRL_SCALERSTART;
+	writel(cfg, dev->regs + S5P_CISCCTRL);
+}
+
+static inline void fimc_hw_dis_capture(struct fimc_dev *dev)
+{
+	u32 cfg = readl(dev->regs + S5P_CIIMGCPT);
+	cfg &= ~(S5P_CIIMGCPT_IMGCPTEN | S5P_CIIMGCPT_IMGCPTEN_SC);
+	writel(cfg, dev->regs + S5P_CIIMGCPT);
+}
+
+static inline void fimc_hw_start_in_dma(struct fimc_dev *dev)
+{
+	u32 cfg = readl(dev->regs + S5P_MSCTRL);
+	cfg |= S5P_MSCTRL_ENVID;
+	writel(cfg, dev->regs + S5P_MSCTRL);
+}
+
+static inline void fimc_hw_stop_in_dma(struct fimc_dev *dev)
+{
+	u32 cfg = readl(dev->regs + S5P_MSCTRL);
+	cfg &= ~S5P_MSCTRL_ENVID;
+	writel(cfg, dev->regs + S5P_MSCTRL);
+}
+
+
+/* -----------------------------------------------------*/
+/* fimc-core.c */
+int fimc_set_scaler_info(struct fimc_ctx *ctx);
+struct fimc_fmt *find_format(struct v4l2_format *f);
+int fimc_m2m_enum_fmt(struct file *file, void *priv,
+		      struct v4l2_fmtdesc *f);
+int fimc_m2m_queryctrl(struct file *file, void *priv,
+		       struct v4l2_queryctrl *qc);
+int fimc_m2m_g_ctrl(struct file *file, void *priv,
+		    struct v4l2_control *ctrl);
+int fimc_m2m_s_ctrl(struct file *file, void *priv,
+		    struct v4l2_control *ctrl);
+int fimc_check_scaler_ratio(struct v4l2_rect *r, struct fimc_frame *f);
+int fimc_prepare_addr(struct fimc_ctx *ctx,
+	struct fimc_vid_buffer *buf, enum v4l2_buf_type type);
+int fimc_prepare_config(struct fimc_ctx *ctx, u32 flags);
+
+/* -----------------------------------------------------*/
+/* fimc-reg.c						*/
+int fimc_hw_reset_fifo_ov(struct fimc_dev *dev);
+void fimc_hw_reset(struct fimc_dev *dev);
+void fimc_hw_set_rotation(struct fimc_ctx *ctx);
+void fimc_hw_set_target_format(struct fimc_ctx *ctx);
+void fimc_hw_set_out_dma(struct fimc_ctx *ctx);
+void fimc_hw_en_lastirq(struct fimc_dev *dev, int enable);
+void fimc_hw_en_irq(struct fimc_dev *dev, int enable);
+void fimc_hw_en_autoload(struct fimc_dev *dev, int enable);
+void fimc_hw_set_prescaler(struct fimc_ctx *ctx);
+void fimc_hw_set_scaler(struct fimc_ctx *ctx);
+void fimc_hw_en_capture(struct fimc_ctx *ctx);
+void fimc_hw_set_effect(struct fimc_ctx *ctx);
+void fimc_hw_set_in_dma(struct fimc_ctx *ctx);
+void fimc_hw_set_input_path(struct fimc_ctx *ctx);
+void fimc_hw_set_output_path(struct fimc_ctx *ctx);
+void fimc_hw_set_input_addr(struct fimc_dev *dev, struct fimc_addr *paddr);
+void fimc_hw_set_output_addr(struct fimc_dev *dev, struct fimc_addr *paddr);
+void fimc_hw_shadow_dis(struct fimc_dev *ctx, int off);
+
+#endif /* FIMC_CORE_H_ */
diff --git a/drivers/media/video/samsung/fimc/fimc-reg.c b/drivers/media/video/samsung/fimc/fimc-reg.c
new file mode 100644
index 0000000..d072ec5
--- /dev/null
+++ b/drivers/media/video/samsung/fimc/fimc-reg.c
@@ -0,0 +1,571 @@
+/*
+ * Register interface file for Samsung Camera Interface (FIMC) driver
+ *
+ * Copyright (c) 2010 Samsung Electronics
+ *
+ * Sylwester Nawrocki, s.nawrocki at samsung.com
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+*/
+
+#include <linux/io.h>
+#include <linux/delay.h>
+#include <mach/map.h>
+
+#include "fimc-core.h"
+
+
+int fimc_hw_reset_fifo_ov(struct fimc_dev *dev)
+{
+	u32 cfg, status;
+
+	status = readl(dev->regs + S5P_CISTATUS);
+
+	if ((S5P_CISTATUS_OVFIY | S5P_CISTATUS_OVFICB | S5P_CISTATUS_OVFICR)
+		& status) {
+		cfg = readl(dev->regs + S5P_CIWDOFST);
+		cfg |= (S5P_CIWDOFST_CLROVFIY | S5P_CIWDOFST_CLROVFICB
+			| S5P_CIWDOFST_CLROVFICR);
+		writel(cfg, dev->regs + S5P_CIWDOFST);
+
+		cfg = readl(dev->regs + S5P_CIWDOFST);
+		cfg &= ~(S5P_CIWDOFST_CLROVFIY | S5P_CIWDOFST_CLROVFICB
+			| S5P_CIWDOFST_CLROVFICR);
+		writel(cfg, dev->regs + S5P_CIWDOFST);
+	}
+
+	return 0;
+}
+
+void fimc_hw_reset(struct fimc_dev *dev)
+{
+	u32 cfg;
+
+	cfg = readl(dev->regs + S5P_CISRCFMT);
+	cfg |= S5P_CISRCFMT_ITU601_8BIT;
+	writel(cfg, dev->regs + S5P_CISRCFMT);
+
+	/* Software reset. */
+	cfg = readl(dev->regs + S5P_CIGCTRL);
+	cfg |= (S5P_CIGCTRL_SWRST | S5P_CIGCTRL_IRQ_LEVEL);
+	writel(cfg, dev->regs + S5P_CIGCTRL);
+	msleep(1);
+
+	cfg = readl(dev->regs + S5P_CIGCTRL);
+	cfg &= ~S5P_CIGCTRL_SWRST;
+	writel(cfg, dev->regs + S5P_CIGCTRL);
+
+}
+
+void fimc_hw_set_rotation(struct fimc_ctx *ctx)
+{
+	u32 cfg, flip;
+	struct fimc_dev *dev = ctx->fimc_dev;
+
+	cfg = readl(dev->regs + S5P_CITRGFMT);
+	cfg &= ~(S5P_CITRGFMT_INROT90 | S5P_CITRGFMT_OUTROT90);
+
+	flip = readl(dev->regs + S5P_MSCTRL);
+	flip &= ~S5P_MSCTRL_FLIP_MASK;
+
+	/*
+	 * The input and output rotator cannot work simultaneously.
+	 * Use the output rotator in output DMA mode or the input rotator
+	 * in direct fifo output mode.
+	 */
+	if (ctx->rotation == 90 || ctx->rotation == 270) {
+		if (ctx->out_path == FIMC_LCDFIFO) {
+			cfg |= S5P_CITRGFMT_INROT90;
+			if (ctx->rotation == 270)
+				flip |= S5P_MSCTRL_FLIP_180;
+		} else {
+			cfg |= S5P_CITRGFMT_OUTROT90;
+			if (ctx->rotation == 270)
+				cfg |= S5P_CITRGFMT_FLIP_180;
+		}
+	} else if (ctx->rotation == 180) {
+		if (ctx->out_path == FIMC_LCDFIFO)
+			flip |= S5P_MSCTRL_FLIP_180;
+		else
+			cfg |= S5P_CITRGFMT_FLIP_180;
+	}
+	if (ctx->rotation == 180 || ctx->rotation == 270)
+		writel(flip, dev->regs + S5P_MSCTRL);
+	writel(cfg, dev->regs + S5P_CITRGFMT);
+}
+
+static u32 fimc_hw_get_in_flip(u32 ctx_flip)
+{
+	u32 flip = S5P_MSCTRL_FLIP_NORMAL;
+
+	switch (ctx_flip) {
+	case FLIP_X_AXIS:
+		flip = S5P_MSCTRL_FLIP_X_MIRROR;
+		break;
+	case FLIP_Y_AXIS:
+		flip = S5P_MSCTRL_FLIP_Y_MIRROR;
+		break;
+	case FLIP_XY_AXIS:
+		flip = S5P_MSCTRL_FLIP_180;
+		break;
+	}
+
+	return flip;
+}
+
+static u32 fimc_hw_get_target_flip(u32 ctx_flip)
+{
+	u32 flip = S5P_CITRGFMT_FLIP_NORMAL;
+
+	switch (ctx_flip) {
+	case FLIP_X_AXIS:
+		flip = S5P_CITRGFMT_FLIP_X_MIRROR;
+		break;
+	case FLIP_Y_AXIS:
+		flip = S5P_CITRGFMT_FLIP_Y_MIRROR;
+		break;
+	case FLIP_XY_AXIS:
+		flip = S5P_CITRGFMT_FLIP_180;
+		break;
+	case FLIP_NONE:
+		break;
+
+	}
+	return flip;
+}
+
+void fimc_hw_set_target_format(struct fimc_ctx *ctx)
+{
+	u32 cfg;
+	struct fimc_dev *dev = ctx->fimc_dev;
+	struct fimc_frame *frame = &ctx->d_frame;
+
+	dbg("w= %d, h= %d color: %d", frame->width,
+		frame->height, frame->fmt->color);
+
+	cfg = readl(dev->regs + S5P_CITRGFMT);
+	cfg &= ~(S5P_CITRGFMT_FMT_MASK | S5P_CITRGFMT_HSIZE_MASK |
+		  S5P_CITRGFMT_VSIZE_MASK);
+
+	switch (frame->fmt->color) {
+	case S5P_FIMC_RGB565:
+	case S5P_FIMC_RGB666:
+	case S5P_FIMC_RGB888:
+		cfg |= S5P_CITRGFMT_RGB;
+		break;
+	case S5P_FIMC_YCBCR420:
+		cfg |= S5P_CITRGFMT_YCBCR420;
+		break;
+	case S5P_FIMC_YCBYCR422:
+	case S5P_FIMC_YCRYCB422:
+	case S5P_FIMC_CBYCRY422:
+	case S5P_FIMC_CRYCBY422:
+		if (frame->fmt->planes_cnt == 1)
+			cfg |= S5P_CITRGFMT_YCBCR422_1P;
+		else
+			cfg |= S5P_CITRGFMT_YCBCR422;
+		break;
+	default:
+		break;
+	}
+
+	cfg |= S5P_CITRGFMT_HSIZE(frame->width);
+	cfg |= S5P_CITRGFMT_VSIZE(frame->height);
+
+	if (ctx->rotation == 0) {
+		cfg &= ~S5P_CITRGFMT_FLIP_MASK;
+		cfg |= fimc_hw_get_target_flip(ctx->flip);
+	}
+	writel(cfg, dev->regs + S5P_CITRGFMT);
+
+	cfg = readl(dev->regs + S5P_CITAREA) & ~S5P_CITAREA_MASK;
+	cfg |= (frame->width * frame->height);
+	writel(cfg, dev->regs + S5P_CITAREA);
+}
+
+static void fimc_hw_set_out_dma_size(struct fimc_ctx *ctx)
+{
+	struct fimc_dev *dev = ctx->fimc_dev;
+	struct fimc_frame *frame = &ctx->d_frame;
+	u32 cfg = 0;
+
+	if (ctx->rotation == 90 || ctx->rotation == 270) {
+		cfg |= S5P_ORIG_SIZE_HOR(frame->f_height);
+		cfg |= S5P_ORIG_SIZE_VER(frame->f_width);
+	} else {
+		cfg |= S5P_ORIG_SIZE_HOR(frame->f_width);
+		cfg |= S5P_ORIG_SIZE_VER(frame->f_height);
+	}
+	writel(cfg, dev->regs + S5P_ORGOSIZE);
+}
+
+void fimc_hw_set_out_dma(struct fimc_ctx *ctx)
+{
+	u32 cfg;
+	struct fimc_dev *dev = ctx->fimc_dev;
+	struct fimc_frame *frame = &ctx->d_frame;
+	struct fimc_dma_offset *offset = &frame->dma_offset;
+
+	/* Set the input dma offsets. */
+	cfg = 0;
+	cfg |= S5P_CIO_OFFS_HOR(offset->y_h);
+	cfg |= S5P_CIO_OFFS_VER(offset->y_v);
+	writel(cfg, dev->regs + S5P_CIOYOFF);
+
+	cfg = 0;
+	cfg |= S5P_CIO_OFFS_HOR(offset->cb_h);
+	cfg |= S5P_CIO_OFFS_VER(offset->cb_v);
+	writel(cfg, dev->regs + S5P_CIOCBOFF);
+
+	cfg = 0;
+	cfg |= S5P_CIO_OFFS_HOR(offset->cr_h);
+	cfg |= S5P_CIO_OFFS_VER(offset->cr_v);
+	writel(cfg, dev->regs + S5P_CIOCROFF);
+
+	fimc_hw_set_out_dma_size(ctx);
+
+	/* Configure chroma components order. */
+	cfg = readl(dev->regs + S5P_CIOCTRL);
+
+	cfg &= ~(S5P_CIOCTRL_ORDER2P_MASK | S5P_CIOCTRL_ORDER422_MASK |
+		 S5P_CIOCTRL_YCBCR_PLANE_MASK);
+
+	if (frame->fmt->planes_cnt == 1)
+		cfg |= ctx->out_order_1p;
+	else if (frame->fmt->planes_cnt == 2)
+		cfg |= ctx->out_order_2p | S5P_CIOCTRL_YCBCR_2PLANE;
+	else if (frame->fmt->planes_cnt == 3)
+		cfg |= S5P_CIOCTRL_YCBCR_3PLANE;
+
+	writel(cfg, dev->regs + S5P_CIOCTRL);
+}
+
+void fimc_hw_en_autoload(struct fimc_dev *dev, int enable)
+{
+	u32 cfg = readl(dev->regs + S5P_ORGISIZE);
+	if (enable)
+		cfg |= S5P_CIREAL_ISIZE_AUTOLOAD_EN;
+	else
+		cfg &= ~S5P_CIREAL_ISIZE_AUTOLOAD_EN;
+	writel(cfg, dev->regs + S5P_ORGISIZE);
+}
+
+void fimc_hw_en_lastirq(struct fimc_dev *dev, int enable)
+{
+	unsigned long flags;
+	u32 cfg;
+
+	spin_lock_irqsave(&dev->slock, flags);
+
+	cfg = readl(dev->regs + S5P_CIOCTRL);
+	if (enable)
+		cfg |= S5P_CIOCTRL_LASTIRQ_ENABLE;
+	else
+		cfg &= ~S5P_CIOCTRL_LASTIRQ_ENABLE;
+	writel(cfg, dev->regs + S5P_CIOCTRL);
+
+	spin_unlock_irqrestore(&dev->slock, flags);
+}
+
+void fimc_hw_set_prescaler(struct fimc_ctx *ctx)
+{
+	struct fimc_dev *dev =  ctx->fimc_dev;
+	struct fimc_scaler *sc = &ctx->scaler;
+	u32 cfg = 0, shfactor;
+
+	shfactor = 10 - (sc->hfactor + sc->vfactor);
+
+	cfg |= S5P_CISCPRERATIO_SHFACTOR(shfactor);
+	cfg |= S5P_CISCPRERATIO_HOR(sc->pre_hratio);
+	cfg |= S5P_CISCPRERATIO_VER(sc->pre_vratio);
+	writel(cfg, dev->regs + S5P_CISCPRERATIO);
+
+	cfg = 0;
+	cfg |= S5P_CISCPREDST_WIDTH(sc->pre_dst_width);
+	cfg |= S5P_CISCPREDST_HEIGHT(sc->pre_dst_height);
+	writel(cfg, dev->regs + S5P_CISCPREDST);
+}
+
+void fimc_hw_set_scaler(struct fimc_ctx *ctx)
+{
+	struct fimc_dev *dev = ctx->fimc_dev;
+	struct fimc_scaler *sc = &ctx->scaler;
+	struct fimc_frame *src_frame = &ctx->s_frame;
+	struct fimc_frame *dst_frame = &ctx->d_frame;
+	u32 cfg = 0;
+
+	if (!(ctx->flags & FIMC_COLOR_RANGE_NARROW))
+		cfg |= (S5P_CISCCTRL_CSCR2Y_WIDE | S5P_CISCCTRL_CSCY2R_WIDE);
+
+	if (!sc->enabled)
+		cfg |= S5P_CISCCTRL_SCALERBYPASS;
+
+	if (sc->scaleup_h)
+		cfg |= S5P_CISCCTRL_SCALEUP_H;
+
+	if (sc->scaleup_v)
+		cfg |= S5P_CISCCTRL_SCALEUP_V;
+
+	if (sc->copy_mode)
+		cfg |= S5P_CISCCTRL_ONE2ONE;
+
+
+	if (ctx->in_path == FIMC_DMA) {
+		if (src_frame->fmt->color == S5P_FIMC_RGB565)
+			cfg |= S5P_CISCCTRL_INRGB_FMT_RGB565;
+		else if (src_frame->fmt->color == S5P_FIMC_RGB666)
+			cfg |= S5P_CISCCTRL_INRGB_FMT_RGB666;
+		else if (src_frame->fmt->color == S5P_FIMC_RGB888)
+			cfg |= S5P_CISCCTRL_INRGB_FMT_RGB888;
+	}
+
+	if (ctx->out_path == FIMC_DMA) {
+		if (dst_frame->fmt->color == S5P_FIMC_RGB565)
+			cfg |= S5P_CISCCTRL_OUTRGB_FMT_RGB565;
+		else if (dst_frame->fmt->color == S5P_FIMC_RGB666)
+			cfg |= S5P_CISCCTRL_OUTRGB_FMT_RGB666;
+		else if (dst_frame->fmt->color == S5P_FIMC_RGB888)
+			cfg |= S5P_CISCCTRL_OUTRGB_FMT_RGB888;
+	} else {
+		cfg |= S5P_CISCCTRL_OUTRGB_FMT_RGB888;
+
+		if (ctx->flags & FIMC_SCAN_MODE_INTERLACED)
+			cfg |= S5P_CISCCTRL_INTERLACE;
+	}
+
+	dbg("main_hratio= 0x%X  main_vratio= 0x%X",
+		sc->main_hratio, sc->main_vratio);
+
+	cfg |= S5P_CISCCTRL_SC_HORRATIO(sc->main_hratio);
+	cfg |= S5P_CISCCTRL_SC_VERRATIO(sc->main_vratio);
+
+	writel(cfg, dev->regs + S5P_CISCCTRL);
+}
+
+void fimc_hw_en_capture(struct fimc_ctx *ctx)
+{
+	struct fimc_dev *dev = ctx->fimc_dev;
+	u32 cfg;
+
+	cfg = readl(dev->regs + S5P_CIIMGCPT);
+	/* One shot mode for output DMA or freerun for FIFO. */
+	if (ctx->out_path == FIMC_DMA)
+		cfg |= S5P_CIIMGCPT_CPT_FREN_ENABLE;
+	else
+		cfg &= ~S5P_CIIMGCPT_CPT_FREN_ENABLE;
+
+	if (ctx->scaler.enabled)
+		cfg |= S5P_CIIMGCPT_IMGCPTEN_SC;
+
+	writel(cfg | S5P_CIIMGCPT_IMGCPTEN, dev->regs + S5P_CIIMGCPT);
+}
+
+void fimc_hw_shadow_dis(struct fimc_dev *dev, int off)
+{
+	u32 cfg = readl(dev->regs + S5P_CIGCTRL);
+	if (off)
+		cfg |= S5P_CIGCTRL_SHDW_DISABLE;
+	else
+		cfg &= ~S5P_CIGCTRL_SHDW_DISABLE;
+	writel(cfg, dev->regs + S5P_CIGCTRL);
+}
+
+
+void fimc_hw_overflow_irq_en(struct fimc_dev *dev, int on)
+{
+	u32 cfg = readl(dev->regs + S5P_CIGCTRL);
+	if (on)
+		cfg |= S5P_CIGCTRL_IRQ_OVFEN;
+	else
+		cfg &= ~S5P_CIGCTRL_IRQ_OVFEN;
+	writel(cfg, dev->regs + S5P_CIGCTRL);
+}
+
+
+void fimc_hw_set_effect(struct fimc_ctx *ctx)
+{
+	struct fimc_dev *dev = ctx->fimc_dev;
+	struct fimc_effect *effect = &ctx->effect;
+	u32 cfg = (S5P_CIIMGEFF_IE_ENABLE | S5P_CIIMGEFF_IE_SC_AFTER);
+
+	cfg |= effect->type;
+
+	if (effect->type == S5P_FIMC_EFFECT_ARBITRARY) {
+		cfg |= S5P_CIIMGEFF_PAT_CB(effect->pat_cb);
+		cfg |= S5P_CIIMGEFF_PAT_CR(effect->pat_cr);
+	}
+
+	writel(cfg, dev->regs + S5P_CIIMGEFF);
+}
+
+static void fimc_hw_set_in_dma_size(struct fimc_ctx *ctx)
+{
+	struct fimc_dev *dev = ctx->fimc_dev;
+	struct fimc_frame *frame = &ctx->s_frame;
+	u32 cfg_o = 0;
+	u32 cfg_r = 0;
+
+	if (FIMC_LCDFIFO == ctx->out_path)
+		cfg_r |=  S5P_CIREAL_ISIZE_AUTOLOAD_EN;
+
+	cfg_o |= S5P_ORIG_SIZE_HOR(frame->f_width);
+	cfg_o |= S5P_ORIG_SIZE_VER(frame->f_height);
+	cfg_r |= S5P_CIREAL_ISIZE_WIDTH(frame->width);
+	cfg_r |= S5P_CIREAL_ISIZE_HEIGHT(frame->height);
+
+	writel(cfg_o, dev->regs + S5P_ORGISIZE);
+	writel(cfg_r, dev->regs + S5P_CIREAL_ISIZE);
+}
+
+void fimc_hw_set_in_dma(struct fimc_ctx *ctx)
+{
+	struct fimc_dev *dev = ctx->fimc_dev;
+	struct fimc_frame *frame = &ctx->s_frame;
+	struct fimc_dma_offset *offset = &frame->dma_offset;
+	u32 cfg = 0;
+
+	/* Set the pixel offsets. */
+	cfg |= S5P_CIO_OFFS_HOR(offset->y_h);
+	cfg |= S5P_CIO_OFFS_VER(offset->y_v);
+	writel(cfg, dev->regs + S5P_CIIYOFF);
+
+	cfg = 0;
+	cfg |= S5P_CIO_OFFS_HOR(offset->cb_h);
+	cfg |= S5P_CIO_OFFS_VER(offset->cb_v);
+	writel(cfg, dev->regs + S5P_CIICBOFF);
+
+	cfg = 0;
+	cfg |= S5P_CIO_OFFS_HOR(offset->cr_h);
+	cfg |= S5P_CIO_OFFS_VER(offset->cr_v);
+	writel(cfg, dev->regs + S5P_CIICROFF);
+
+	/* Input original and real size. */
+	fimc_hw_set_in_dma_size(ctx);
+
+	/* Autoload is used currently only in FIFO mode. */
+	fimc_hw_en_autoload(dev, ctx->out_path == FIMC_LCDFIFO);
+
+	/* Set the input DMA to process single frame only. */
+	cfg = readl(dev->regs + S5P_MSCTRL);
+	cfg &= ~(S5P_MSCTRL_FLIP_MASK
+		| S5P_MSCTRL_INFORMAT_MASK
+		| S5P_MSCTRL_IN_BURST_COUNT_MASK
+		| S5P_MSCTRL_INPUT_MASK
+		| S5P_MSCTRL_C_INT_IN_MASK
+		| S5P_MSCTRL_2P_IN_ORDER_MASK);
+
+	cfg |= (S5P_MSCTRL_FRAME_COUNT(1) | S5P_MSCTRL_INPUT_MEMORY);
+
+	switch (frame->fmt->color) {
+	case S5P_FIMC_RGB565:
+	case S5P_FIMC_RGB666:
+	case S5P_FIMC_RGB888:
+		cfg |= S5P_MSCTRL_INFORMAT_RGB;
+		break;
+	case S5P_FIMC_YCBCR420:
+		cfg |= S5P_MSCTRL_INFORMAT_YCBCR420;
+
+		if (frame->fmt->planes_cnt == 2)
+			cfg |= ctx->in_order_2p | S5P_MSCTRL_C_INT_IN_2PLANE;
+		else
+			cfg |= S5P_MSCTRL_C_INT_IN_3PLANE;
+
+		break;
+	case S5P_FIMC_YCBYCR422:
+	case S5P_FIMC_YCRYCB422:
+	case S5P_FIMC_CBYCRY422:
+	case S5P_FIMC_CRYCBY422:
+		if (frame->fmt->planes_cnt == 1) {
+			cfg |= ctx->in_order_1p
+				| S5P_MSCTRL_INFORMAT_YCBCR422_1P;
+		} else {
+			cfg |= S5P_MSCTRL_INFORMAT_YCBCR422;
+
+			if (frame->fmt->planes_cnt == 2)
+				cfg |= ctx->in_order_2p
+					| S5P_MSCTRL_C_INT_IN_2PLANE;
+			else
+				cfg |= S5P_MSCTRL_C_INT_IN_3PLANE;
+		}
+		break;
+	default:
+		break;
+	}
+
+	/*
+	 * Input DMA flip mode (and rotation).
+	 * Do not allow simultaneous rotation and flipping.
+	 */
+	if (!ctx->rotation && ctx->out_path == FIMC_LCDFIFO)
+		cfg |= fimc_hw_get_in_flip(ctx->flip);
+
+	writel(cfg, dev->regs + S5P_MSCTRL);
+
+	/* Input/output DMA linear/tiled mode. */
+	cfg = readl(dev->regs + S5P_CIDMAPARAM);
+	cfg &= ~S5P_CIDMAPARAM_TILE_MASK;
+
+	if (tiled_fmt(ctx->s_frame.fmt))
+		cfg |= S5P_CIDMAPARAM_R_64X32;
+
+	if (tiled_fmt(ctx->d_frame.fmt))
+		cfg |= S5P_CIDMAPARAM_W_64X32;
+
+	writel(cfg, dev->regs + S5P_CIDMAPARAM);
+}
+
+
+void fimc_hw_set_input_path(struct fimc_ctx *ctx)
+{
+	struct fimc_dev *dev = ctx->fimc_dev;
+
+	u32 cfg = readl(dev->regs + S5P_MSCTRL);
+	cfg &= ~S5P_MSCTRL_INPUT_MASK;
+
+	if (ctx->in_path == FIMC_DMA)
+		cfg |= S5P_MSCTRL_INPUT_MEMORY;
+	else
+		cfg |= S5P_MSCTRL_INPUT_EXTCAM;
+
+	writel(cfg, dev->regs + S5P_MSCTRL);
+}
+
+void fimc_hw_set_output_path(struct fimc_ctx *ctx)
+{
+	struct fimc_dev *dev = ctx->fimc_dev;
+
+	u32 cfg = readl(dev->regs + S5P_CISCCTRL);
+	cfg &= ~S5P_CISCCTRL_LCDPATHEN_FIFO;
+	if (ctx->out_path == FIMC_LCDFIFO)
+		cfg |= S5P_CISCCTRL_LCDPATHEN_FIFO;
+	writel(cfg, dev->regs + S5P_CISCCTRL);
+}
+
+void fimc_hw_set_input_addr(struct fimc_dev *dev, struct fimc_addr *paddr)
+{
+	u32 cfg = 0;
+
+	cfg = readl(dev->regs + S5P_CIREAL_ISIZE);
+	cfg |= S5P_CIREAL_ISIZE_ADDR_CH_DIS;
+	writel(cfg, dev->regs + S5P_CIREAL_ISIZE);
+
+	writel(paddr->y, dev->regs + S5P_CIIYSA0);
+	writel(paddr->cb, dev->regs + S5P_CIICBSA0);
+	writel(paddr->cr, dev->regs + S5P_CIICRSA0);
+
+	cfg &= ~S5P_CIREAL_ISIZE_ADDR_CH_DIS;
+	writel(cfg, dev->regs + S5P_CIREAL_ISIZE);
+}
+
+void fimc_hw_set_output_addr(struct fimc_dev *dev, struct fimc_addr *paddr)
+{
+	int i;
+	/* Set all the output register sets to point to single video buffer. */
+	for (i = 0; i < FIMC_MAX_OUT_BUFS; i++) {
+		writel(paddr->y, dev->regs + S5P_CIOYSA(i));
+		writel(paddr->cb, dev->regs + S5P_CIOCBSA(i));
+		writel(paddr->cr, dev->regs + S5P_CIOCRSA(i));
+	}
+}
diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h
index 047f7e6..974dc51 100644
--- a/include/linux/videodev2.h
+++ b/include/linux/videodev2.h
@@ -277,6 +277,7 @@ struct v4l2_pix_format {
 #define V4L2_PIX_FMT_RGB565  v4l2_fourcc('R', 'G', 'B', 'P') /* 16  RGB-5-6-5     */
 #define V4L2_PIX_FMT_RGB555X v4l2_fourcc('R', 'G', 'B', 'Q') /* 16  RGB-5-5-5 BE  */
 #define V4L2_PIX_FMT_RGB565X v4l2_fourcc('R', 'G', 'B', 'R') /* 16  RGB-5-6-5 BE  */
+#define V4L2_PIX_FMT_RGB666  v4l2_fourcc('R', 'G', 'B', 'H') /* 18  RGB-6-6-6	  */
 #define V4L2_PIX_FMT_BGR24   v4l2_fourcc('B', 'G', 'R', '3') /* 24  BGR-8-8-8     */
 #define V4L2_PIX_FMT_RGB24   v4l2_fourcc('R', 'G', 'B', '3') /* 24  RGB-8-8-8     */
 #define V4L2_PIX_FMT_BGR32   v4l2_fourcc('B', 'G', 'R', '4') /* 32  BGR-8-8-8-8   */
-- 
1.7.2

[PATCH v3 3/8] ARM: Samsung: Add platform definitions and helpers for FIMC driver

[Sylwester Nawrocki]

FIMC (CAMIF) device is a camera interface embedded in S3C/S5P Samsung
SOC series. It supports ITU-R BT.601/656 and MIPI-CSI2 standards,
memory to memory operations, color conversion, resizing and rotation.

Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
---
 arch/arm/mach-s5pc100/include/mach/map.h       |    8 ++++
 arch/arm/mach-s5pv210/cpu.c                    |    5 +++
 arch/arm/mach-s5pv210/include/mach/map.h       |    9 +++++
 arch/arm/plat-s5p/Kconfig                      |   16 ++++++++
 arch/arm/plat-s5p/Makefile                     |    3 ++
 arch/arm/plat-s5p/dev-fimc0.c                  |   35 ++++++++++++++++++
 arch/arm/plat-s5p/dev-fimc1.c                  |   35 ++++++++++++++++++
 arch/arm/plat-s5p/dev-fimc2.c                  |   35 ++++++++++++++++++
 arch/arm/plat-samsung/include/plat/fimc-core.h |   45 ++++++++++++++++++++++++
 arch/arm/plat-samsung/include/plat/fimc.h      |   23 ++++++++++++
 10 files changed, 214 insertions(+), 0 deletions(-)
 create mode 100644 arch/arm/plat-s5p/dev-fimc0.c
 create mode 100644 arch/arm/plat-s5p/dev-fimc1.c
 create mode 100644 arch/arm/plat-s5p/dev-fimc2.c
 create mode 100644 arch/arm/plat-samsung/include/plat/fimc-core.h
 create mode 100644 arch/arm/plat-samsung/include/plat/fimc.h

diff --git a/arch/arm/mach-s5pc100/include/mach/map.h b/arch/arm/mach-s5pc100/include/mach/map.h
index 809ff90..b8a5ee4 100644
--- a/arch/arm/mach-s5pc100/include/mach/map.h
+++ b/arch/arm/mach-s5pc100/include/mach/map.h
@@ -118,6 +118,11 @@
 #define S5PC100_PA_SDRAM	(0x20000000)
 #define S5P_PA_SDRAM		S5PC100_PA_SDRAM
 
+/* FIMC */
+#define S5PC100_PA_FIMC0	(0xEE200000)
+#define S5PC100_PA_FIMC1	(0xEE300000)
+#define S5PC100_PA_FIMC2	(0xEE400000)
+
 /* compatibiltiy defines. */
 #define S3C_PA_UART		S5PC100_PA_UART
 #define S3C_PA_IIC		S5PC100_PA_IIC0
@@ -141,6 +146,9 @@
 #define S3C_PA_ONENAND		S5PC100_PA_ONENAND
 #define S3C_PA_ONENAND_BUF	S5PC100_PA_ONENAND_BUF
 #define S3C_SZ_ONENAND_BUF	S5PC100_SZ_ONENAND_BUF
+#define S5P_PA_FIMC0		S5PC100_PA_FIMC0
+#define S5P_PA_FIMC1		S5PC100_PA_FIMC1
+#define S5P_PA_FIMC2		S5PC100_PA_FIMC2
 
 #define SAMSUNG_PA_ADC		S5PC100_PA_TSADC
 #define SAMSUNG_PA_CFCON	S5PC100_PA_CFCON
diff --git a/arch/arm/mach-s5pv210/cpu.c b/arch/arm/mach-s5pv210/cpu.c
index 394ca86..1ee444d 100644
--- a/arch/arm/mach-s5pv210/cpu.c
+++ b/arch/arm/mach-s5pv210/cpu.c
@@ -37,6 +37,7 @@
 #include <plat/iic-core.h>
 #include <plat/keypad-core.h>
 #include <plat/sdhci.h>
+#include <plat/fimc-core.h>
 
 /* Initial IO mappings */
 
@@ -98,6 +99,10 @@ void __init s5pv210_map_io(void)
 
 	/* Use s5pv210-keypad instead of samsung-keypad */
 	samsung_keypad_setname("s5pv210-keypad");
+
+	s3c_fimc_setname(0, "s5pv210-fimc");
+	s3c_fimc_setname(1, "s5pv210-fimc");
+	s3c_fimc_setname(2, "s5pv210-fimc");
 }
 
 void __init s5pv210_init_clocks(int xtal)
diff --git a/arch/arm/mach-s5pv210/include/mach/map.h b/arch/arm/mach-s5pv210/include/mach/map.h
index 9f6c2ed..5bcf8c6 100644
--- a/arch/arm/mach-s5pv210/include/mach/map.h
+++ b/arch/arm/mach-s5pv210/include/mach/map.h
@@ -96,6 +96,11 @@
 
 #define S5PV210_PA_ADC		(0xE1700000)
 
+/* FIMC */
+#define S5PV210_PA_FIMC0	(0xFB200000)
+#define S5PV210_PA_FIMC1	(0xFB300000)
+#define S5PV210_PA_FIMC2	(0xFB400000)
+
 /* compatibiltiy defines. */
 #define S3C_PA_UART		S5PV210_PA_UART
 #define S3C_PA_HSMMC0		S5PV210_PA_HSMMC(0)
@@ -112,4 +117,8 @@
 #define SAMSUNG_PA_CFCON	S5PV210_PA_CFCON
 #define SAMSUNG_PA_KEYPAD	S5PV210_PA_KEYPAD
 
+#define S5P_PA_FIMC0		S5PV210_PA_FIMC0
+#define S5P_PA_FIMC1		S5PV210_PA_FIMC1
+#define S5P_PA_FIMC2		S5PV210_PA_FIMC2
+
 #endif /* __ASM_ARCH_MAP_H */
diff --git a/arch/arm/plat-s5p/Kconfig b/arch/arm/plat-s5p/Kconfig
index 11d6a1b..38b60c7 100644
--- a/arch/arm/plat-s5p/Kconfig
+++ b/arch/arm/plat-s5p/Kconfig
@@ -5,6 +5,22 @@
 #
 # Licensed under GPLv2
 
+config S5P_DEV_FIMC0
+	bool
+	help
+	  Compile in platform device definitions for FIMC controller 0
+
+config S5P_DEV_FIMC1
+	bool
+	help
+	  Compile in platform device definitions for FIMC controller 1
+
+config S5P_DEV_FIMC2
+	bool
+	help
+	  Compile in platform device definitions for FIMC controller 2
+
+
 config PLAT_S5P
 	bool
 	depends on (ARCH_S5P6440 || ARCH_S5P6442 || ARCH_S5PC100 || ARCH_S5PV210)
diff --git a/arch/arm/plat-s5p/Makefile b/arch/arm/plat-s5p/Makefile
index 7e34194..a2d9905 100644
--- a/arch/arm/plat-s5p/Makefile
+++ b/arch/arm/plat-s5p/Makefile
@@ -19,3 +19,6 @@ obj-y				+= clock.o
 obj-y				+= irq.o
 obj-$(CONFIG_S5P_EXT_INT)	+= irq-eint.o
 
+obj-$(CONFIG_S5P_DEV_FIMC0)	+= dev-fimc0.o
+obj-$(CONFIG_S5P_DEV_FIMC1)	+= dev-fimc1.o
+obj-$(CONFIG_S5P_DEV_FIMC2)	+= dev-fimc2.o
diff --git a/arch/arm/plat-s5p/dev-fimc0.c b/arch/arm/plat-s5p/dev-fimc0.c
new file mode 100644
index 0000000..8849de4
--- /dev/null
+++ b/arch/arm/plat-s5p/dev-fimc0.c
@@ -0,0 +1,35 @@
+/* linux/arch/arm/plat-s5p/dev-fimc0.c
+ *
+ * Copyright (c) 2010 Samsung Electronics
+ *
+ * Base S5P FIMC0 resource and device definitions
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+#include <linux/kernel.h>
+#include <linux/platform_device.h>
+#include <linux/interrupt.h>
+#include <linux/ioport.h>
+#include <mach/map.h>
+
+static struct resource s5p_fimc_resource[] = {
+	[0] = {
+		.start	= S5P_PA_FIMC0,
+		.end	= S5P_PA_FIMC0 + SZ_1M - 1,
+		.flags	= IORESOURCE_MEM,
+	},
+	[1] = {
+		.start	= IRQ_FIMC0,
+		.end	= IRQ_FIMC0,
+		.flags	= IORESOURCE_IRQ,
+	},
+};
+
+struct platform_device s5p_device_fimc0 = {
+	.name		= "s5p-fimc",
+	.id		= 0,
+	.num_resources	= ARRAY_SIZE(s5p_fimc_resource),
+	.resource	= s5p_fimc_resource,
+};
diff --git a/arch/arm/plat-s5p/dev-fimc1.c b/arch/arm/plat-s5p/dev-fimc1.c
new file mode 100644
index 0000000..b1f8970
--- /dev/null
+++ b/arch/arm/plat-s5p/dev-fimc1.c
@@ -0,0 +1,35 @@
+/* linux/arch/arm/plat-s5p/dev-fimc1.c
+ *
+ * Copyright (c) 2010 Samsung Electronics
+ *
+ * Base S5P FIMC1 resource and device definitions
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+#include <linux/kernel.h>
+#include <linux/platform_device.h>
+#include <linux/interrupt.h>
+#include <linux/ioport.h>
+#include <mach/map.h>
+
+static struct resource s5p_fimc_resource[] = {
+	[0] = {
+		.start	= S5P_PA_FIMC1,
+		.end	= S5P_PA_FIMC1 + SZ_1M - 1,
+		.flags	= IORESOURCE_MEM,
+	},
+	[1] = {
+		.start	= IRQ_FIMC1,
+		.end	= IRQ_FIMC1,
+		.flags	= IORESOURCE_IRQ,
+	},
+};
+
+struct platform_device s5p_device_fimc1 = {
+	.name		= "s5p-fimc",
+	.id		= 1,
+	.num_resources	= ARRAY_SIZE(s5p_fimc_resource),
+	.resource	= s5p_fimc_resource,
+};
diff --git a/arch/arm/plat-s5p/dev-fimc2.c b/arch/arm/plat-s5p/dev-fimc2.c
new file mode 100644
index 0000000..20df59d
--- /dev/null
+++ b/arch/arm/plat-s5p/dev-fimc2.c
@@ -0,0 +1,35 @@
+/* linux/arch/arm/plat-s5p/dev-fimc2.c
+ *
+ * Copyright (c) 2010 Samsung Electronics
+ *
+ * Base S5P FIMC2 resource and device definitions
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+#include <linux/kernel.h>
+#include <linux/platform_device.h>
+#include <linux/interrupt.h>
+#include <linux/ioport.h>
+#include <mach/map.h>
+
+static struct resource s5p_fimc_resource[] = {
+	[0] = {
+		.start	= S5P_PA_FIMC2,
+		.end	= S5P_PA_FIMC2 + SZ_1M - 1,
+		.flags	= IORESOURCE_MEM,
+	},
+	[1] = {
+		.start	= IRQ_FIMC2,
+		.end	= IRQ_FIMC2,
+		.flags	= IORESOURCE_IRQ,
+	},
+};
+
+struct platform_device s5p_device_fimc2 = {
+	.name		= "s5p-fimc",
+	.id		= 2,
+	.num_resources	= ARRAY_SIZE(s5p_fimc_resource),
+	.resource	= s5p_fimc_resource,
+};
diff --git a/arch/arm/plat-samsung/include/plat/fimc-core.h b/arch/arm/plat-samsung/include/plat/fimc-core.h
new file mode 100644
index 0000000..a884ede
--- /dev/null
+++ b/arch/arm/plat-samsung/include/plat/fimc-core.h
@@ -0,0 +1,45 @@
+/*
+ * arch/arm/plat-samsung/include/plat/fimc-core.h
+ *
+ * Copyright 2010 Samsung Electronics Co., Ltd.
+ *	Sylwester Nawrocki <s.nawrocki@samsung.com>
+ *
+ * Samsung camera interface driver core functions
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+#ifndef __ASM_PLAT_FIMC_CORE_H
+#define __ASM_PLAT_FIMC_CORE_H __FILE__
+
+/*
+ * These functions are only for use with the core support code, such as
+ * the CPU-specific initialization code.
+ */
+
+#include <plat/fimc.h>
+
+/* Re-define device name to differentiate the subsystem in various SoCs. */
+static inline void s3c_fimc_setname(int id, char *name)
+{
+	switch (id) {
+#ifdef CONFIG_S5P_DEV_FIMC0
+	case 0:
+		s5p_device_fimc0.name = name;
+		break;
+#endif
+#ifdef CONFIG_S5P_DEV_FIMC1
+	case 1:
+		s5p_device_fimc1.name = name;
+		break;
+#endif
+#ifdef CONFIG_S5P_DEV_FIMC2
+	case 2:
+		s5p_device_fimc2.name = name;
+		break;
+#endif
+	}
+}
+
+#endif /* __ASM_PLAT_FIMC_CORE_H */
diff --git a/arch/arm/plat-samsung/include/plat/fimc.h b/arch/arm/plat-samsung/include/plat/fimc.h
new file mode 100644
index 0000000..3eba064
--- /dev/null
+++ b/arch/arm/plat-samsung/include/plat/fimc.h
@@ -0,0 +1,23 @@
+/* linux/arch/arm/plat-samsung/include/plat/fimc.h
+ *
+ * Platform header file for S3C/S5P FIMC driver
+ *
+ * Copyright (c) 2010 Samsung Electronics
+ *
+ * Sylwester Nawrocki, <s.nawrocki@samsung.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+#ifndef FIMC_H_
+#define FIMC_H_
+
+#include <linux/platform_device.h>
+
+extern struct platform_device s5p_device_fimc0;
+extern struct platform_device s5p_device_fimc1;
+extern struct platform_device s5p_device_fimc2;
+
+#endif /* FIMC_H_ */
+
-- 
1.7.2

[PATCH v4 3/8] ARM: Samsung: Add platform definitions and helpers for FIMC driver

[Marek Szyprowski]

From: Sylwester Nawrocki <s.nawrocki@samsung.com>

FIMC (CAMIF) device is a camera interface embedded in S3C/S5P Samsung
SOC series. It supports ITU-R BT.601/656 and MIPI-CSI2 standards,
memory to memory operations, color conversion, resizing and rotation.

Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
---

This is patch is a v3 version rebased onto latest kgene/for-next tree.
New entries in map.h files has been sorted by the physicall address.

I'm resending this patch on behalf of Sylwester who is on holidays this
week.

Best regards
-- 
Marek Szyprowski
Samsung Poland R&D Center
---
 arch/arm/mach-s5pc100/include/mach/map.h       |    7 ++++
 arch/arm/mach-s5pv210/cpu.c                    |    5 +++
 arch/arm/mach-s5pv210/include/mach/map.h       |    8 ++++
 arch/arm/plat-s5p/Kconfig                      |   16 ++++++++
 arch/arm/plat-s5p/Makefile                     |    3 ++
 arch/arm/plat-s5p/dev-fimc0.c                  |   35 ++++++++++++++++++
 arch/arm/plat-s5p/dev-fimc1.c                  |   35 ++++++++++++++++++
 arch/arm/plat-s5p/dev-fimc2.c                  |   35 ++++++++++++++++++
 arch/arm/plat-samsung/include/plat/fimc-core.h |   45 ++++++++++++++++++++++++
 arch/arm/plat-samsung/include/plat/fimc.h      |   22 +++++++++++
 10 files changed, 211 insertions(+), 0 deletions(-)
 create mode 100644 arch/arm/plat-s5p/dev-fimc0.c
 create mode 100644 arch/arm/plat-s5p/dev-fimc1.c
 create mode 100644 arch/arm/plat-s5p/dev-fimc2.c
 create mode 100644 arch/arm/plat-samsung/include/plat/fimc-core.h
 create mode 100644 arch/arm/plat-samsung/include/plat/fimc.h

diff --git a/arch/arm/mach-s5pc100/include/mach/map.h b/arch/arm/mach-s5pc100/include/mach/map.h
index c018697..3abe7f5 100644
--- a/arch/arm/mach-s5pc100/include/mach/map.h
+++ b/arch/arm/mach-s5pc100/include/mach/map.h
@@ -99,6 +99,10 @@
 
 #define S5PC100_PA_FB		(0xEE000000)
 
+#define S5PC100_PA_FIMC0	(0xEE200000)
+#define S5PC100_PA_FIMC1	(0xEE300000)
+#define S5PC100_PA_FIMC2	(0xEE400000)
+
 #define S5PC100_PA_I2S0		(0xF2000000)
 #define S5PC100_PA_I2S1		(0xF2100000)
 #define S5PC100_PA_I2S2		(0xF2200000)
@@ -143,6 +147,9 @@
 #define S3C_PA_ONENAND_BUF	S5PC100_PA_ONENAND_BUF
 #define S3C_SZ_ONENAND_BUF	S5PC100_SZ_ONENAND_BUF
 #define S3C_PA_RTC		S5PC100_PA_RTC
+#define S5P_PA_FIMC0		S5PC100_PA_FIMC0
+#define S5P_PA_FIMC1		S5PC100_PA_FIMC1
+#define S5P_PA_FIMC2		S5PC100_PA_FIMC2
 
 #define SAMSUNG_PA_ADC		S5PC100_PA_TSADC
 #define SAMSUNG_PA_CFCON	S5PC100_PA_CFCON
diff --git a/arch/arm/mach-s5pv210/cpu.c b/arch/arm/mach-s5pv210/cpu.c
index ea09c32..a7446d4 100644
--- a/arch/arm/mach-s5pv210/cpu.c
+++ b/arch/arm/mach-s5pv210/cpu.c
@@ -37,6 +37,7 @@
 #include <plat/iic-core.h>
 #include <plat/keypad-core.h>
 #include <plat/sdhci.h>
+#include <plat/fimc-core.h>
 #include <plat/reset.h>
 
 /* Initial IO mappings */
@@ -104,6 +105,10 @@ void __init s5pv210_map_io(void)
 
 	/* Use s5pv210-keypad instead of samsung-keypad */
 	samsung_keypad_setname("s5pv210-keypad");
+
+	s3c_fimc_setname(0, "s5pv210-fimc");
+	s3c_fimc_setname(1, "s5pv210-fimc");
+	s3c_fimc_setname(2, "s5pv210-fimc");
 }
 
 void __init s5pv210_init_clocks(int xtal)
diff --git a/arch/arm/mach-s5pv210/include/mach/map.h b/arch/arm/mach-s5pv210/include/mach/map.h
index 986b285..6a07e55 100644
--- a/arch/arm/mach-s5pv210/include/mach/map.h
+++ b/arch/arm/mach-s5pv210/include/mach/map.h
@@ -65,6 +65,10 @@
 
 #define S5PV210_PA_FB		(0xF8000000)
 
+#define S5PV210_PA_FIMC0	(0xFB200000)
+#define S5PV210_PA_FIMC1	(0xFB300000)
+#define S5PV210_PA_FIMC2	(0xFB400000)
+
 #define S5PV210_PA_HSMMC(x)	(0xEB000000 + ((x) * 0x100000))
 
 #define S5PV210_PA_VIC0		(0xF2000000)
@@ -114,4 +118,8 @@
 #define SAMSUNG_PA_CFCON	S5PV210_PA_CFCON
 #define SAMSUNG_PA_KEYPAD	S5PV210_PA_KEYPAD
 
+#define S5P_PA_FIMC0		S5PV210_PA_FIMC0
+#define S5P_PA_FIMC1		S5PV210_PA_FIMC1
+#define S5P_PA_FIMC2		S5PV210_PA_FIMC2
+
 #endif /* __ASM_ARCH_MAP_H */
diff --git a/arch/arm/plat-s5p/Kconfig b/arch/arm/plat-s5p/Kconfig
index 907ac63..9c79106 100644
--- a/arch/arm/plat-s5p/Kconfig
+++ b/arch/arm/plat-s5p/Kconfig
@@ -5,6 +5,22 @@
 #
 # Licensed under GPLv2
 
+config S5P_DEV_FIMC0
+	bool
+	help
+	  Compile in platform device definitions for FIMC controller 0
+
+config S5P_DEV_FIMC1
+	bool
+	help
+	  Compile in platform device definitions for FIMC controller 1
+
+config S5P_DEV_FIMC2
+	bool
+	help
+	  Compile in platform device definitions for FIMC controller 2
+
+
 config PLAT_S5P
 	bool
 	depends on (ARCH_S5P6440 || ARCH_S5P6442 || ARCH_S5PC100 || ARCH_S5PV210 || ARCH_S5PV310)
diff --git a/arch/arm/plat-s5p/Makefile b/arch/arm/plat-s5p/Makefile
index 7e34194..a2d9905 100644
--- a/arch/arm/plat-s5p/Makefile
+++ b/arch/arm/plat-s5p/Makefile
@@ -19,3 +19,6 @@ obj-y				+= clock.o
 obj-y				+= irq.o
 obj-$(CONFIG_S5P_EXT_INT)	+= irq-eint.o
 
+obj-$(CONFIG_S5P_DEV_FIMC0)	+= dev-fimc0.o
+obj-$(CONFIG_S5P_DEV_FIMC1)	+= dev-fimc1.o
+obj-$(CONFIG_S5P_DEV_FIMC2)	+= dev-fimc2.o
diff --git a/arch/arm/plat-s5p/dev-fimc0.c b/arch/arm/plat-s5p/dev-fimc0.c
new file mode 100644
index 0000000..8849de4
--- /dev/null
+++ b/arch/arm/plat-s5p/dev-fimc0.c
@@ -0,0 +1,35 @@
+/* linux/arch/arm/plat-s5p/dev-fimc0.c
+ *
+ * Copyright (c) 2010 Samsung Electronics
+ *
+ * Base S5P FIMC0 resource and device definitions
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+#include <linux/kernel.h>
+#include <linux/platform_device.h>
+#include <linux/interrupt.h>
+#include <linux/ioport.h>
+#include <mach/map.h>
+
+static struct resource s5p_fimc_resource[] = {
+	[0] = {
+		.start	= S5P_PA_FIMC0,
+		.end	= S5P_PA_FIMC0 + SZ_1M - 1,
+		.flags	= IORESOURCE_MEM,
+	},
+	[1] = {
+		.start	= IRQ_FIMC0,
+		.end	= IRQ_FIMC0,
+		.flags	= IORESOURCE_IRQ,
+	},
+};
+
+struct platform_device s5p_device_fimc0 = {
+	.name		= "s5p-fimc",
+	.id		= 0,
+	.num_resources	= ARRAY_SIZE(s5p_fimc_resource),
+	.resource	= s5p_fimc_resource,
+};
diff --git a/arch/arm/plat-s5p/dev-fimc1.c b/arch/arm/plat-s5p/dev-fimc1.c
new file mode 100644
index 0000000..b1f8970
--- /dev/null
+++ b/arch/arm/plat-s5p/dev-fimc1.c
@@ -0,0 +1,35 @@
+/* linux/arch/arm/plat-s5p/dev-fimc1.c
+ *
+ * Copyright (c) 2010 Samsung Electronics
+ *
+ * Base S5P FIMC1 resource and device definitions
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+#include <linux/kernel.h>
+#include <linux/platform_device.h>
+#include <linux/interrupt.h>
+#include <linux/ioport.h>
+#include <mach/map.h>
+
+static struct resource s5p_fimc_resource[] = {
+	[0] = {
+		.start	= S5P_PA_FIMC1,
+		.end	= S5P_PA_FIMC1 + SZ_1M - 1,
+		.flags	= IORESOURCE_MEM,
+	},
+	[1] = {
+		.start	= IRQ_FIMC1,
+		.end	= IRQ_FIMC1,
+		.flags	= IORESOURCE_IRQ,
+	},
+};
+
+struct platform_device s5p_device_fimc1 = {
+	.name		= "s5p-fimc",
+	.id		= 1,
+	.num_resources	= ARRAY_SIZE(s5p_fimc_resource),
+	.resource	= s5p_fimc_resource,
+};
diff --git a/arch/arm/plat-s5p/dev-fimc2.c b/arch/arm/plat-s5p/dev-fimc2.c
new file mode 100644
index 0000000..20df59d
--- /dev/null
+++ b/arch/arm/plat-s5p/dev-fimc2.c
@@ -0,0 +1,35 @@
+/* linux/arch/arm/plat-s5p/dev-fimc2.c
+ *
+ * Copyright (c) 2010 Samsung Electronics
+ *
+ * Base S5P FIMC2 resource and device definitions
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+#include <linux/kernel.h>
+#include <linux/platform_device.h>
+#include <linux/interrupt.h>
+#include <linux/ioport.h>
+#include <mach/map.h>
+
+static struct resource s5p_fimc_resource[] = {
+	[0] = {
+		.start	= S5P_PA_FIMC2,
+		.end	= S5P_PA_FIMC2 + SZ_1M - 1,
+		.flags	= IORESOURCE_MEM,
+	},
+	[1] = {
+		.start	= IRQ_FIMC2,
+		.end	= IRQ_FIMC2,
+		.flags	= IORESOURCE_IRQ,
+	},
+};
+
+struct platform_device s5p_device_fimc2 = {
+	.name		= "s5p-fimc",
+	.id		= 2,
+	.num_resources	= ARRAY_SIZE(s5p_fimc_resource),
+	.resource	= s5p_fimc_resource,
+};
diff --git a/arch/arm/plat-samsung/include/plat/fimc-core.h b/arch/arm/plat-samsung/include/plat/fimc-core.h
new file mode 100644
index 0000000..a884ede
--- /dev/null
+++ b/arch/arm/plat-samsung/include/plat/fimc-core.h
@@ -0,0 +1,45 @@
+/*
+ * arch/arm/plat-samsung/include/plat/fimc-core.h
+ *
+ * Copyright 2010 Samsung Electronics Co., Ltd.
+ *	Sylwester Nawrocki <s.nawrocki@samsung.com>
+ *
+ * Samsung camera interface driver core functions
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+#ifndef __ASM_PLAT_FIMC_CORE_H
+#define __ASM_PLAT_FIMC_CORE_H __FILE__
+
+/*
+ * These functions are only for use with the core support code, such as
+ * the CPU-specific initialization code.
+ */
+
+#include <plat/fimc.h>
+
+/* Re-define device name to differentiate the subsystem in various SoCs. */
+static inline void s3c_fimc_setname(int id, char *name)
+{
+	switch (id) {
+#ifdef CONFIG_S5P_DEV_FIMC0
+	case 0:
+		s5p_device_fimc0.name = name;
+		break;
+#endif
+#ifdef CONFIG_S5P_DEV_FIMC1
+	case 1:
+		s5p_device_fimc1.name = name;
+		break;
+#endif
+#ifdef CONFIG_S5P_DEV_FIMC2
+	case 2:
+		s5p_device_fimc2.name = name;
+		break;
+#endif
+	}
+}
+
+#endif /* __ASM_PLAT_FIMC_CORE_H */
diff --git a/arch/arm/plat-samsung/include/plat/fimc.h b/arch/arm/plat-samsung/include/plat/fimc.h
new file mode 100644
index 0000000..fda2040
--- /dev/null
+++ b/arch/arm/plat-samsung/include/plat/fimc.h
@@ -0,0 +1,22 @@
+/* linux/arch/arm/plat-samsung/include/plat/fimc.h
+ *
+ * Platform header file for S3C/S5P FIMC driver
+ *
+ * Copyright (c) 2010 Samsung Electronics
+ *
+ * Sylwester Nawrocki, <s.nawrocki@samsung.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+#ifndef FIMC_H_
+#define FIMC_H_
+
+#include <linux/platform_device.h>
+
+extern struct platform_device s5p_device_fimc0;
+extern struct platform_device s5p_device_fimc1;
+extern struct platform_device s5p_device_fimc2;
+
+#endif /* FIMC_H_ */
-- 
1.7.1.569.g6f426

[PATCH v4 3/8] ARM: Samsung: Add platform definitions and helpers for FIMC driver

[Kukjin Kim]

Marek Szyprowski wrote:
> 
> From: Sylwester Nawrocki <s.nawrocki@samsung.com>
> 
> FIMC (CAMIF) device is a camera interface embedded in S3C/S5P Samsung
> SOC series. It supports ITU-R BT.601/656 and MIPI-CSI2 standards,
> memory to memory operations, color conversion, resizing and rotation.
> 
> Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
> ---
> 
> This is patch is a v3 version rebased onto latest kgene/for-next tree.
> New entries in map.h files has been sorted by the physicall address.
> 
Thanks for your addressing.

> I'm resending this patch on behalf of Sylwester who is on holidays this
> week.
> 
> Best regards
> --
> Marek Szyprowski
> Samsung Poland R&D Center
> ---
>  arch/arm/mach-s5pc100/include/mach/map.h       |    7 ++++
>  arch/arm/mach-s5pv210/cpu.c                    |    5 +++
>  arch/arm/mach-s5pv210/include/mach/map.h       |    8 ++++
>  arch/arm/plat-s5p/Kconfig                      |   16 ++++++++
>  arch/arm/plat-s5p/Makefile                     |    3 ++
>  arch/arm/plat-s5p/dev-fimc0.c                  |   35
> ++++++++++++++++++
>  arch/arm/plat-s5p/dev-fimc1.c                  |   35
> ++++++++++++++++++
>  arch/arm/plat-s5p/dev-fimc2.c                  |   35
> ++++++++++++++++++
>  arch/arm/plat-samsung/include/plat/fimc-core.h |   45
> ++++++++++++++++++++++++
>  arch/arm/plat-samsung/include/plat/fimc.h      |   22 +++++++++++
>  10 files changed, 211 insertions(+), 0 deletions(-)
>  create mode 100644 arch/arm/plat-s5p/dev-fimc0.c
>  create mode 100644 arch/arm/plat-s5p/dev-fimc1.c
>  create mode 100644 arch/arm/plat-s5p/dev-fimc2.c
>  create mode 100644 arch/arm/plat-samsung/include/plat/fimc-core.h
>  create mode 100644 arch/arm/plat-samsung/include/plat/fimc.h
> 
> diff --git a/arch/arm/mach-s5pc100/include/mach/map.h b/arch/arm/mach-
> s5pc100/include/mach/map.h
> index c018697..3abe7f5 100644
> --- a/arch/arm/mach-s5pc100/include/mach/map.h
> +++ b/arch/arm/mach-s5pc100/include/mach/map.h
> @@ -99,6 +99,10 @@
> 
>  #define S5PC100_PA_FB		(0xEE000000)
> 
> +#define S5PC100_PA_FIMC0	(0xEE200000)
> +#define S5PC100_PA_FIMC1	(0xEE300000)
> +#define S5PC100_PA_FIMC2	(0xEE400000)
> +
>  #define S5PC100_PA_I2S0		(0xF2000000)
>  #define S5PC100_PA_I2S1		(0xF2100000)
>  #define S5PC100_PA_I2S2		(0xF2200000)
> @@ -143,6 +147,9 @@
>  #define S3C_PA_ONENAND_BUF	S5PC100_PA_ONENAND_BUF
>  #define S3C_SZ_ONENAND_BUF	S5PC100_SZ_ONENAND_BUF
>  #define S3C_PA_RTC		S5PC100_PA_RTC
> +#define S5P_PA_FIMC0		S5PC100_PA_FIMC0
> +#define S5P_PA_FIMC1		S5PC100_PA_FIMC1
> +#define S5P_PA_FIMC2		S5PC100_PA_FIMC2
> 
>  #define SAMSUNG_PA_ADC		S5PC100_PA_TSADC
>  #define SAMSUNG_PA_CFCON	S5PC100_PA_CFCON
> diff --git a/arch/arm/mach-s5pv210/cpu.c b/arch/arm/mach-s5pv210/cpu.c
> index ea09c32..a7446d4 100644
> --- a/arch/arm/mach-s5pv210/cpu.c
> +++ b/arch/arm/mach-s5pv210/cpu.c
> @@ -37,6 +37,7 @@
>  #include <plat/iic-core.h>
>  #include <plat/keypad-core.h>
>  #include <plat/sdhci.h>
> +#include <plat/fimc-core.h>
>  #include <plat/reset.h>
> 
>  /* Initial IO mappings */
> @@ -104,6 +105,10 @@ void __init s5pv210_map_io(void)
> 
>  	/* Use s5pv210-keypad instead of samsung-keypad */
>  	samsung_keypad_setname("s5pv210-keypad");
> +
> +	s3c_fimc_setname(0, "s5pv210-fimc");
> +	s3c_fimc_setname(1, "s5pv210-fimc");
> +	s3c_fimc_setname(2, "s5pv210-fimc");
>  }
> 
>  void __init s5pv210_init_clocks(int xtal)
> diff --git a/arch/arm/mach-s5pv210/include/mach/map.h b/arch/arm/mach-
> s5pv210/include/mach/map.h
> index 986b285..6a07e55 100644
> --- a/arch/arm/mach-s5pv210/include/mach/map.h
> +++ b/arch/arm/mach-s5pv210/include/mach/map.h
> @@ -65,6 +65,10 @@
> 
>  #define S5PV210_PA_FB		(0xF8000000)
> 
> +#define S5PV210_PA_FIMC0	(0xFB200000)
> +#define S5PV210_PA_FIMC1	(0xFB300000)
> +#define S5PV210_PA_FIMC2	(0xFB400000)
> +
>  #define S5PV210_PA_HSMMC(x)	(0xEB000000 + ((x) * 0x100000))
> 
>  #define S5PV210_PA_VIC0		(0xF2000000)
> @@ -114,4 +118,8 @@
>  #define SAMSUNG_PA_CFCON	S5PV210_PA_CFCON
>  #define SAMSUNG_PA_KEYPAD	S5PV210_PA_KEYPAD
> 
> +#define S5P_PA_FIMC0		S5PV210_PA_FIMC0
> +#define S5P_PA_FIMC1		S5PV210_PA_FIMC1
> +#define S5P_PA_FIMC2		S5PV210_PA_FIMC2

To use one style is better for reading, merge conflict handling and so on...
The style means to add S5P_PA_XXX after S3C_PA_XXX with C100 case or to
modify above C100 case like this.

> +
>  #endif /* __ASM_ARCH_MAP_H */
> diff --git a/arch/arm/plat-s5p/Kconfig b/arch/arm/plat-s5p/Kconfig
> index 907ac63..9c79106 100644
> --- a/arch/arm/plat-s5p/Kconfig
> +++ b/arch/arm/plat-s5p/Kconfig
> @@ -5,6 +5,22 @@
>  #
>  # Licensed under GPLv2
> 
> +config S5P_DEV_FIMC0
> +	bool
> +	help
> +	  Compile in platform device definitions for FIMC controller 0
> +
> +config S5P_DEV_FIMC1
> +	bool
> +	help
> +	  Compile in platform device definitions for FIMC controller 1
> +
> +config S5P_DEV_FIMC2
> +	bool
> +	help
> +	  Compile in platform device definitions for FIMC controller 2
> +
> +

2 empty lines.

>  config PLAT_S5P
>  	bool
>  	depends on (ARCH_S5P6440 || ARCH_S5P6442 || ARCH_S5PC100 ||
> ARCH_S5PV210 || ARCH_S5PV310)
> diff --git a/arch/arm/plat-s5p/Makefile b/arch/arm/plat-s5p/Makefile
> index 7e34194..a2d9905 100644
> --- a/arch/arm/plat-s5p/Makefile
> +++ b/arch/arm/plat-s5p/Makefile
> @@ -19,3 +19,6 @@ obj-y				+= clock.o
>  obj-y				+= irq.o
>  obj-$(CONFIG_S5P_EXT_INT)	+= irq-eint.o
> 

Please add '# devices' here...

> +obj-$(CONFIG_S5P_DEV_FIMC0)	+= dev-fimc0.o
> +obj-$(CONFIG_S5P_DEV_FIMC1)	+= dev-fimc1.o
> +obj-$(CONFIG_S5P_DEV_FIMC2)	+= dev-fimc2.o
> diff --git a/arch/arm/plat-s5p/dev-fimc0.c b/arch/arm/plat-s5p/dev-fimc0.c
> new file mode 100644
> index 0000000..8849de4
> --- /dev/null
> +++ b/arch/arm/plat-s5p/dev-fimc0.c
> @@ -0,0 +1,35 @@
> +/* linux/arch/arm/plat-s5p/dev-fimc0.c
> + *
> + * Copyright (c) 2010 Samsung Electronics
> + *
> + * Base S5P FIMC0 resource and device definitions
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License version 2 as
> + * published by the Free Software Foundation.
> + */

Being 1 empty line is better here.

> +#include <linux/kernel.h>
> +#include <linux/platform_device.h>
> +#include <linux/interrupt.h>
> +#include <linux/ioport.h>
> +#include <mach/map.h>
> +
> +static struct resource s5p_fimc_resource[] = {

Please change to s5p_fimc0_resource...it'd helpful to merging dev-fimcX
files later...

> +	[0] = {
> +		.start	= S5P_PA_FIMC0,
> +		.end	= S5P_PA_FIMC0 + SZ_1M - 1,
> +		.flags	= IORESOURCE_MEM,
> +	},
> +	[1] = {
> +		.start	= IRQ_FIMC0,
> +		.end	= IRQ_FIMC0,
> +		.flags	= IORESOURCE_IRQ,
> +	},
> +};
> +
> +struct platform_device s5p_device_fimc0 = {
> +	.name		= "s5p-fimc",
> +	.id		= 0,
> +	.num_resources	= ARRAY_SIZE(s5p_fimc_resource),

s5p_fimc0_resource...

> +	.resource	= s5p_fimc_resource,

s5p_fimc0_resource...

> +};
> diff --git a/arch/arm/plat-s5p/dev-fimc1.c b/arch/arm/plat-s5p/dev-fimc1.c
> new file mode 100644
> index 0000000..b1f8970
> --- /dev/null
> +++ b/arch/arm/plat-s5p/dev-fimc1.c
> @@ -0,0 +1,35 @@
> +/* linux/arch/arm/plat-s5p/dev-fimc1.c
> + *
> + * Copyright (c) 2010 Samsung Electronics
> + *
> + * Base S5P FIMC1 resource and device definitions
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License version 2 as
> + * published by the Free Software Foundation.
> + */
> +#include <linux/kernel.h>
> +#include <linux/platform_device.h>
> +#include <linux/interrupt.h>
> +#include <linux/ioport.h>
> +#include <mach/map.h>
> +
> +static struct resource s5p_fimc_resource[] = {
> +	[0] = {
> +		.start	= S5P_PA_FIMC1,
> +		.end	= S5P_PA_FIMC1 + SZ_1M - 1,
> +		.flags	= IORESOURCE_MEM,
> +	},
> +	[1] = {
> +		.start	= IRQ_FIMC1,
> +		.end	= IRQ_FIMC1,
> +		.flags	= IORESOURCE_IRQ,
> +	},
> +};
> +
> +struct platform_device s5p_device_fimc1 = {
> +	.name		= "s5p-fimc",
> +	.id		= 1,
> +	.num_resources	= ARRAY_SIZE(s5p_fimc_resource),
> +	.resource	= s5p_fimc_resource,
> +};
> diff --git a/arch/arm/plat-s5p/dev-fimc2.c b/arch/arm/plat-s5p/dev-fimc2.c
> new file mode 100644
> index 0000000..20df59d
> --- /dev/null
> +++ b/arch/arm/plat-s5p/dev-fimc2.c
> @@ -0,0 +1,35 @@
> +/* linux/arch/arm/plat-s5p/dev-fimc2.c
> + *
> + * Copyright (c) 2010 Samsung Electronics
> + *
> + * Base S5P FIMC2 resource and device definitions
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License version 2 as
> + * published by the Free Software Foundation.
> + */
> +#include <linux/kernel.h>
> +#include <linux/platform_device.h>
> +#include <linux/interrupt.h>
> +#include <linux/ioport.h>
> +#include <mach/map.h>
> +
> +static struct resource s5p_fimc_resource[] = {
> +	[0] = {
> +		.start	= S5P_PA_FIMC2,
> +		.end	= S5P_PA_FIMC2 + SZ_1M - 1,
> +		.flags	= IORESOURCE_MEM,
> +	},
> +	[1] = {
> +		.start	= IRQ_FIMC2,
> +		.end	= IRQ_FIMC2,
> +		.flags	= IORESOURCE_IRQ,
> +	},
> +};
> +
> +struct platform_device s5p_device_fimc2 = {
> +	.name		= "s5p-fimc",
> +	.id		= 2,
> +	.num_resources	= ARRAY_SIZE(s5p_fimc_resource),
> +	.resource	= s5p_fimc_resource,
> +};

This is just for your information...
I'm working on handling plat device in case of various # of each AP FIMC
with CONFIG_NR_FIMC...
So in this case, all of plat data for FIMC will be merged into
'plat-s5p/dev-fimc.c' or 'devs.c' later.
...but I'm not sure some stuff...anyway...

> diff --git a/arch/arm/plat-samsung/include/plat/fimc-core.h
b/arch/arm/plat-
> samsung/include/plat/fimc-core.h
> new file mode 100644
> index 0000000..a884ede
> --- /dev/null
> +++ b/arch/arm/plat-samsung/include/plat/fimc-core.h
> @@ -0,0 +1,45 @@
> +/*
> + * arch/arm/plat-samsung/include/plat/fimc-core.h
> + *
> + * Copyright 2010 Samsung Electronics Co., Ltd.
> + *	Sylwester Nawrocki <s.nawrocki@samsung.com>
> + *
> + * Samsung camera interface driver core functions
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License version 2 as
> + * published by the Free Software Foundation.
> + */
> +#ifndef __ASM_PLAT_FIMC_CORE_H
> +#define __ASM_PLAT_FIMC_CORE_H __FILE__
> +
> +/*
> + * These functions are only for use with the core support code, such as
> + * the CPU-specific initialization code.
> + */
> +
> +#include <plat/fimc.h>
> +
> +/* Re-define device name to differentiate the subsystem in various SoCs.
*/
> +static inline void s3c_fimc_setname(int id, char *name)
> +{
> +	switch (id) {
> +#ifdef CONFIG_S5P_DEV_FIMC0
> +	case 0:
> +		s5p_device_fimc0.name = name;
> +		break;
> +#endif
> +#ifdef CONFIG_S5P_DEV_FIMC1
> +	case 1:
> +		s5p_device_fimc1.name = name;
> +		break;
> +#endif
> +#ifdef CONFIG_S5P_DEV_FIMC2
> +	case 2:
> +		s5p_device_fimc2.name = name;
> +		break;
> +#endif
> +	}
> +}
> +
> +#endif /* __ASM_PLAT_FIMC_CORE_H */
> diff --git a/arch/arm/plat-samsung/include/plat/fimc.h b/arch/arm/plat-
> samsung/include/plat/fimc.h
> new file mode 100644
> index 0000000..fda2040
> --- /dev/null
> +++ b/arch/arm/plat-samsung/include/plat/fimc.h
> @@ -0,0 +1,22 @@
> +/* linux/arch/arm/plat-samsung/include/plat/fimc.h
> + *
> + * Platform header file for S3C/S5P FIMC driver
> + *
> + * Copyright (c) 2010 Samsung Electronics
> + *
> + * Sylwester Nawrocki, <s.nawrocki@samsung.com>
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License version 2 as
> + * published by the Free Software Foundation.
> + */
> +#ifndef FIMC_H_
> +#define FIMC_H_
> +
> +#include <linux/platform_device.h>
> +
> +extern struct platform_device s5p_device_fimc0;
> +extern struct platform_device s5p_device_fimc1;
> +extern struct platform_device s5p_device_fimc2;

Should being in 'plat-samsung/include/plat/devs.h'.

> +
> +#endif /* FIMC_H_ */
> --

Marek, could you please address as soon as possible?

Thanks.

Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.

[PATCH v4 3/8] ARM: Samsung: Add platform definitions and helpers for FIMC driver

[Kyungmin Park]

On Tue, Aug 3, 2010 at 8:58 AM, Kukjin Kim <kgene.kim@samsung.com> wrote:
> Marek Szyprowski wrote:
>>
>> From: Sylwester Nawrocki <s.nawrocki@samsung.com>
>>
>> FIMC (CAMIF) device is a camera interface embedded in S3C/S5P Samsung
>> SOC series. It supports ITU-R BT.601/656 and MIPI-CSI2 standards,
>> memory to memory operations, color conversion, resizing and rotation.
>>
>> Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
>> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
>> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
>> ---
>>
>> This is patch is a v3 version rebased onto latest kgene/for-next tree.
>> New entries in map.h files has been sorted by the physicall address.
>>
> Thanks for your addressing.
>
>> I'm resending this patch on behalf of Sylwester who is on holidays this
>> week.
>>
>> Best regards
>> --
>> Marek Szyprowski
>> Samsung Poland R&D Center
>> ---
>> ?arch/arm/mach-s5pc100/include/mach/map.h ? ? ? | ? ?7 ++++
>> ?arch/arm/mach-s5pv210/cpu.c ? ? ? ? ? ? ? ? ? ?| ? ?5 +++
>> ?arch/arm/mach-s5pv210/include/mach/map.h ? ? ? | ? ?8 ++++
>> ?arch/arm/plat-s5p/Kconfig ? ? ? ? ? ? ? ? ? ? ?| ? 16 ++++++++
>> ?arch/arm/plat-s5p/Makefile ? ? ? ? ? ? ? ? ? ? | ? ?3 ++
>> ?arch/arm/plat-s5p/dev-fimc0.c ? ? ? ? ? ? ? ? ?| ? 35
>> ++++++++++++++++++
>> ?arch/arm/plat-s5p/dev-fimc1.c ? ? ? ? ? ? ? ? ?| ? 35
>> ++++++++++++++++++
>> ?arch/arm/plat-s5p/dev-fimc2.c ? ? ? ? ? ? ? ? ?| ? 35
>> ++++++++++++++++++
>> ?arch/arm/plat-samsung/include/plat/fimc-core.h | ? 45
>> ++++++++++++++++++++++++
>> ?arch/arm/plat-samsung/include/plat/fimc.h ? ? ?| ? 22 +++++++++++
>> ?10 files changed, 211 insertions(+), 0 deletions(-)
>> ?create mode 100644 arch/arm/plat-s5p/dev-fimc0.c
>> ?create mode 100644 arch/arm/plat-s5p/dev-fimc1.c
>> ?create mode 100644 arch/arm/plat-s5p/dev-fimc2.c
>> ?create mode 100644 arch/arm/plat-samsung/include/plat/fimc-core.h
>> ?create mode 100644 arch/arm/plat-samsung/include/plat/fimc.h
>>
>> diff --git a/arch/arm/mach-s5pc100/include/mach/map.h b/arch/arm/mach-
>> s5pc100/include/mach/map.h
>> index c018697..3abe7f5 100644
>> --- a/arch/arm/mach-s5pc100/include/mach/map.h
>> +++ b/arch/arm/mach-s5pc100/include/mach/map.h
>> @@ -99,6 +99,10 @@
>>
>> ?#define S5PC100_PA_FB ? ? ? ? ? ? ? ?(0xEE000000)
>>
>> +#define S5PC100_PA_FIMC0 ? ? (0xEE200000)
>> +#define S5PC100_PA_FIMC1 ? ? (0xEE300000)
>> +#define S5PC100_PA_FIMC2 ? ? (0xEE400000)
>> +
>> ?#define S5PC100_PA_I2S0 ? ? ? ? ? ? ?(0xF2000000)
>> ?#define S5PC100_PA_I2S1 ? ? ? ? ? ? ?(0xF2100000)
>> ?#define S5PC100_PA_I2S2 ? ? ? ? ? ? ?(0xF2200000)
>> @@ -143,6 +147,9 @@
>> ?#define S3C_PA_ONENAND_BUF ? S5PC100_PA_ONENAND_BUF
>> ?#define S3C_SZ_ONENAND_BUF ? S5PC100_SZ_ONENAND_BUF
>> ?#define S3C_PA_RTC ? ? ? ? ? S5PC100_PA_RTC
>> +#define S5P_PA_FIMC0 ? ? ? ? S5PC100_PA_FIMC0
>> +#define S5P_PA_FIMC1 ? ? ? ? S5PC100_PA_FIMC1
>> +#define S5P_PA_FIMC2 ? ? ? ? S5PC100_PA_FIMC2
>>
>> ?#define SAMSUNG_PA_ADC ? ? ? ? ? ? ? S5PC100_PA_TSADC
>> ?#define SAMSUNG_PA_CFCON ? ? S5PC100_PA_CFCON
>> diff --git a/arch/arm/mach-s5pv210/cpu.c b/arch/arm/mach-s5pv210/cpu.c
>> index ea09c32..a7446d4 100644
>> --- a/arch/arm/mach-s5pv210/cpu.c
>> +++ b/arch/arm/mach-s5pv210/cpu.c
>> @@ -37,6 +37,7 @@
>> ?#include <plat/iic-core.h>
>> ?#include <plat/keypad-core.h>
>> ?#include <plat/sdhci.h>
>> +#include <plat/fimc-core.h>
>> ?#include <plat/reset.h>
>>
>> ?/* Initial IO mappings */
>> @@ -104,6 +105,10 @@ void __init s5pv210_map_io(void)
>>
>> ? ? ? /* Use s5pv210-keypad instead of samsung-keypad */
>> ? ? ? samsung_keypad_setname("s5pv210-keypad");
>> +
>> + ? ? s3c_fimc_setname(0, "s5pv210-fimc");
>> + ? ? s3c_fimc_setname(1, "s5pv210-fimc");
>> + ? ? s3c_fimc_setname(2, "s5pv210-fimc");
>> ?}
>>
>> ?void __init s5pv210_init_clocks(int xtal)
>> diff --git a/arch/arm/mach-s5pv210/include/mach/map.h b/arch/arm/mach-
>> s5pv210/include/mach/map.h
>> index 986b285..6a07e55 100644
>> --- a/arch/arm/mach-s5pv210/include/mach/map.h
>> +++ b/arch/arm/mach-s5pv210/include/mach/map.h
>> @@ -65,6 +65,10 @@
>>
>> ?#define S5PV210_PA_FB ? ? ? ? ? ? ? ?(0xF8000000)
>>
>> +#define S5PV210_PA_FIMC0 ? ? (0xFB200000)
>> +#define S5PV210_PA_FIMC1 ? ? (0xFB300000)
>> +#define S5PV210_PA_FIMC2 ? ? (0xFB400000)
>> +
>> ?#define S5PV210_PA_HSMMC(x) ?(0xEB000000 + ((x) * 0x100000))
>>
>> ?#define S5PV210_PA_VIC0 ? ? ? ? ? ? ?(0xF2000000)
>> @@ -114,4 +118,8 @@
>> ?#define SAMSUNG_PA_CFCON ? ? S5PV210_PA_CFCON
>> ?#define SAMSUNG_PA_KEYPAD ? ?S5PV210_PA_KEYPAD
>>
>> +#define S5P_PA_FIMC0 ? ? ? ? S5PV210_PA_FIMC0
>> +#define S5P_PA_FIMC1 ? ? ? ? S5PV210_PA_FIMC1
>> +#define S5P_PA_FIMC2 ? ? ? ? S5PV210_PA_FIMC2
>
> To use one style is better for reading, merge conflict handling and so on...
> The style means to add S5P_PA_XXX after S3C_PA_XXX with C100 case or to
> modify above C100 case like this.

Use the same conversion as previous one. are you okay?

#define S5PV210_PA_VIC0         (0xF2000000)
#define S5P_PA_VIC0             S5PV210_PA_VIC0

#define S5PV210_PA_VIC1         (0xF2100000)
#define S5P_PA_VIC1             S5PV210_PA_VIC1

#define S5PV210_PA_VIC2         (0xF2200000)
#define S5P_PA_VIC2             S5PV210_PA_VIC2

#define S5PV210_PA_VIC3         (0xF2300000)
#define S5P_PA_VIC3             S5PV210_PA_VIC3

#define S5PV210_PA_SDRAM        (0x30000000)
#define S5P_PA_SDRAM            S5PV210_PA_SDRAM

>
>> +
>> ?#endif /* __ASM_ARCH_MAP_H */
>> diff --git a/arch/arm/plat-s5p/Kconfig b/arch/arm/plat-s5p/Kconfig
>> index 907ac63..9c79106 100644
>> --- a/arch/arm/plat-s5p/Kconfig
>> +++ b/arch/arm/plat-s5p/Kconfig
>> @@ -5,6 +5,22 @@
>> ?#
>> ?# Licensed under GPLv2
>>
>> +config S5P_DEV_FIMC0
>> + ? ? bool
>> + ? ? help
>> + ? ? ? Compile in platform device definitions for FIMC controller 0
>> +
>> +config S5P_DEV_FIMC1
>> + ? ? bool
>> + ? ? help
>> + ? ? ? Compile in platform device definitions for FIMC controller 1
>> +
>> +config S5P_DEV_FIMC2
>> + ? ? bool
>> + ? ? help
>> + ? ? ? Compile in platform device definitions for FIMC controller 2
>> +
>> +
>
> 2 empty lines.
>
>> ?config PLAT_S5P
>> ? ? ? bool
>> ? ? ? depends on (ARCH_S5P6440 || ARCH_S5P6442 || ARCH_S5PC100 ||
>> ARCH_S5PV210 || ARCH_S5PV310)
>> diff --git a/arch/arm/plat-s5p/Makefile b/arch/arm/plat-s5p/Makefile
>> index 7e34194..a2d9905 100644
>> --- a/arch/arm/plat-s5p/Makefile
>> +++ b/arch/arm/plat-s5p/Makefile
>> @@ -19,3 +19,6 @@ obj-y ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? += clock.o
>> ?obj-y ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?+= irq.o
>> ?obj-$(CONFIG_S5P_EXT_INT) ? ?+= irq-eint.o
>>
>
> Please add '# devices' here...
It's not related with this patch.
>
>> +obj-$(CONFIG_S5P_DEV_FIMC0) ?+= dev-fimc0.o
>> +obj-$(CONFIG_S5P_DEV_FIMC1) ?+= dev-fimc1.o
>> +obj-$(CONFIG_S5P_DEV_FIMC2) ?+= dev-fimc2.o
>> diff --git a/arch/arm/plat-s5p/dev-fimc0.c b/arch/arm/plat-s5p/dev-fimc0.c
>> new file mode 100644
>> index 0000000..8849de4
>> --- /dev/null
>> +++ b/arch/arm/plat-s5p/dev-fimc0.c
>> @@ -0,0 +1,35 @@
>> +/* linux/arch/arm/plat-s5p/dev-fimc0.c
>> + *
>> + * Copyright (c) 2010 Samsung Electronics
>> + *
>> + * Base S5P FIMC0 resource and device definitions
>> + *
>> + * This program is free software; you can redistribute it and/or modify
>> + * it under the terms of the GNU General Public License version 2 as
>> + * published by the Free Software Foundation.
>> + */
>
> Being 1 empty line is better here.
>
>> +#include <linux/kernel.h>
>> +#include <linux/platform_device.h>
>> +#include <linux/interrupt.h>
>> +#include <linux/ioport.h>
>> +#include <mach/map.h>
>> +
>> +static struct resource s5p_fimc_resource[] = {
>
> Please change to s5p_fimc0_resource...it'd helpful to merging dev-fimcX
> files later...
>
>> + ? ? [0] = {
>> + ? ? ? ? ? ? .start ?= S5P_PA_FIMC0,
>> + ? ? ? ? ? ? .end ? ?= S5P_PA_FIMC0 + SZ_1M - 1,
>> + ? ? ? ? ? ? .flags ?= IORESOURCE_MEM,
>> + ? ? },
>> + ? ? [1] = {
>> + ? ? ? ? ? ? .start ?= IRQ_FIMC0,
>> + ? ? ? ? ? ? .end ? ?= IRQ_FIMC0,
>> + ? ? ? ? ? ? .flags ?= IORESOURCE_IRQ,
>> + ? ? },
>> +};
>> +
>> +struct platform_device s5p_device_fimc0 = {
>> + ? ? .name ? ? ? ? ? = "s5p-fimc",
>> + ? ? .id ? ? ? ? ? ? = 0,
>> + ? ? .num_resources ?= ARRAY_SIZE(s5p_fimc_resource),
>
> s5p_fimc0_resource...
>
>> + ? ? .resource ? ? ? = s5p_fimc_resource,
>
> s5p_fimc0_resource...
>
>> +};
>> diff --git a/arch/arm/plat-s5p/dev-fimc1.c b/arch/arm/plat-s5p/dev-fimc1.c
>> new file mode 100644
>> index 0000000..b1f8970
>> --- /dev/null
>> +++ b/arch/arm/plat-s5p/dev-fimc1.c
>> @@ -0,0 +1,35 @@
>> +/* linux/arch/arm/plat-s5p/dev-fimc1.c
>> + *
>> + * Copyright (c) 2010 Samsung Electronics
>> + *
>> + * Base S5P FIMC1 resource and device definitions
>> + *
>> + * This program is free software; you can redistribute it and/or modify
>> + * it under the terms of the GNU General Public License version 2 as
>> + * published by the Free Software Foundation.
>> + */
>> +#include <linux/kernel.h>
>> +#include <linux/platform_device.h>
>> +#include <linux/interrupt.h>
>> +#include <linux/ioport.h>
>> +#include <mach/map.h>
>> +
>> +static struct resource s5p_fimc_resource[] = {
>> + ? ? [0] = {
>> + ? ? ? ? ? ? .start ?= S5P_PA_FIMC1,
>> + ? ? ? ? ? ? .end ? ?= S5P_PA_FIMC1 + SZ_1M - 1,
>> + ? ? ? ? ? ? .flags ?= IORESOURCE_MEM,
>> + ? ? },
>> + ? ? [1] = {
>> + ? ? ? ? ? ? .start ?= IRQ_FIMC1,
>> + ? ? ? ? ? ? .end ? ?= IRQ_FIMC1,
>> + ? ? ? ? ? ? .flags ?= IORESOURCE_IRQ,
>> + ? ? },
>> +};
>> +
>> +struct platform_device s5p_device_fimc1 = {
>> + ? ? .name ? ? ? ? ? = "s5p-fimc",
>> + ? ? .id ? ? ? ? ? ? = 1,
>> + ? ? .num_resources ?= ARRAY_SIZE(s5p_fimc_resource),
>> + ? ? .resource ? ? ? = s5p_fimc_resource,
>> +};
>> diff --git a/arch/arm/plat-s5p/dev-fimc2.c b/arch/arm/plat-s5p/dev-fimc2.c
>> new file mode 100644
>> index 0000000..20df59d
>> --- /dev/null
>> +++ b/arch/arm/plat-s5p/dev-fimc2.c
>> @@ -0,0 +1,35 @@
>> +/* linux/arch/arm/plat-s5p/dev-fimc2.c
>> + *
>> + * Copyright (c) 2010 Samsung Electronics
>> + *
>> + * Base S5P FIMC2 resource and device definitions
>> + *
>> + * This program is free software; you can redistribute it and/or modify
>> + * it under the terms of the GNU General Public License version 2 as
>> + * published by the Free Software Foundation.
>> + */
>> +#include <linux/kernel.h>
>> +#include <linux/platform_device.h>
>> +#include <linux/interrupt.h>
>> +#include <linux/ioport.h>
>> +#include <mach/map.h>
>> +
>> +static struct resource s5p_fimc_resource[] = {
>> + ? ? [0] = {
>> + ? ? ? ? ? ? .start ?= S5P_PA_FIMC2,
>> + ? ? ? ? ? ? .end ? ?= S5P_PA_FIMC2 + SZ_1M - 1,
>> + ? ? ? ? ? ? .flags ?= IORESOURCE_MEM,
>> + ? ? },
>> + ? ? [1] = {
>> + ? ? ? ? ? ? .start ?= IRQ_FIMC2,
>> + ? ? ? ? ? ? .end ? ?= IRQ_FIMC2,
>> + ? ? ? ? ? ? .flags ?= IORESOURCE_IRQ,
>> + ? ? },
>> +};
>> +
>> +struct platform_device s5p_device_fimc2 = {
>> + ? ? .name ? ? ? ? ? = "s5p-fimc",
>> + ? ? .id ? ? ? ? ? ? = 2,
>> + ? ? .num_resources ?= ARRAY_SIZE(s5p_fimc_resource),
>> + ? ? .resource ? ? ? = s5p_fimc_resource,
>> +};
>
> This is just for your information...
> I'm working on handling plat device in case of various # of each AP FIMC
> with CONFIG_NR_FIMC...
> So in this case, all of plat data for FIMC will be merged into
> 'plat-s5p/dev-fimc.c' or 'devs.c' later.
> ...but I'm not sure some stuff...anyway...

If you have these plan, then there's no reason to separate the
dev-fimcX as this patch, Just one file the dev-fimc from now.
Other devices are same rules.

>
>> diff --git a/arch/arm/plat-samsung/include/plat/fimc-core.h
> b/arch/arm/plat-
>> samsung/include/plat/fimc-core.h
>> new file mode 100644
>> index 0000000..a884ede
>> --- /dev/null
>> +++ b/arch/arm/plat-samsung/include/plat/fimc-core.h
>> @@ -0,0 +1,45 @@
>> +/*
>> + * arch/arm/plat-samsung/include/plat/fimc-core.h
>> + *
>> + * Copyright 2010 Samsung Electronics Co., Ltd.
>> + * ? Sylwester Nawrocki <s.nawrocki@samsung.com>
>> + *
>> + * Samsung camera interface driver core functions
>> + *
>> + * This program is free software; you can redistribute it and/or modify
>> + * it under the terms of the GNU General Public License version 2 as
>> + * published by the Free Software Foundation.
>> + */
>> +#ifndef __ASM_PLAT_FIMC_CORE_H
>> +#define __ASM_PLAT_FIMC_CORE_H __FILE__
>> +
>> +/*
>> + * These functions are only for use with the core support code, such as
>> + * the CPU-specific initialization code.
>> + */
>> +
>> +#include <plat/fimc.h>
>> +
>> +/* Re-define device name to differentiate the subsystem in various SoCs.
> */
>> +static inline void s3c_fimc_setname(int id, char *name)
>> +{
>> + ? ? switch (id) {
>> +#ifdef CONFIG_S5P_DEV_FIMC0
>> + ? ? case 0:
>> + ? ? ? ? ? ? s5p_device_fimc0.name = name;
>> + ? ? ? ? ? ? break;
>> +#endif
>> +#ifdef CONFIG_S5P_DEV_FIMC1
>> + ? ? case 1:
>> + ? ? ? ? ? ? s5p_device_fimc1.name = name;
>> + ? ? ? ? ? ? break;
>> +#endif
>> +#ifdef CONFIG_S5P_DEV_FIMC2
>> + ? ? case 2:
>> + ? ? ? ? ? ? s5p_device_fimc2.name = name;
>> + ? ? ? ? ? ? break;
>> +#endif
>> + ? ? }
>> +}
>> +
>> +#endif /* __ASM_PLAT_FIMC_CORE_H */
>> diff --git a/arch/arm/plat-samsung/include/plat/fimc.h b/arch/arm/plat-
>> samsung/include/plat/fimc.h
>> new file mode 100644
>> index 0000000..fda2040
>> --- /dev/null
>> +++ b/arch/arm/plat-samsung/include/plat/fimc.h
>> @@ -0,0 +1,22 @@
>> +/* linux/arch/arm/plat-samsung/include/plat/fimc.h
>> + *
>> + * Platform header file for S3C/S5P FIMC driver
>> + *
>> + * Copyright (c) 2010 Samsung Electronics
>> + *
>> + * Sylwester Nawrocki, <s.nawrocki@samsung.com>
>> + *
>> + * This program is free software; you can redistribute it and/or modify
>> + * it under the terms of the GNU General Public License version 2 as
>> + * published by the Free Software Foundation.
>> + */
>> +#ifndef FIMC_H_
>> +#define FIMC_H_
>> +
>> +#include <linux/platform_device.h>
>> +
>> +extern struct platform_device s5p_device_fimc0;
>> +extern struct platform_device s5p_device_fimc1;
>> +extern struct platform_device s5p_device_fimc2;
>
> Should being in 'plat-samsung/include/plat/devs.h'.
>
>> +
>> +#endif /* FIMC_H_ */
>> --
>
> Marek, could you please address as soon as possible?
>
> Thanks.
>
> Best regards,
> Kgene.
> --
> Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
> SW Solution Development Team, Samsung Electronics Co., Ltd.
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
> the body of a message to majordomo at vger.kernel.org
> More majordomo info at ?http://vger.kernel.org/majordomo-info.html
>

[PATCH v4 3/8] ARM: Samsung: Add platform definitions and helpers for FIMC driver

[Kukjin Kim]

Kyungmin Park wrote:
> 
> On Tue, Aug 3, 2010 at 8:58 AM, Kukjin Kim <kgene.kim@samsung.com> wrote:
> > Marek Szyprowski wrote:
> >>
> >> From: Sylwester Nawrocki <s.nawrocki@samsung.com>
> >>
> >> FIMC (CAMIF) device is a camera interface embedded in S3C/S5P Samsung
> >> SOC series. It supports ITU-R BT.601/656 and MIPI-CSI2 standards,
> >> memory to memory operations, color conversion, resizing and rotation.
> >>
> >> Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
> >> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
> >> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
> >> ---
> >>
> >> This is patch is a v3 version rebased onto latest kgene/for-next tree.
> >> New entries in map.h files has been sorted by the physicall address.
> >>
> > Thanks for your addressing.
> >
> >> I'm resending this patch on behalf of Sylwester who is on holidays this
> >> week.
> >>
> >> Best regards
> >> --
> >> Marek Szyprowski
> >> Samsung Poland R&D Center
> >> ---
> >> ?arch/arm/mach-s5pc100/include/mach/map.h ? ? ? | ? ?7 ++++
> >> ?arch/arm/mach-s5pv210/cpu.c ? ? ? ? ? ? ? ? ? ?| ? ?5 +++
> >> ?arch/arm/mach-s5pv210/include/mach/map.h ? ? ? | ? ?8 ++++
> >> ?arch/arm/plat-s5p/Kconfig ? ? ? ? ? ? ? ? ? ? ?| ? 16 ++++++++
> >> ?arch/arm/plat-s5p/Makefile ? ? ? ? ? ? ? ? ? ? | ? ?3 ++
> >> ?arch/arm/plat-s5p/dev-fimc0.c ? ? ? ? ? ? ? ? ?| ? 35
> >> ++++++++++++++++++
> >> ?arch/arm/plat-s5p/dev-fimc1.c ? ? ? ? ? ? ? ? ?| ? 35
> >> ++++++++++++++++++
> >> ?arch/arm/plat-s5p/dev-fimc2.c ? ? ? ? ? ? ? ? ?| ? 35
> >> ++++++++++++++++++
> >> ?arch/arm/plat-samsung/include/plat/fimc-core.h | ? 45
> >> ++++++++++++++++++++++++
> >> ?arch/arm/plat-samsung/include/plat/fimc.h ? ? ?| ? 22 +++++++++++
> >> ?10 files changed, 211 insertions(+), 0 deletions(-)
> >> ?create mode 100644 arch/arm/plat-s5p/dev-fimc0.c
> >> ?create mode 100644 arch/arm/plat-s5p/dev-fimc1.c
> >> ?create mode 100644 arch/arm/plat-s5p/dev-fimc2.c
> >> ?create mode 100644 arch/arm/plat-samsung/include/plat/fimc-core.h
> >> ?create mode 100644 arch/arm/plat-samsung/include/plat/fimc.h
> >>
> >> diff --git a/arch/arm/mach-s5pc100/include/mach/map.h b/arch/arm/mach-
> >> s5pc100/include/mach/map.h
> >> index c018697..3abe7f5 100644
> >> --- a/arch/arm/mach-s5pc100/include/mach/map.h
> >> +++ b/arch/arm/mach-s5pc100/include/mach/map.h
> >> @@ -99,6 +99,10 @@
> >>
> >> ?#define S5PC100_PA_FB ? ? ? ? ? ? ? ?(0xEE000000)
> >>
> >> +#define S5PC100_PA_FIMC0 ? ? (0xEE200000)
> >> +#define S5PC100_PA_FIMC1 ? ? (0xEE300000)
> >> +#define S5PC100_PA_FIMC2 ? ? (0xEE400000)
> >> +
> >> ?#define S5PC100_PA_I2S0 ? ? ? ? ? ? ?(0xF2000000)
> >> ?#define S5PC100_PA_I2S1 ? ? ? ? ? ? ?(0xF2100000)
> >> ?#define S5PC100_PA_I2S2 ? ? ? ? ? ? ?(0xF2200000)
> >> @@ -143,6 +147,9 @@
> >> ?#define S3C_PA_ONENAND_BUF ? S5PC100_PA_ONENAND_BUF
> >> ?#define S3C_SZ_ONENAND_BUF ? S5PC100_SZ_ONENAND_BUF
> >> ?#define S3C_PA_RTC ? ? ? ? ? S5PC100_PA_RTC
> >> +#define S5P_PA_FIMC0 ? ? ? ? S5PC100_PA_FIMC0
> >> +#define S5P_PA_FIMC1 ? ? ? ? S5PC100_PA_FIMC1
> >> +#define S5P_PA_FIMC2 ? ? ? ? S5PC100_PA_FIMC2
> >>
> >> ?#define SAMSUNG_PA_ADC ? ? ? ? ? ? ? S5PC100_PA_TSADC
> >> ?#define SAMSUNG_PA_CFCON ? ? S5PC100_PA_CFCON
> >> diff --git a/arch/arm/mach-s5pv210/cpu.c b/arch/arm/mach-s5pv210/cpu.c
> >> index ea09c32..a7446d4 100644
> >> --- a/arch/arm/mach-s5pv210/cpu.c
> >> +++ b/arch/arm/mach-s5pv210/cpu.c
> >> @@ -37,6 +37,7 @@
> >> ?#include <plat/iic-core.h>
> >> ?#include <plat/keypad-core.h>
> >> ?#include <plat/sdhci.h>
> >> +#include <plat/fimc-core.h>
> >> ?#include <plat/reset.h>
> >>
> >> ?/* Initial IO mappings */
> >> @@ -104,6 +105,10 @@ void __init s5pv210_map_io(void)
> >>
> >> ? ? ? /* Use s5pv210-keypad instead of samsung-keypad */
> >> ? ? ? samsung_keypad_setname("s5pv210-keypad");
> >> +
> >> + ? ? s3c_fimc_setname(0, "s5pv210-fimc");
> >> + ? ? s3c_fimc_setname(1, "s5pv210-fimc");
> >> + ? ? s3c_fimc_setname(2, "s5pv210-fimc");
> >> ?}
> >>
> >> ?void __init s5pv210_init_clocks(int xtal)
> >> diff --git a/arch/arm/mach-s5pv210/include/mach/map.h b/arch/arm/mach-
> >> s5pv210/include/mach/map.h
> >> index 986b285..6a07e55 100644
> >> --- a/arch/arm/mach-s5pv210/include/mach/map.h
> >> +++ b/arch/arm/mach-s5pv210/include/mach/map.h
> >> @@ -65,6 +65,10 @@
> >>
> >> ?#define S5PV210_PA_FB ? ? ? ? ? ? ? ?(0xF8000000)
> >>
> >> +#define S5PV210_PA_FIMC0 ? ? (0xFB200000)
> >> +#define S5PV210_PA_FIMC1 ? ? (0xFB300000)
> >> +#define S5PV210_PA_FIMC2 ? ? (0xFB400000)
> >> +
> >> ?#define S5PV210_PA_HSMMC(x) ?(0xEB000000 + ((x) * 0x100000))
> >>
> >> ?#define S5PV210_PA_VIC0 ? ? ? ? ? ? ?(0xF2000000)
> >> @@ -114,4 +118,8 @@
> >> ?#define SAMSUNG_PA_CFCON ? ? S5PV210_PA_CFCON
> >> ?#define SAMSUNG_PA_KEYPAD ? ?S5PV210_PA_KEYPAD
> >>
> >> +#define S5P_PA_FIMC0 ? ? ? ? S5PV210_PA_FIMC0
> >> +#define S5P_PA_FIMC1 ? ? ? ? S5PV210_PA_FIMC1
> >> +#define S5P_PA_FIMC2 ? ? ? ? S5PV210_PA_FIMC2
> >
> > To use one style is better for reading, merge conflict handling and so
on...
> > The style means to add S5P_PA_XXX after S3C_PA_XXX with C100 case or to
> > modify above C100 case like this.
> 
> Use the same conversion as previous one. are you okay?
> 
> #define S5PV210_PA_VIC0         (0xF2000000)
> #define S5P_PA_VIC0             S5PV210_PA_VIC0
> 
> #define S5PV210_PA_VIC1         (0xF2100000)
> #define S5P_PA_VIC1             S5PV210_PA_VIC1
> 
> #define S5PV210_PA_VIC2         (0xF2200000)
> #define S5P_PA_VIC2             S5PV210_PA_VIC2
> 
> #define S5PV210_PA_VIC3         (0xF2300000)
> #define S5P_PA_VIC3             S5PV210_PA_VIC3
> 
> #define S5PV210_PA_SDRAM        (0x30000000)
> #define S5P_PA_SDRAM            S5PV210_PA_SDRAM
> 
No.

Did you see above C100?

--- C100

 #define S3C_PA_ONENAND_BUF		S5PC100_PA_ONENAND_BUF
 #define S3C_SZ_ONENAND_BUF		S5PC100_SZ_ONENAND_BUF
 #define S3C_PA_RTC		S5PC100_PA_RTC
+#define S5P_PA_FIMC0		S5PC100_PA_FIMC0
+#define S5P_PA_FIMC1		S5PC100_PA_FIMC1
+#define S5P_PA_FIMC2		S5PC100_PA_FIMC2

 #define SAMSUNG_PA_ADC               S5PC100_PA_TSADC
 #define SAMSUNG_PA_CFCON     S5PC100_PA_CFCON

--- V210

 #define SAMSUNG_PA_CFCON		S5PV210_PA_CFCON
 #define SAMSUNG_PA_KEYPAD		S5PV210_PA_KEYPAD

+#define S5P_PA_FIMC0		S5PV210_PA_FIMC0
+#define S5P_PA_FIMC1		S5PV210_PA_FIMC1
+#define S5P_PA_FIMC2		S5PV210_PA_FIMC2

I mean it's just ordering.

> >
> >> +
> >> ?#endif /* __ASM_ARCH_MAP_H */
> >> diff --git a/arch/arm/plat-s5p/Kconfig b/arch/arm/plat-s5p/Kconfig
> >> index 907ac63..9c79106 100644
> >> --- a/arch/arm/plat-s5p/Kconfig
> >> +++ b/arch/arm/plat-s5p/Kconfig
> >> @@ -5,6 +5,22 @@
> >> ?#
> >> ?# Licensed under GPLv2
> >>
> >> +config S5P_DEV_FIMC0
> >> + ? ? bool
> >> + ? ? help
> >> + ? ? ? Compile in platform device definitions for FIMC controller 0
> >> +
> >> +config S5P_DEV_FIMC1
> >> + ? ? bool
> >> + ? ? help
> >> + ? ? ? Compile in platform device definitions for FIMC controller 1
> >> +
> >> +config S5P_DEV_FIMC2
> >> + ? ? bool
> >> + ? ? help
> >> + ? ? ? Compile in platform device definitions for FIMC controller 2
> >> +
> >> +
> >
> > 2 empty lines.
> >
> >> ?config PLAT_S5P
> >> ? ? ? bool
> >> ? ? ? depends on (ARCH_S5P6440 || ARCH_S5P6442 || ARCH_S5PC100 ||
> >> ARCH_S5PV210 || ARCH_S5PV310)
> >> diff --git a/arch/arm/plat-s5p/Makefile b/arch/arm/plat-s5p/Makefile
> >> index 7e34194..a2d9905 100644
> >> --- a/arch/arm/plat-s5p/Makefile
> >> +++ b/arch/arm/plat-s5p/Makefile
> >> @@ -19,3 +19,6 @@ obj-y ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? += clock.o
> >> ?obj-y ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?+= irq.o
> >> ?obj-$(CONFIG_S5P_EXT_INT) ? ?+= irq-eint.o
> >>
> >
> > Please add '# devices' here...
> It's not related with this patch.
> >
> >> +obj-$(CONFIG_S5P_DEV_FIMC0) ?+= dev-fimc0.o
> >> +obj-$(CONFIG_S5P_DEV_FIMC1) ?+= dev-fimc1.o
> >> +obj-$(CONFIG_S5P_DEV_FIMC2) ?+= dev-fimc2.o
> >> diff --git a/arch/arm/plat-s5p/dev-fimc0.c
b/arch/arm/plat-s5p/dev-fimc0.c
> >> new file mode 100644
> >> index 0000000..8849de4
> >> --- /dev/null
> >> +++ b/arch/arm/plat-s5p/dev-fimc0.c
> >> @@ -0,0 +1,35 @@
> >> +/* linux/arch/arm/plat-s5p/dev-fimc0.c
> >> + *
> >> + * Copyright (c) 2010 Samsung Electronics
> >> + *
> >> + * Base S5P FIMC0 resource and device definitions
> >> + *
> >> + * This program is free software; you can redistribute it and/or
modify
> >> + * it under the terms of the GNU General Public License version 2 as
> >> + * published by the Free Software Foundation.
> >> + */
> >
> > Being 1 empty line is better here.
> >
> >> +#include <linux/kernel.h>
> >> +#include <linux/platform_device.h>
> >> +#include <linux/interrupt.h>
> >> +#include <linux/ioport.h>
> >> +#include <mach/map.h>
> >> +
> >> +static struct resource s5p_fimc_resource[] = {
> >
> > Please change to s5p_fimc0_resource...it'd helpful to merging dev-fimcX
> > files later...
> >
> >> + ? ? [0] = {
> >> + ? ? ? ? ? ? .start ?= S5P_PA_FIMC0,
> >> + ? ? ? ? ? ? .end ? ?= S5P_PA_FIMC0 + SZ_1M - 1,
> >> + ? ? ? ? ? ? .flags ?= IORESOURCE_MEM,
> >> + ? ? },
> >> + ? ? [1] = {
> >> + ? ? ? ? ? ? .start ?= IRQ_FIMC0,
> >> + ? ? ? ? ? ? .end ? ?= IRQ_FIMC0,
> >> + ? ? ? ? ? ? .flags ?= IORESOURCE_IRQ,
> >> + ? ? },
> >> +};
> >> +
> >> +struct platform_device s5p_device_fimc0 = {
> >> + ? ? .name ? ? ? ? ? = "s5p-fimc",
> >> + ? ? .id ? ? ? ? ? ? = 0,
> >> + ? ? .num_resources ?= ARRAY_SIZE(s5p_fimc_resource),
> >
> > s5p_fimc0_resource...
> >
> >> + ? ? .resource ? ? ? = s5p_fimc_resource,
> >
> > s5p_fimc0_resource...
> >
> >> +};
> >> diff --git a/arch/arm/plat-s5p/dev-fimc1.c
b/arch/arm/plat-s5p/dev-fimc1.c
> >> new file mode 100644
> >> index 0000000..b1f8970
> >> --- /dev/null
> >> +++ b/arch/arm/plat-s5p/dev-fimc1.c
> >> @@ -0,0 +1,35 @@
> >> +/* linux/arch/arm/plat-s5p/dev-fimc1.c
> >> + *
> >> + * Copyright (c) 2010 Samsung Electronics
> >> + *
> >> + * Base S5P FIMC1 resource and device definitions
> >> + *
> >> + * This program is free software; you can redistribute it and/or
modify
> >> + * it under the terms of the GNU General Public License version 2 as
> >> + * published by the Free Software Foundation.
> >> + */
> >> +#include <linux/kernel.h>
> >> +#include <linux/platform_device.h>
> >> +#include <linux/interrupt.h>
> >> +#include <linux/ioport.h>
> >> +#include <mach/map.h>
> >> +
> >> +static struct resource s5p_fimc_resource[] = {
> >> + ? ? [0] = {
> >> + ? ? ? ? ? ? .start ?= S5P_PA_FIMC1,
> >> + ? ? ? ? ? ? .end ? ?= S5P_PA_FIMC1 + SZ_1M - 1,
> >> + ? ? ? ? ? ? .flags ?= IORESOURCE_MEM,
> >> + ? ? },
> >> + ? ? [1] = {
> >> + ? ? ? ? ? ? .start ?= IRQ_FIMC1,
> >> + ? ? ? ? ? ? .end ? ?= IRQ_FIMC1,
> >> + ? ? ? ? ? ? .flags ?= IORESOURCE_IRQ,
> >> + ? ? },
> >> +};
> >> +
> >> +struct platform_device s5p_device_fimc1 = {
> >> + ? ? .name ? ? ? ? ? = "s5p-fimc",
> >> + ? ? .id ? ? ? ? ? ? = 1,
> >> + ? ? .num_resources ?= ARRAY_SIZE(s5p_fimc_resource),
> >> + ? ? .resource ? ? ? = s5p_fimc_resource,
> >> +};
> >> diff --git a/arch/arm/plat-s5p/dev-fimc2.c
b/arch/arm/plat-s5p/dev-fimc2.c
> >> new file mode 100644
> >> index 0000000..20df59d
> >> --- /dev/null
> >> +++ b/arch/arm/plat-s5p/dev-fimc2.c
> >> @@ -0,0 +1,35 @@
> >> +/* linux/arch/arm/plat-s5p/dev-fimc2.c
> >> + *
> >> + * Copyright (c) 2010 Samsung Electronics
> >> + *
> >> + * Base S5P FIMC2 resource and device definitions
> >> + *
> >> + * This program is free software; you can redistribute it and/or
modify
> >> + * it under the terms of the GNU General Public License version 2 as
> >> + * published by the Free Software Foundation.
> >> + */
> >> +#include <linux/kernel.h>
> >> +#include <linux/platform_device.h>
> >> +#include <linux/interrupt.h>
> >> +#include <linux/ioport.h>
> >> +#include <mach/map.h>
> >> +
> >> +static struct resource s5p_fimc_resource[] = {
> >> + ? ? [0] = {
> >> + ? ? ? ? ? ? .start ?= S5P_PA_FIMC2,
> >> + ? ? ? ? ? ? .end ? ?= S5P_PA_FIMC2 + SZ_1M - 1,
> >> + ? ? ? ? ? ? .flags ?= IORESOURCE_MEM,
> >> + ? ? },
> >> + ? ? [1] = {
> >> + ? ? ? ? ? ? .start ?= IRQ_FIMC2,
> >> + ? ? ? ? ? ? .end ? ?= IRQ_FIMC2,
> >> + ? ? ? ? ? ? .flags ?= IORESOURCE_IRQ,
> >> + ? ? },
> >> +};
> >> +
> >> +struct platform_device s5p_device_fimc2 = {
> >> + ? ? .name ? ? ? ? ? = "s5p-fimc",
> >> + ? ? .id ? ? ? ? ? ? = 2,
> >> + ? ? .num_resources ?= ARRAY_SIZE(s5p_fimc_resource),
> >> + ? ? .resource ? ? ? = s5p_fimc_resource,
> >> +};
> >
> > This is just for your information...
> > I'm working on handling plat device in case of various # of each AP FIMC
> > with CONFIG_NR_FIMC...
> > So in this case, all of plat data for FIMC will be merged into
> > 'plat-s5p/dev-fimc.c' or 'devs.c' later.
> > ...but I'm not sure some stuff...anyway...
> 
> If you have these plan, then there's no reason to separate the
> dev-fimcX as this patch, Just one file the dev-fimc from now.
> Other devices are same rules.
> 
If you want now, just 'dev-fimc.c' is ok...but in that case, need to add
'#ifdef CONFIG_S5P_DEV_FIMCX' in there..and 'OR' in Makefile for dev-fimc.o

> >
> >> diff --git a/arch/arm/plat-samsung/include/plat/fimc-core.h
> > b/arch/arm/plat-
> >> samsung/include/plat/fimc-core.h
> >> new file mode 100644
> >> index 0000000..a884ede
> >> --- /dev/null
> >> +++ b/arch/arm/plat-samsung/include/plat/fimc-core.h
> >> @@ -0,0 +1,45 @@
> >> +/*
> >> + * arch/arm/plat-samsung/include/plat/fimc-core.h
> >> + *
> >> + * Copyright 2010 Samsung Electronics Co., Ltd.
> >> + * ? Sylwester Nawrocki <s.nawrocki@samsung.com>
> >> + *
> >> + * Samsung camera interface driver core functions
> >> + *
> >> + * This program is free software; you can redistribute it and/or
modify
> >> + * it under the terms of the GNU General Public License version 2 as
> >> + * published by the Free Software Foundation.
> >> + */
> >> +#ifndef __ASM_PLAT_FIMC_CORE_H
> >> +#define __ASM_PLAT_FIMC_CORE_H __FILE__
> >> +
> >> +/*
> >> + * These functions are only for use with the core support code, such
as
> >> + * the CPU-specific initialization code.
> >> + */
> >> +
> >> +#include <plat/fimc.h>
> >> +
> >> +/* Re-define device name to differentiate the subsystem in various
SoCs.
> > */
> >> +static inline void s3c_fimc_setname(int id, char *name)
> >> +{
> >> + ? ? switch (id) {
> >> +#ifdef CONFIG_S5P_DEV_FIMC0
> >> + ? ? case 0:
> >> + ? ? ? ? ? ? s5p_device_fimc0.name = name;
> >> + ? ? ? ? ? ? break;
> >> +#endif
> >> +#ifdef CONFIG_S5P_DEV_FIMC1
> >> + ? ? case 1:
> >> + ? ? ? ? ? ? s5p_device_fimc1.name = name;
> >> + ? ? ? ? ? ? break;
> >> +#endif
> >> +#ifdef CONFIG_S5P_DEV_FIMC2
> >> + ? ? case 2:
> >> + ? ? ? ? ? ? s5p_device_fimc2.name = name;
> >> + ? ? ? ? ? ? break;
> >> +#endif
> >> + ? ? }
> >> +}
> >> +
> >> +#endif /* __ASM_PLAT_FIMC_CORE_H */
> >> diff --git a/arch/arm/plat-samsung/include/plat/fimc.h b/arch/arm/plat-
> >> samsung/include/plat/fimc.h
> >> new file mode 100644
> >> index 0000000..fda2040
> >> --- /dev/null
> >> +++ b/arch/arm/plat-samsung/include/plat/fimc.h
> >> @@ -0,0 +1,22 @@
> >> +/* linux/arch/arm/plat-samsung/include/plat/fimc.h
> >> + *
> >> + * Platform header file for S3C/S5P FIMC driver
> >> + *
> >> + * Copyright (c) 2010 Samsung Electronics
> >> + *
> >> + * Sylwester Nawrocki, <s.nawrocki@samsung.com>
> >> + *
> >> + * This program is free software; you can redistribute it and/or
modify
> >> + * it under the terms of the GNU General Public License version 2 as
> >> + * published by the Free Software Foundation.
> >> + */
> >> +#ifndef FIMC_H_
> >> +#define FIMC_H_
> >> +
> >> +#include <linux/platform_device.h>
> >> +
> >> +extern struct platform_device s5p_device_fimc0;
> >> +extern struct platform_device s5p_device_fimc1;
> >> +extern struct platform_device s5p_device_fimc2;
> >
> > Should being in 'plat-samsung/include/plat/devs.h'.
> >
> >> +
> >> +#endif /* FIMC_H_ */
> >> --
> >
> > Marek, could you please address as soon as possible?
> >


Thanks.

Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.

[PATCH v4 3/8] ARM: Samsung: Add platform definitions and helpers for FIMC driver

[Kyungmin Park]

On Tue, Aug 3, 2010 at 9:46 AM, Kukjin Kim <kgene.kim@samsung.com> wrote:
> Kyungmin Park wrote:
>>
>> On Tue, Aug 3, 2010 at 8:58 AM, Kukjin Kim <kgene.kim@samsung.com> wrote:
>> > Marek Szyprowski wrote:
>> >>
>> >> From: Sylwester Nawrocki <s.nawrocki@samsung.com>
>> >>
>> >> FIMC (CAMIF) device is a camera interface embedded in S3C/S5P Samsung
>> >> SOC series. It supports ITU-R BT.601/656 and MIPI-CSI2 standards,
>> >> memory to memory operations, color conversion, resizing and rotation.
>> >>
>> >> Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
>> >> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
>> >> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
>> >> ---
>> >>
>> >> This is patch is a v3 version rebased onto latest kgene/for-next tree.
>> >> New entries in map.h files has been sorted by the physicall address.
>> >>
>> > Thanks for your addressing.
>> >
>> >> I'm resending this patch on behalf of Sylwester who is on holidays this
>> >> week.
>> >>
>> >> Best regards
>> >> --
>> >> Marek Szyprowski
>> >> Samsung Poland R&D Center
>> >> ---
>> >> ?arch/arm/mach-s5pc100/include/mach/map.h ? ? ? | ? ?7 ++++
>> >> ?arch/arm/mach-s5pv210/cpu.c ? ? ? ? ? ? ? ? ? ?| ? ?5 +++
>> >> ?arch/arm/mach-s5pv210/include/mach/map.h ? ? ? | ? ?8 ++++
>> >> ?arch/arm/plat-s5p/Kconfig ? ? ? ? ? ? ? ? ? ? ?| ? 16 ++++++++
>> >> ?arch/arm/plat-s5p/Makefile ? ? ? ? ? ? ? ? ? ? | ? ?3 ++
>> >> ?arch/arm/plat-s5p/dev-fimc0.c ? ? ? ? ? ? ? ? ?| ? 35
>> >> ++++++++++++++++++
>> >> ?arch/arm/plat-s5p/dev-fimc1.c ? ? ? ? ? ? ? ? ?| ? 35
>> >> ++++++++++++++++++
>> >> ?arch/arm/plat-s5p/dev-fimc2.c ? ? ? ? ? ? ? ? ?| ? 35
>> >> ++++++++++++++++++
>> >> ?arch/arm/plat-samsung/include/plat/fimc-core.h | ? 45
>> >> ++++++++++++++++++++++++
>> >> ?arch/arm/plat-samsung/include/plat/fimc.h ? ? ?| ? 22 +++++++++++
>> >> ?10 files changed, 211 insertions(+), 0 deletions(-)
>> >> ?create mode 100644 arch/arm/plat-s5p/dev-fimc0.c
>> >> ?create mode 100644 arch/arm/plat-s5p/dev-fimc1.c
>> >> ?create mode 100644 arch/arm/plat-s5p/dev-fimc2.c
>> >> ?create mode 100644 arch/arm/plat-samsung/include/plat/fimc-core.h
>> >> ?create mode 100644 arch/arm/plat-samsung/include/plat/fimc.h
>> >>
>> >> diff --git a/arch/arm/mach-s5pc100/include/mach/map.h b/arch/arm/mach-
>> >> s5pc100/include/mach/map.h
>> >> index c018697..3abe7f5 100644
>> >> --- a/arch/arm/mach-s5pc100/include/mach/map.h
>> >> +++ b/arch/arm/mach-s5pc100/include/mach/map.h
>> >> @@ -99,6 +99,10 @@
>> >>
>> >> ?#define S5PC100_PA_FB ? ? ? ? ? ? ? ?(0xEE000000)
>> >>
>> >> +#define S5PC100_PA_FIMC0 ? ? (0xEE200000)
>> >> +#define S5PC100_PA_FIMC1 ? ? (0xEE300000)
>> >> +#define S5PC100_PA_FIMC2 ? ? (0xEE400000)
>> >> +
>> >> ?#define S5PC100_PA_I2S0 ? ? ? ? ? ? ?(0xF2000000)
>> >> ?#define S5PC100_PA_I2S1 ? ? ? ? ? ? ?(0xF2100000)
>> >> ?#define S5PC100_PA_I2S2 ? ? ? ? ? ? ?(0xF2200000)
>> >> @@ -143,6 +147,9 @@
>> >> ?#define S3C_PA_ONENAND_BUF ? S5PC100_PA_ONENAND_BUF
>> >> ?#define S3C_SZ_ONENAND_BUF ? S5PC100_SZ_ONENAND_BUF
>> >> ?#define S3C_PA_RTC ? ? ? ? ? S5PC100_PA_RTC
>> >> +#define S5P_PA_FIMC0 ? ? ? ? S5PC100_PA_FIMC0
>> >> +#define S5P_PA_FIMC1 ? ? ? ? S5PC100_PA_FIMC1
>> >> +#define S5P_PA_FIMC2 ? ? ? ? S5PC100_PA_FIMC2
>> >>
>> >> ?#define SAMSUNG_PA_ADC ? ? ? ? ? ? ? S5PC100_PA_TSADC
>> >> ?#define SAMSUNG_PA_CFCON ? ? S5PC100_PA_CFCON
>> >> diff --git a/arch/arm/mach-s5pv210/cpu.c b/arch/arm/mach-s5pv210/cpu.c
>> >> index ea09c32..a7446d4 100644
>> >> --- a/arch/arm/mach-s5pv210/cpu.c
>> >> +++ b/arch/arm/mach-s5pv210/cpu.c
>> >> @@ -37,6 +37,7 @@
>> >> ?#include <plat/iic-core.h>
>> >> ?#include <plat/keypad-core.h>
>> >> ?#include <plat/sdhci.h>
>> >> +#include <plat/fimc-core.h>
>> >> ?#include <plat/reset.h>
>> >>
>> >> ?/* Initial IO mappings */
>> >> @@ -104,6 +105,10 @@ void __init s5pv210_map_io(void)
>> >>
>> >> ? ? ? /* Use s5pv210-keypad instead of samsung-keypad */
>> >> ? ? ? samsung_keypad_setname("s5pv210-keypad");
>> >> +
>> >> + ? ? s3c_fimc_setname(0, "s5pv210-fimc");
>> >> + ? ? s3c_fimc_setname(1, "s5pv210-fimc");
>> >> + ? ? s3c_fimc_setname(2, "s5pv210-fimc");
>> >> ?}
>> >>
>> >> ?void __init s5pv210_init_clocks(int xtal)
>> >> diff --git a/arch/arm/mach-s5pv210/include/mach/map.h b/arch/arm/mach-
>> >> s5pv210/include/mach/map.h
>> >> index 986b285..6a07e55 100644
>> >> --- a/arch/arm/mach-s5pv210/include/mach/map.h
>> >> +++ b/arch/arm/mach-s5pv210/include/mach/map.h
>> >> @@ -65,6 +65,10 @@
>> >>
>> >> ?#define S5PV210_PA_FB ? ? ? ? ? ? ? ?(0xF8000000)
>> >>
>> >> +#define S5PV210_PA_FIMC0 ? ? (0xFB200000)
>> >> +#define S5PV210_PA_FIMC1 ? ? (0xFB300000)
>> >> +#define S5PV210_PA_FIMC2 ? ? (0xFB400000)
>> >> +
>> >> ?#define S5PV210_PA_HSMMC(x) ?(0xEB000000 + ((x) * 0x100000))
>> >>
>> >> ?#define S5PV210_PA_VIC0 ? ? ? ? ? ? ?(0xF2000000)
>> >> @@ -114,4 +118,8 @@
>> >> ?#define SAMSUNG_PA_CFCON ? ? S5PV210_PA_CFCON
>> >> ?#define SAMSUNG_PA_KEYPAD ? ?S5PV210_PA_KEYPAD
>> >>
>> >> +#define S5P_PA_FIMC0 ? ? ? ? S5PV210_PA_FIMC0
>> >> +#define S5P_PA_FIMC1 ? ? ? ? S5PV210_PA_FIMC1
>> >> +#define S5P_PA_FIMC2 ? ? ? ? S5PV210_PA_FIMC2
>> >
>> > To use one style is better for reading, merge conflict handling and so
> on...
>> > The style means to add S5P_PA_XXX after S3C_PA_XXX with C100 case or to
>> > modify above C100 case like this.
>>
>> Use the same conversion as previous one. are you okay?
>>
>> #define S5PV210_PA_VIC0 ? ? ? ? (0xF2000000)
>> #define S5P_PA_VIC0 ? ? ? ? ? ? S5PV210_PA_VIC0
>>
>> #define S5PV210_PA_VIC1 ? ? ? ? (0xF2100000)
>> #define S5P_PA_VIC1 ? ? ? ? ? ? S5PV210_PA_VIC1
>>
>> #define S5PV210_PA_VIC2 ? ? ? ? (0xF2200000)
>> #define S5P_PA_VIC2 ? ? ? ? ? ? S5PV210_PA_VIC2
>>
>> #define S5PV210_PA_VIC3 ? ? ? ? (0xF2300000)
>> #define S5P_PA_VIC3 ? ? ? ? ? ? S5PV210_PA_VIC3
>>
>> #define S5PV210_PA_SDRAM ? ? ? ?(0x30000000)
>> #define S5P_PA_SDRAM ? ? ? ? ? ?S5PV210_PA_SDRAM
>>
> No.
>
> Did you see above C100?
>
> --- C100
>
> ?#define S3C_PA_ONENAND_BUF ? ? ? ? ? ? S5PC100_PA_ONENAND_BUF
> ?#define S3C_SZ_ONENAND_BUF ? ? ? ? ? ? S5PC100_SZ_ONENAND_BUF
> ?#define S3C_PA_RTC ? ? ? ? ? ? S5PC100_PA_RTC
> +#define S5P_PA_FIMC0 ? ? ? ? ? S5PC100_PA_FIMC0
> +#define S5P_PA_FIMC1 ? ? ? ? ? S5PC100_PA_FIMC1
> +#define S5P_PA_FIMC2 ? ? ? ? ? S5PC100_PA_FIMC2
>
> ?#define SAMSUNG_PA_ADC ? ? ? ? ? ? ? S5PC100_PA_TSADC
> ?#define SAMSUNG_PA_CFCON ? ? S5PC100_PA_CFCON
>
> --- V210
>
> ?#define SAMSUNG_PA_CFCON ? ? ? ? ? ? ? S5PV210_PA_CFCON
> ?#define SAMSUNG_PA_KEYPAD ? ? ? ? ? ? ?S5PV210_PA_KEYPAD
>
> +#define S5P_PA_FIMC0 ? ? ? ? ? S5PV210_PA_FIMC0
> +#define S5P_PA_FIMC1 ? ? ? ? ? S5PV210_PA_FIMC1
> +#define S5P_PA_FIMC2 ? ? ? ? ? S5PV210_PA_FIMC2
>
> I mean it's just ordering.

Yes I also mean it don't separate the related definitions. so place
adjacent as the the previous.

>
>> >
>> >> +
>> >> ?#endif /* __ASM_ARCH_MAP_H */
>> >> diff --git a/arch/arm/plat-s5p/Kconfig b/arch/arm/plat-s5p/Kconfig
>> >> index 907ac63..9c79106 100644
>> >> --- a/arch/arm/plat-s5p/Kconfig
>> >> +++ b/arch/arm/plat-s5p/Kconfig
>> >> @@ -5,6 +5,22 @@
>> >> ?#
>> >> ?# Licensed under GPLv2
>> >>
>> >> +config S5P_DEV_FIMC0
>> >> + ? ? bool
>> >> + ? ? help
>> >> + ? ? ? Compile in platform device definitions for FIMC controller 0
>> >> +
>> >> +config S5P_DEV_FIMC1
>> >> + ? ? bool
>> >> + ? ? help
>> >> + ? ? ? Compile in platform device definitions for FIMC controller 1
>> >> +
>> >> +config S5P_DEV_FIMC2
>> >> + ? ? bool
>> >> + ? ? help
>> >> + ? ? ? Compile in platform device definitions for FIMC controller 2
>> >> +
>> >> +
>> >
>> > 2 empty lines.
>> >
>> >> ?config PLAT_S5P
>> >> ? ? ? bool
>> >> ? ? ? depends on (ARCH_S5P6440 || ARCH_S5P6442 || ARCH_S5PC100 ||
>> >> ARCH_S5PV210 || ARCH_S5PV310)
>> >> diff --git a/arch/arm/plat-s5p/Makefile b/arch/arm/plat-s5p/Makefile
>> >> index 7e34194..a2d9905 100644
>> >> --- a/arch/arm/plat-s5p/Makefile
>> >> +++ b/arch/arm/plat-s5p/Makefile
>> >> @@ -19,3 +19,6 @@ obj-y ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? += clock.o
>> >> ?obj-y ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?+= irq.o
>> >> ?obj-$(CONFIG_S5P_EXT_INT) ? ?+= irq-eint.o
>> >>
>> >
>> > Please add '# devices' here...
>> It's not related with this patch.
>> >
>> >> +obj-$(CONFIG_S5P_DEV_FIMC0) ?+= dev-fimc0.o
>> >> +obj-$(CONFIG_S5P_DEV_FIMC1) ?+= dev-fimc1.o
>> >> +obj-$(CONFIG_S5P_DEV_FIMC2) ?+= dev-fimc2.o
>> >> diff --git a/arch/arm/plat-s5p/dev-fimc0.c
> b/arch/arm/plat-s5p/dev-fimc0.c
>> >> new file mode 100644
>> >> index 0000000..8849de4
>> >> --- /dev/null
>> >> +++ b/arch/arm/plat-s5p/dev-fimc0.c
>> >> @@ -0,0 +1,35 @@
>> >> +/* linux/arch/arm/plat-s5p/dev-fimc0.c
>> >> + *
>> >> + * Copyright (c) 2010 Samsung Electronics
>> >> + *
>> >> + * Base S5P FIMC0 resource and device definitions
>> >> + *
>> >> + * This program is free software; you can redistribute it and/or
> modify
>> >> + * it under the terms of the GNU General Public License version 2 as
>> >> + * published by the Free Software Foundation.
>> >> + */
>> >
>> > Being 1 empty line is better here.
>> >
>> >> +#include <linux/kernel.h>
>> >> +#include <linux/platform_device.h>
>> >> +#include <linux/interrupt.h>
>> >> +#include <linux/ioport.h>
>> >> +#include <mach/map.h>
>> >> +
>> >> +static struct resource s5p_fimc_resource[] = {
>> >
>> > Please change to s5p_fimc0_resource...it'd helpful to merging dev-fimcX
>> > files later...
>> >
>> >> + ? ? [0] = {
>> >> + ? ? ? ? ? ? .start ?= S5P_PA_FIMC0,
>> >> + ? ? ? ? ? ? .end ? ?= S5P_PA_FIMC0 + SZ_1M - 1,
>> >> + ? ? ? ? ? ? .flags ?= IORESOURCE_MEM,
>> >> + ? ? },
>> >> + ? ? [1] = {
>> >> + ? ? ? ? ? ? .start ?= IRQ_FIMC0,
>> >> + ? ? ? ? ? ? .end ? ?= IRQ_FIMC0,
>> >> + ? ? ? ? ? ? .flags ?= IORESOURCE_IRQ,
>> >> + ? ? },
>> >> +};
>> >> +
>> >> +struct platform_device s5p_device_fimc0 = {
>> >> + ? ? .name ? ? ? ? ? = "s5p-fimc",
>> >> + ? ? .id ? ? ? ? ? ? = 0,
>> >> + ? ? .num_resources ?= ARRAY_SIZE(s5p_fimc_resource),
>> >
>> > s5p_fimc0_resource...
>> >
>> >> + ? ? .resource ? ? ? = s5p_fimc_resource,
>> >
>> > s5p_fimc0_resource...
>> >
>> >> +};
>> >> diff --git a/arch/arm/plat-s5p/dev-fimc1.c
> b/arch/arm/plat-s5p/dev-fimc1.c
>> >> new file mode 100644
>> >> index 0000000..b1f8970
>> >> --- /dev/null
>> >> +++ b/arch/arm/plat-s5p/dev-fimc1.c
>> >> @@ -0,0 +1,35 @@
>> >> +/* linux/arch/arm/plat-s5p/dev-fimc1.c
>> >> + *
>> >> + * Copyright (c) 2010 Samsung Electronics
>> >> + *
>> >> + * Base S5P FIMC1 resource and device definitions
>> >> + *
>> >> + * This program is free software; you can redistribute it and/or
> modify
>> >> + * it under the terms of the GNU General Public License version 2 as
>> >> + * published by the Free Software Foundation.
>> >> + */
>> >> +#include <linux/kernel.h>
>> >> +#include <linux/platform_device.h>
>> >> +#include <linux/interrupt.h>
>> >> +#include <linux/ioport.h>
>> >> +#include <mach/map.h>
>> >> +
>> >> +static struct resource s5p_fimc_resource[] = {
>> >> + ? ? [0] = {
>> >> + ? ? ? ? ? ? .start ?= S5P_PA_FIMC1,
>> >> + ? ? ? ? ? ? .end ? ?= S5P_PA_FIMC1 + SZ_1M - 1,
>> >> + ? ? ? ? ? ? .flags ?= IORESOURCE_MEM,
>> >> + ? ? },
>> >> + ? ? [1] = {
>> >> + ? ? ? ? ? ? .start ?= IRQ_FIMC1,
>> >> + ? ? ? ? ? ? .end ? ?= IRQ_FIMC1,
>> >> + ? ? ? ? ? ? .flags ?= IORESOURCE_IRQ,
>> >> + ? ? },
>> >> +};
>> >> +
>> >> +struct platform_device s5p_device_fimc1 = {
>> >> + ? ? .name ? ? ? ? ? = "s5p-fimc",
>> >> + ? ? .id ? ? ? ? ? ? = 1,
>> >> + ? ? .num_resources ?= ARRAY_SIZE(s5p_fimc_resource),
>> >> + ? ? .resource ? ? ? = s5p_fimc_resource,
>> >> +};
>> >> diff --git a/arch/arm/plat-s5p/dev-fimc2.c
> b/arch/arm/plat-s5p/dev-fimc2.c
>> >> new file mode 100644
>> >> index 0000000..20df59d
>> >> --- /dev/null
>> >> +++ b/arch/arm/plat-s5p/dev-fimc2.c
>> >> @@ -0,0 +1,35 @@
>> >> +/* linux/arch/arm/plat-s5p/dev-fimc2.c
>> >> + *
>> >> + * Copyright (c) 2010 Samsung Electronics
>> >> + *
>> >> + * Base S5P FIMC2 resource and device definitions
>> >> + *
>> >> + * This program is free software; you can redistribute it and/or
> modify
>> >> + * it under the terms of the GNU General Public License version 2 as
>> >> + * published by the Free Software Foundation.
>> >> + */
>> >> +#include <linux/kernel.h>
>> >> +#include <linux/platform_device.h>
>> >> +#include <linux/interrupt.h>
>> >> +#include <linux/ioport.h>
>> >> +#include <mach/map.h>
>> >> +
>> >> +static struct resource s5p_fimc_resource[] = {
>> >> + ? ? [0] = {
>> >> + ? ? ? ? ? ? .start ?= S5P_PA_FIMC2,
>> >> + ? ? ? ? ? ? .end ? ?= S5P_PA_FIMC2 + SZ_1M - 1,
>> >> + ? ? ? ? ? ? .flags ?= IORESOURCE_MEM,
>> >> + ? ? },
>> >> + ? ? [1] = {
>> >> + ? ? ? ? ? ? .start ?= IRQ_FIMC2,
>> >> + ? ? ? ? ? ? .end ? ?= IRQ_FIMC2,
>> >> + ? ? ? ? ? ? .flags ?= IORESOURCE_IRQ,
>> >> + ? ? },
>> >> +};
>> >> +
>> >> +struct platform_device s5p_device_fimc2 = {
>> >> + ? ? .name ? ? ? ? ? = "s5p-fimc",
>> >> + ? ? .id ? ? ? ? ? ? = 2,
>> >> + ? ? .num_resources ?= ARRAY_SIZE(s5p_fimc_resource),
>> >> + ? ? .resource ? ? ? = s5p_fimc_resource,
>> >> +};
>> >
>> > This is just for your information...
>> > I'm working on handling plat device in case of various # of each AP FIMC
>> > with CONFIG_NR_FIMC...
>> > So in this case, all of plat data for FIMC will be merged into
>> > 'plat-s5p/dev-fimc.c' or 'devs.c' later.
>> > ...but I'm not sure some stuff...anyway...
>>
>> If you have these plan, then there's no reason to separate the
>> dev-fimcX as this patch, Just one file the dev-fimc from now.
>> Other devices are same rules.
>>
> If you want now, just 'dev-fimc.c' is ok...but in that case, need to add
> '#ifdef CONFIG_S5P_DEV_FIMCX' in there..and 'OR' in Makefile for dev-fimc.o
>
>> >
>> >> diff --git a/arch/arm/plat-samsung/include/plat/fimc-core.h
>> > b/arch/arm/plat-
>> >> samsung/include/plat/fimc-core.h
>> >> new file mode 100644
>> >> index 0000000..a884ede
>> >> --- /dev/null
>> >> +++ b/arch/arm/plat-samsung/include/plat/fimc-core.h
>> >> @@ -0,0 +1,45 @@
>> >> +/*
>> >> + * arch/arm/plat-samsung/include/plat/fimc-core.h
>> >> + *
>> >> + * Copyright 2010 Samsung Electronics Co., Ltd.
>> >> + * ? Sylwester Nawrocki <s.nawrocki@samsung.com>
>> >> + *
>> >> + * Samsung camera interface driver core functions
>> >> + *
>> >> + * This program is free software; you can redistribute it and/or
> modify
>> >> + * it under the terms of the GNU General Public License version 2 as
>> >> + * published by the Free Software Foundation.
>> >> + */
>> >> +#ifndef __ASM_PLAT_FIMC_CORE_H
>> >> +#define __ASM_PLAT_FIMC_CORE_H __FILE__
>> >> +
>> >> +/*
>> >> + * These functions are only for use with the core support code, such
> as
>> >> + * the CPU-specific initialization code.
>> >> + */
>> >> +
>> >> +#include <plat/fimc.h>
>> >> +
>> >> +/* Re-define device name to differentiate the subsystem in various
> SoCs.
>> > */
>> >> +static inline void s3c_fimc_setname(int id, char *name)
>> >> +{
>> >> + ? ? switch (id) {
>> >> +#ifdef CONFIG_S5P_DEV_FIMC0
>> >> + ? ? case 0:
>> >> + ? ? ? ? ? ? s5p_device_fimc0.name = name;
>> >> + ? ? ? ? ? ? break;
>> >> +#endif
>> >> +#ifdef CONFIG_S5P_DEV_FIMC1
>> >> + ? ? case 1:
>> >> + ? ? ? ? ? ? s5p_device_fimc1.name = name;
>> >> + ? ? ? ? ? ? break;
>> >> +#endif
>> >> +#ifdef CONFIG_S5P_DEV_FIMC2
>> >> + ? ? case 2:
>> >> + ? ? ? ? ? ? s5p_device_fimc2.name = name;
>> >> + ? ? ? ? ? ? break;
>> >> +#endif
>> >> + ? ? }
>> >> +}
>> >> +
>> >> +#endif /* __ASM_PLAT_FIMC_CORE_H */
>> >> diff --git a/arch/arm/plat-samsung/include/plat/fimc.h b/arch/arm/plat-
>> >> samsung/include/plat/fimc.h
>> >> new file mode 100644
>> >> index 0000000..fda2040
>> >> --- /dev/null
>> >> +++ b/arch/arm/plat-samsung/include/plat/fimc.h
>> >> @@ -0,0 +1,22 @@
>> >> +/* linux/arch/arm/plat-samsung/include/plat/fimc.h
>> >> + *
>> >> + * Platform header file for S3C/S5P FIMC driver
>> >> + *
>> >> + * Copyright (c) 2010 Samsung Electronics
>> >> + *
>> >> + * Sylwester Nawrocki, <s.nawrocki@samsung.com>
>> >> + *
>> >> + * This program is free software; you can redistribute it and/or
> modify
>> >> + * it under the terms of the GNU General Public License version 2 as
>> >> + * published by the Free Software Foundation.
>> >> + */
>> >> +#ifndef FIMC_H_
>> >> +#define FIMC_H_
>> >> +
>> >> +#include <linux/platform_device.h>
>> >> +
>> >> +extern struct platform_device s5p_device_fimc0;
>> >> +extern struct platform_device s5p_device_fimc1;
>> >> +extern struct platform_device s5p_device_fimc2;
>> >
>> > Should being in 'plat-samsung/include/plat/devs.h'.
>> >
>> >> +
>> >> +#endif /* FIMC_H_ */
>> >> --
>> >
>> > Marek, could you please address as soon as possible?
>> >
>
>
> Thanks.
>
> Best regards,
> Kgene.
> --
> Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
> SW Solution Development Team, Samsung Electronics Co., Ltd.
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
> the body of a message to majordomo at vger.kernel.org
> More majordomo info at ?http://vger.kernel.org/majordomo-info.html
>

[PATCH v4 3/8] ARM: Samsung: Add platform definitions and helpers for FIMC driver

[Kukjin Kim]

Kyungmin Park wrote:
> 
> On Tue, Aug 3, 2010 at 9:46 AM, Kukjin Kim <kgene.kim@samsung.com> wrote:
> > Kyungmin Park wrote:
> >>
> >> On Tue, Aug 3, 2010 at 8:58 AM, Kukjin Kim <kgene.kim@samsung.com>
wrote:
> >> > Marek Szyprowski wrote:
> >> >>
> >> >> From: Sylwester Nawrocki <s.nawrocki@samsung.com>
> >> >>
> >> >> FIMC (CAMIF) device is a camera interface embedded in S3C/S5P
Samsung
> >> >> SOC series. It supports ITU-R BT.601/656 and MIPI-CSI2 standards,
> >> >> memory to memory operations, color conversion, resizing and
rotation.
> >> >>
> >> >> Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
> >> >> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
> >> >> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
> >> >> ---
> >> >>
> >> >> This is patch is a v3 version rebased onto latest kgene/for-next
tree.
> >> >> New entries in map.h files has been sorted by the physicall address.
> >> >>
> >> > Thanks for your addressing.
> >> >
> >> >> I'm resending this patch on behalf of Sylwester who is on holidays
this
> >> >> week.
> >> >>
> >> >> Best regards
> >> >> --
> >> >> Marek Szyprowski
> >> >> Samsung Poland R&D Center
> >> >> ---

(snip)

> >> >>
> >> >> diff --git a/arch/arm/mach-s5pc100/include/mach/map.h
b/arch/arm/mach-
> >> >> s5pc100/include/mach/map.h
> >> >> index c018697..3abe7f5 100644
> >> >> --- a/arch/arm/mach-s5pc100/include/mach/map.h
> >> >> +++ b/arch/arm/mach-s5pc100/include/mach/map.h
> >> >> @@ -99,6 +99,10 @@
> >> >>
> >> >> ?#define S5PC100_PA_FB ? ? ? ? ? ? ? ?(0xEE000000)
> >> >>
> >> >> +#define S5PC100_PA_FIMC0 ? ? (0xEE200000)
> >> >> +#define S5PC100_PA_FIMC1 ? ? (0xEE300000)
> >> >> +#define S5PC100_PA_FIMC2 ? ? (0xEE400000)
> >> >> +
> >> >> ?#define S5PC100_PA_I2S0 ? ? ? ? ? ? ?(0xF2000000)
> >> >> ?#define S5PC100_PA_I2S1 ? ? ? ? ? ? ?(0xF2100000)
> >> >> ?#define S5PC100_PA_I2S2 ? ? ? ? ? ? ?(0xF2200000)
> >> >> @@ -143,6 +147,9 @@
> >> >> ?#define S3C_PA_ONENAND_BUF ? S5PC100_PA_ONENAND_BUF
> >> >> ?#define S3C_SZ_ONENAND_BUF ? S5PC100_SZ_ONENAND_BUF
> >> >> ?#define S3C_PA_RTC ? ? ? ? ? S5PC100_PA_RTC
> >> >> +#define S5P_PA_FIMC0 ? ? ? ? S5PC100_PA_FIMC0
> >> >> +#define S5P_PA_FIMC1 ? ? ? ? S5PC100_PA_FIMC1
> >> >> +#define S5P_PA_FIMC2 ? ? ? ? S5PC100_PA_FIMC2
> >> >>
> >> >> ?#define SAMSUNG_PA_ADC ? ? ? ? ? ? ? S5PC100_PA_TSADC
> >> >> ?#define SAMSUNG_PA_CFCON ? ? S5PC100_PA_CFCON
> >> >> diff --git a/arch/arm/mach-s5pv210/cpu.c
b/arch/arm/mach-s5pv210/cpu.c

(snip)

> >> >> diff --git a/arch/arm/mach-s5pv210/include/mach/map.h
b/arch/arm/mach-
> >> >> s5pv210/include/mach/map.h
> >> >> index 986b285..6a07e55 100644
> >> >> --- a/arch/arm/mach-s5pv210/include/mach/map.h
> >> >> +++ b/arch/arm/mach-s5pv210/include/mach/map.h
> >> >> @@ -65,6 +65,10 @@
> >> >>
> >> >> ?#define S5PV210_PA_FB ? ? ? ? ? ? ? ?(0xF8000000)
> >> >>
> >> >> +#define S5PV210_PA_FIMC0 ? ? (0xFB200000)
> >> >> +#define S5PV210_PA_FIMC1 ? ? (0xFB300000)
> >> >> +#define S5PV210_PA_FIMC2 ? ? (0xFB400000)
> >> >> +
> >> >> ?#define S5PV210_PA_HSMMC(x) ?(0xEB000000 + ((x) * 0x100000))
> >> >>
> >> >> ?#define S5PV210_PA_VIC0 ? ? ? ? ? ? ?(0xF2000000)
> >> >> @@ -114,4 +118,8 @@
> >> >> ?#define SAMSUNG_PA_CFCON ? ? S5PV210_PA_CFCON
> >> >> ?#define SAMSUNG_PA_KEYPAD ? ?S5PV210_PA_KEYPAD
> >> >>
> >> >> +#define S5P_PA_FIMC0 ? ? ? ? S5PV210_PA_FIMC0
> >> >> +#define S5P_PA_FIMC1 ? ? ? ? S5PV210_PA_FIMC1
> >> >> +#define S5P_PA_FIMC2 ? ? ? ? S5PV210_PA_FIMC2
> >> >
> >> > To use one style is better for reading, merge conflict handling and
so
> > on...
> >> > The style means to add S5P_PA_XXX after S3C_PA_XXX with C100 case or
> to
> >> > modify above C100 case like this.
> >>
> >> Use the same conversion as previous one. are you okay?
> >>
> >> #define S5PV210_PA_VIC0 ? ? ? ? (0xF2000000)
> >> #define S5P_PA_VIC0 ? ? ? ? ? ? S5PV210_PA_VIC0
> >>
> >> #define S5PV210_PA_VIC1 ? ? ? ? (0xF2100000)
> >> #define S5P_PA_VIC1 ? ? ? ? ? ? S5PV210_PA_VIC1
> >>
> >> #define S5PV210_PA_VIC2 ? ? ? ? (0xF2200000)
> >> #define S5P_PA_VIC2 ? ? ? ? ? ? S5PV210_PA_VIC2
> >>
> >> #define S5PV210_PA_VIC3 ? ? ? ? (0xF2300000)
> >> #define S5P_PA_VIC3 ? ? ? ? ? ? S5PV210_PA_VIC3
> >>
> >> #define S5PV210_PA_SDRAM ? ? ? ?(0x30000000)
> >> #define S5P_PA_SDRAM ? ? ? ? ? ?S5PV210_PA_SDRAM
> >>
> > No.
> >
> > Did you see above C100?
> >
> > --- C100
> >
> > ?#define S3C_PA_ONENAND_BUF ? ? ? ? ? ? S5PC100_PA_ONENAND_BUF
> > ?#define S3C_SZ_ONENAND_BUF ? ? ? ? ? ? S5PC100_SZ_ONENAND_BUF
> > ?#define S3C_PA_RTC ? ? ? ? ? ? S5PC100_PA_RTC
> > +#define S5P_PA_FIMC0 ? ? ? ? ? S5PC100_PA_FIMC0
> > +#define S5P_PA_FIMC1 ? ? ? ? ? S5PC100_PA_FIMC1
> > +#define S5P_PA_FIMC2 ? ? ? ? ? S5PC100_PA_FIMC2
> >
> > ?#define SAMSUNG_PA_ADC ? ? ? ? ? ? ? S5PC100_PA_TSADC
> > ?#define SAMSUNG_PA_CFCON ? ? S5PC100_PA_CFCON
> >
> > --- V210
> >
> > ?#define SAMSUNG_PA_CFCON ? ? ? ? ? ? ? S5PV210_PA_CFCON
> > ?#define SAMSUNG_PA_KEYPAD ? ? ? ? ? ? ?S5PV210_PA_KEYPAD
> >
> > +#define S5P_PA_FIMC0 ? ? ? ? ? S5PV210_PA_FIMC0
> > +#define S5P_PA_FIMC1 ? ? ? ? ? S5PV210_PA_FIMC1
> > +#define S5P_PA_FIMC2 ? ? ? ? ? S5PV210_PA_FIMC2
> >
> > I mean it's just ordering.
> 
> Yes I also mean it don't separate the related definitions. so place
> adjacent as the the previous.
> 
No...maybe you misunderstood...hmm :-(
Please add in map.h of V210 like following.

@@ -110,6 +110,10 @@
 #define S3C_PA_RTC		S5PV210_PA_RTC
 #define S3C_PA_WDT		S5PV210_PA_WATCHDOG

+#define S5P_PA_FIMC0		S5PV210_PA_FIMC0
+#define S5P_PA_FIMC1		S5PV210_PA_FIMC1
+#define S5P_PA_FIMC2		S5PV210_PA_FIMC2
+
 #define SAMSUNG_PA_ADC		S5PV210_PA_ADC
 #define SAMSUNG_PA_CFCON		S5PV210_PA_CFCON
 #define SAMSUNG_PA_KEYPAD		S5PV210_PA_KEYPAD

(snip)

Thanks.

Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.

[PATCH v4 3/8] ARM: Samsung: Add platform definitions and helpers for FIMC driver

[Kyungmin Park]

On Tue, Aug 3, 2010 at 10:05 AM, Kukjin Kim <kgene.kim@samsung.com> wrote:
> Kyungmin Park wrote:
>>
>> On Tue, Aug 3, 2010 at 9:46 AM, Kukjin Kim <kgene.kim@samsung.com> wrote:
>> > Kyungmin Park wrote:
>> >>
>> >> On Tue, Aug 3, 2010 at 8:58 AM, Kukjin Kim <kgene.kim@samsung.com>
> wrote:
>> >> > Marek Szyprowski wrote:
>> >> >>
>> >> >> From: Sylwester Nawrocki <s.nawrocki@samsung.com>
>> >> >>
>> >> >> FIMC (CAMIF) device is a camera interface embedded in S3C/S5P
> Samsung
>> >> >> SOC series. It supports ITU-R BT.601/656 and MIPI-CSI2 standards,
>> >> >> memory to memory operations, color conversion, resizing and
> rotation.
>> >> >>
>> >> >> Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
>> >> >> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
>> >> >> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
>> >> >> ---
>> >> >>
>> >> >> This is patch is a v3 version rebased onto latest kgene/for-next
> tree.
>> >> >> New entries in map.h files has been sorted by the physicall address.
>> >> >>
>> >> > Thanks for your addressing.
>> >> >
>> >> >> I'm resending this patch on behalf of Sylwester who is on holidays
> this
>> >> >> week.
>> >> >>
>> >> >> Best regards
>> >> >> --
>> >> >> Marek Szyprowski
>> >> >> Samsung Poland R&D Center
>> >> >> ---
>
> (snip)
>
>> >> >>
>> >> >> diff --git a/arch/arm/mach-s5pc100/include/mach/map.h
> b/arch/arm/mach-
>> >> >> s5pc100/include/mach/map.h
>> >> >> index c018697..3abe7f5 100644
>> >> >> --- a/arch/arm/mach-s5pc100/include/mach/map.h
>> >> >> +++ b/arch/arm/mach-s5pc100/include/mach/map.h
>> >> >> @@ -99,6 +99,10 @@
>> >> >>
>> >> >> ?#define S5PC100_PA_FB ? ? ? ? ? ? ? ?(0xEE000000)
>> >> >>
>> >> >> +#define S5PC100_PA_FIMC0 ? ? (0xEE200000)
>> >> >> +#define S5PC100_PA_FIMC1 ? ? (0xEE300000)
>> >> >> +#define S5PC100_PA_FIMC2 ? ? (0xEE400000)
>> >> >> +
>> >> >> ?#define S5PC100_PA_I2S0 ? ? ? ? ? ? ?(0xF2000000)
>> >> >> ?#define S5PC100_PA_I2S1 ? ? ? ? ? ? ?(0xF2100000)
>> >> >> ?#define S5PC100_PA_I2S2 ? ? ? ? ? ? ?(0xF2200000)
>> >> >> @@ -143,6 +147,9 @@
>> >> >> ?#define S3C_PA_ONENAND_BUF ? S5PC100_PA_ONENAND_BUF
>> >> >> ?#define S3C_SZ_ONENAND_BUF ? S5PC100_SZ_ONENAND_BUF
>> >> >> ?#define S3C_PA_RTC ? ? ? ? ? S5PC100_PA_RTC
>> >> >> +#define S5P_PA_FIMC0 ? ? ? ? S5PC100_PA_FIMC0
>> >> >> +#define S5P_PA_FIMC1 ? ? ? ? S5PC100_PA_FIMC1
>> >> >> +#define S5P_PA_FIMC2 ? ? ? ? S5PC100_PA_FIMC2
>> >> >>
>> >> >> ?#define SAMSUNG_PA_ADC ? ? ? ? ? ? ? S5PC100_PA_TSADC
>> >> >> ?#define SAMSUNG_PA_CFCON ? ? S5PC100_PA_CFCON
>> >> >> diff --git a/arch/arm/mach-s5pv210/cpu.c
> b/arch/arm/mach-s5pv210/cpu.c
>
> (snip)
>
>> >> >> diff --git a/arch/arm/mach-s5pv210/include/mach/map.h
> b/arch/arm/mach-
>> >> >> s5pv210/include/mach/map.h
>> >> >> index 986b285..6a07e55 100644
>> >> >> --- a/arch/arm/mach-s5pv210/include/mach/map.h
>> >> >> +++ b/arch/arm/mach-s5pv210/include/mach/map.h
>> >> >> @@ -65,6 +65,10 @@
>> >> >>
>> >> >> ?#define S5PV210_PA_FB ? ? ? ? ? ? ? ?(0xF8000000)
>> >> >>
>> >> >> +#define S5PV210_PA_FIMC0 ? ? (0xFB200000)
>> >> >> +#define S5PV210_PA_FIMC1 ? ? (0xFB300000)
>> >> >> +#define S5PV210_PA_FIMC2 ? ? (0xFB400000)
>> >> >> +
>> >> >> ?#define S5PV210_PA_HSMMC(x) ?(0xEB000000 + ((x) * 0x100000))
>> >> >>
>> >> >> ?#define S5PV210_PA_VIC0 ? ? ? ? ? ? ?(0xF2000000)
>> >> >> @@ -114,4 +118,8 @@
>> >> >> ?#define SAMSUNG_PA_CFCON ? ? S5PV210_PA_CFCON
>> >> >> ?#define SAMSUNG_PA_KEYPAD ? ?S5PV210_PA_KEYPAD
>> >> >>
>> >> >> +#define S5P_PA_FIMC0 ? ? ? ? S5PV210_PA_FIMC0
>> >> >> +#define S5P_PA_FIMC1 ? ? ? ? S5PV210_PA_FIMC1
>> >> >> +#define S5P_PA_FIMC2 ? ? ? ? S5PV210_PA_FIMC2
>> >> >
>> >> > To use one style is better for reading, merge conflict handling and
> so
>> > on...
>> >> > The style means to add S5P_PA_XXX after S3C_PA_XXX with C100 case or
>> to
>> >> > modify above C100 case like this.
>> >>
>> >> Use the same conversion as previous one. are you okay?
>> >>
>> >> #define S5PV210_PA_VIC0 ? ? ? ? (0xF2000000)
>> >> #define S5P_PA_VIC0 ? ? ? ? ? ? S5PV210_PA_VIC0
>> >>
>> >> #define S5PV210_PA_VIC1 ? ? ? ? (0xF2100000)
>> >> #define S5P_PA_VIC1 ? ? ? ? ? ? S5PV210_PA_VIC1
>> >>
>> >> #define S5PV210_PA_VIC2 ? ? ? ? (0xF2200000)
>> >> #define S5P_PA_VIC2 ? ? ? ? ? ? S5PV210_PA_VIC2
>> >>
>> >> #define S5PV210_PA_VIC3 ? ? ? ? (0xF2300000)
>> >> #define S5P_PA_VIC3 ? ? ? ? ? ? S5PV210_PA_VIC3
>> >>
>> >> #define S5PV210_PA_SDRAM ? ? ? ?(0x30000000)
>> >> #define S5P_PA_SDRAM ? ? ? ? ? ?S5PV210_PA_SDRAM
>> >>
>> > No.
>> >
>> > Did you see above C100?
>> >
>> > --- C100
>> >
>> > ?#define S3C_PA_ONENAND_BUF ? ? ? ? ? ? S5PC100_PA_ONENAND_BUF
>> > ?#define S3C_SZ_ONENAND_BUF ? ? ? ? ? ? S5PC100_SZ_ONENAND_BUF
>> > ?#define S3C_PA_RTC ? ? ? ? ? ? S5PC100_PA_RTC
>> > +#define S5P_PA_FIMC0 ? ? ? ? ? S5PC100_PA_FIMC0
>> > +#define S5P_PA_FIMC1 ? ? ? ? ? S5PC100_PA_FIMC1
>> > +#define S5P_PA_FIMC2 ? ? ? ? ? S5PC100_PA_FIMC2
>> >
>> > ?#define SAMSUNG_PA_ADC ? ? ? ? ? ? ? S5PC100_PA_TSADC
>> > ?#define SAMSUNG_PA_CFCON ? ? S5PC100_PA_CFCON
>> >
>> > --- V210
>> >
>> > ?#define SAMSUNG_PA_CFCON ? ? ? ? ? ? ? S5PV210_PA_CFCON
>> > ?#define SAMSUNG_PA_KEYPAD ? ? ? ? ? ? ?S5PV210_PA_KEYPAD
>> >
>> > +#define S5P_PA_FIMC0 ? ? ? ? ? S5PV210_PA_FIMC0
>> > +#define S5P_PA_FIMC1 ? ? ? ? ? S5PV210_PA_FIMC1
>> > +#define S5P_PA_FIMC2 ? ? ? ? ? S5PV210_PA_FIMC2
>> >
>> > I mean it's just ordering.
>>
>> Yes I also mean it don't separate the related definitions. so place
>> adjacent as the the previous.
>>
> No...maybe you misunderstood...hmm :-(
> Please add in map.h of V210 like following.

Then please also apply the same rules at existing definitions.

>
> @@ -110,6 +110,10 @@
> ?#define S3C_PA_RTC ? ? ? ? ? ? S5PV210_PA_RTC
> ?#define S3C_PA_WDT ? ? ? ? ? ? S5PV210_PA_WATCHDOG
>
> +#define S5P_PA_FIMC0 ? ? ? ? ? S5PV210_PA_FIMC0
> +#define S5P_PA_FIMC1 ? ? ? ? ? S5PV210_PA_FIMC1
> +#define S5P_PA_FIMC2 ? ? ? ? ? S5PV210_PA_FIMC2
> +
> ?#define SAMSUNG_PA_ADC ? ? ? ? S5PV210_PA_ADC
> ?#define SAMSUNG_PA_CFCON ? ? ? ? ? ? ? S5PV210_PA_CFCON
> ?#define SAMSUNG_PA_KEYPAD ? ? ? ? ? ? ?S5PV210_PA_KEYPAD
>
> (snip)
>
> Thanks.
>
> Best regards,
> Kgene.
> --
> Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
> SW Solution Development Team, Samsung Electronics Co., Ltd.
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
> the body of a message to majordomo at vger.kernel.org
> More majordomo info at ?http://vger.kernel.org/majordomo-info.html
>

[PATCH v4 3/8] ARM: Samsung: Add platform definitions and helpers for FIMC driver

[Kukjin Kim]

Kyungmin Park wrote:
> 
> On Tue, Aug 3, 2010 at 10:05 AM, Kukjin Kim <kgene.kim@samsung.com> wrote:
> > Kyungmin Park wrote:
> >>
> >> On Tue, Aug 3, 2010 at 9:46 AM, Kukjin Kim <kgene.kim@samsung.com>
wrote:
> >> > Kyungmin Park wrote:
> >> >>
> >> >> On Tue, Aug 3, 2010 at 8:58 AM, Kukjin Kim <kgene.kim@samsung.com>
> > wrote:
> >> >> > Marek Szyprowski wrote:
> >> >> >>
> >> >> >> From: Sylwester Nawrocki <s.nawrocki@samsung.com>
> >> >> >>
> >> >> >> FIMC (CAMIF) device is a camera interface embedded in S3C/S5P
> > Samsung
> >> >> >> SOC series. It supports ITU-R BT.601/656 and MIPI-CSI2 standards,
> >> >> >> memory to memory operations, color conversion, resizing and
> > rotation.
> >> >> >>
> >> >> >> Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
> >> >> >> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
> >> >> >> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
> >> >> >> ---
> >> >> >>
> >> >> >> This is patch is a v3 version rebased onto latest kgene/for-next
> > tree.
> >> >> >> New entries in map.h files has been sorted by the physicall
address.
> >> >> >>
> >> >> > Thanks for your addressing.
> >> >> >
> >> >> >> I'm resending this patch on behalf of Sylwester who is on
holidays
> > this
> >> >> >> week.
> >> >> >>
> >> >> >> Best regards
> >> >> >> --
> >> >> >> Marek Szyprowski
> >> >> >> Samsung Poland R&D Center
> >> >> >> ---
> >
> > (snip)
> >
> >> >> >>
> >> >> >> diff --git a/arch/arm/mach-s5pc100/include/mach/map.h
> > b/arch/arm/mach-
> >> >> >> s5pc100/include/mach/map.h
> >> >> >> index c018697..3abe7f5 100644
> >> >> >> --- a/arch/arm/mach-s5pc100/include/mach/map.h
> >> >> >> +++ b/arch/arm/mach-s5pc100/include/mach/map.h
> >> >> >> @@ -99,6 +99,10 @@
> >> >> >>
> >> >> >> ?#define S5PC100_PA_FB ? ? ? ? ? ? ? ?(0xEE000000)
> >> >> >>
> >> >> >> +#define S5PC100_PA_FIMC0 ? ? (0xEE200000)
> >> >> >> +#define S5PC100_PA_FIMC1 ? ? (0xEE300000)
> >> >> >> +#define S5PC100_PA_FIMC2 ? ? (0xEE400000)
> >> >> >> +
> >> >> >> ?#define S5PC100_PA_I2S0 ? ? ? ? ? ? ?(0xF2000000)
> >> >> >> ?#define S5PC100_PA_I2S1 ? ? ? ? ? ? ?(0xF2100000)
> >> >> >> ?#define S5PC100_PA_I2S2 ? ? ? ? ? ? ?(0xF2200000)
> >> >> >> @@ -143,6 +147,9 @@
> >> >> >> ?#define S3C_PA_ONENAND_BUF ? S5PC100_PA_ONENAND_BUF
> >> >> >> ?#define S3C_SZ_ONENAND_BUF ? S5PC100_SZ_ONENAND_BUF
> >> >> >> ?#define S3C_PA_RTC ? ? ? ? ? S5PC100_PA_RTC
> >> >> >> +#define S5P_PA_FIMC0 ? ? ? ? S5PC100_PA_FIMC0
> >> >> >> +#define S5P_PA_FIMC1 ? ? ? ? S5PC100_PA_FIMC1
> >> >> >> +#define S5P_PA_FIMC2 ? ? ? ? S5PC100_PA_FIMC2
> >> >> >>
> >> >> >> ?#define SAMSUNG_PA_ADC ? ? ? ? ? ? ? S5PC100_PA_TSADC
> >> >> >> ?#define SAMSUNG_PA_CFCON ? ? S5PC100_PA_CFCON
> >> >> >> diff --git a/arch/arm/mach-s5pv210/cpu.c
> > b/arch/arm/mach-s5pv210/cpu.c
> >
> > (snip)
> >
> >> >> >> diff --git a/arch/arm/mach-s5pv210/include/mach/map.h
> > b/arch/arm/mach-
> >> >> >> s5pv210/include/mach/map.h
> >> >> >> index 986b285..6a07e55 100644
> >> >> >> --- a/arch/arm/mach-s5pv210/include/mach/map.h
> >> >> >> +++ b/arch/arm/mach-s5pv210/include/mach/map.h
> >> >> >> @@ -65,6 +65,10 @@
> >> >> >>
> >> >> >> ?#define S5PV210_PA_FB ? ? ? ? ? ? ? ?(0xF8000000)
> >> >> >>
> >> >> >> +#define S5PV210_PA_FIMC0 ? ? (0xFB200000)
> >> >> >> +#define S5PV210_PA_FIMC1 ? ? (0xFB300000)
> >> >> >> +#define S5PV210_PA_FIMC2 ? ? (0xFB400000)
> >> >> >> +
> >> >> >> ?#define S5PV210_PA_HSMMC(x) ?(0xEB000000 + ((x) * 0x100000))
> >> >> >>
> >> >> >> ?#define S5PV210_PA_VIC0 ? ? ? ? ? ? ?(0xF2000000)
> >> >> >> @@ -114,4 +118,8 @@
> >> >> >> ?#define SAMSUNG_PA_CFCON ? ? S5PV210_PA_CFCON
> >> >> >> ?#define SAMSUNG_PA_KEYPAD ? ?S5PV210_PA_KEYPAD
> >> >> >>
> >> >> >> +#define S5P_PA_FIMC0 ? ? ? ? S5PV210_PA_FIMC0
> >> >> >> +#define S5P_PA_FIMC1 ? ? ? ? S5PV210_PA_FIMC1
> >> >> >> +#define S5P_PA_FIMC2 ? ? ? ? S5PV210_PA_FIMC2
> >> >> >
> >> >> > To use one style is better for reading, merge conflict handling
and
> > so
> >> > on...
> >> >> > The style means to add S5P_PA_XXX after S3C_PA_XXX with C100 case
> or
> >> to
> >> >> > modify above C100 case like this.
> >> >>
> >> >> Use the same conversion as previous one. are you okay?
> >> >>
> >> >> #define S5PV210_PA_VIC0 ? ? ? ? (0xF2000000)
> >> >> #define S5P_PA_VIC0 ? ? ? ? ? ? S5PV210_PA_VIC0
> >> >>
> >> >> #define S5PV210_PA_VIC1 ? ? ? ? (0xF2100000)
> >> >> #define S5P_PA_VIC1 ? ? ? ? ? ? S5PV210_PA_VIC1
> >> >>
> >> >> #define S5PV210_PA_VIC2 ? ? ? ? (0xF2200000)
> >> >> #define S5P_PA_VIC2 ? ? ? ? ? ? S5PV210_PA_VIC2
> >> >>
> >> >> #define S5PV210_PA_VIC3 ? ? ? ? (0xF2300000)
> >> >> #define S5P_PA_VIC3 ? ? ? ? ? ? S5PV210_PA_VIC3
> >> >>
> >> >> #define S5PV210_PA_SDRAM ? ? ? ?(0x30000000)
> >> >> #define S5P_PA_SDRAM ? ? ? ? ? ?S5PV210_PA_SDRAM
> >> >>
> >> > No.
> >> >
> >> > Did you see above C100?
> >> >
> >> > --- C100
> >> >
> >> > ?#define
> S3C_PA_ONENAND_BUF ? ? ? ? ? ? S5PC100_PA_ONENAND_BUF
> >> > ?#define
> S3C_SZ_ONENAND_BUF ? ? ? ? ? ? S5PC100_SZ_ONENAND_BUF
> >> > ?#define S3C_PA_RTC ? ? ? ? ? ? S5PC100_PA_RTC
> >> > +#define S5P_PA_FIMC0 ? ? ? ? ? S5PC100_PA_FIMC0
> >> > +#define S5P_PA_FIMC1 ? ? ? ? ? S5PC100_PA_FIMC1
> >> > +#define S5P_PA_FIMC2 ? ? ? ? ? S5PC100_PA_FIMC2
> >> >
> >> > ?#define SAMSUNG_PA_ADC ? ? ? ? ? ? ? S5PC100_PA_TSADC
> >> > ?#define SAMSUNG_PA_CFCON ? ? S5PC100_PA_CFCON
> >> >
> >> > --- V210
> >> >
> >> > ?#define SAMSUNG_PA_CFCON ? ? ? ? ? ? ? S5PV210_PA_CFCON
> >> > ?#define SAMSUNG_PA_KEYPAD ? ? ? ? ? ? ?S5PV210_PA_KEYPAD
> >> >
> >> > +#define S5P_PA_FIMC0 ? ? ? ? ? S5PV210_PA_FIMC0
> >> > +#define S5P_PA_FIMC1 ? ? ? ? ? S5PV210_PA_FIMC1
> >> > +#define S5P_PA_FIMC2 ? ? ? ? ? S5PV210_PA_FIMC2
> >> >
> >> > I mean it's just ordering.
> >>
> >> Yes I also mean it don't separate the related definitions. so place
> >> adjacent as the the previous.
> >>
> > No...maybe you misunderstood...hmm :-(
> > Please add in map.h of V210 like following.
> 
> Then please also apply the same rules at existing definitions.
> 
I meant...there are other orderings in a patch file..so unify style...
But..yeah, in this case the criteria about that seems not clear.
If need, I will sort it out...firstly please address as I said.

Marek, could you please re-submit for this...?

> >
> > @@ -110,6 +110,10 @@
> > ?#define S3C_PA_RTC ? ? ? ? ? ? S5PV210_PA_RTC
> > ?#define S3C_PA_WDT ? ? ? ? ? ? S5PV210_PA_WATCHDOG
> >
> > +#define S5P_PA_FIMC0 ? ? ? ? ? S5PV210_PA_FIMC0
> > +#define S5P_PA_FIMC1 ? ? ? ? ? S5PV210_PA_FIMC1
> > +#define S5P_PA_FIMC2 ? ? ? ? ? S5PV210_PA_FIMC2
> > +
> > ?#define SAMSUNG_PA_ADC ? ? ? ? S5PV210_PA_ADC
> > ?#define SAMSUNG_PA_CFCON ? ? ? ? ? ? ? S5PV210_PA_CFCON
> > ?#define SAMSUNG_PA_KEYPAD ? ? ? ? ? ? ?S5PV210_PA_KEYPAD
> >
> > (snip)
> >


Thanks.

Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.

[PATCH v5 3/8] ARM: Samsung: Add platform definitions and helpers for FIMC driver

[Marek Szyprowski]

From: Sylwester Nawrocki <s.nawrocki@samsung.com>

FIMC (CAMIF) device is a camera interface embedded in S3C/S5P Samsung
SOC series. It supports ITU-R BT.601/656 and MIPI-CSI2 standards,
memory to memory operations, color conversion, resizing and rotation.

Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
---

Changes since v4:
- addressed all minor style issues reported by Kukjin Kim

Changes since v3:
- rebased onto latest kgene/for-next tree
- new entries in map.h files has been sorted by the physicall address

I'm sending this patch on behalf of Sylwerster who is on holidays this
week.

Best regards
-- 
Marek Szyprowski
Samsung Poland R&D Center
---
 arch/arm/mach-s5pc100/include/mach/map.h       |    7 ++++
 arch/arm/mach-s5pv210/cpu.c                    |    5 +++
 arch/arm/mach-s5pv210/include/mach/map.h       |    7 ++++
 arch/arm/plat-s5p/Kconfig                      |   15 ++++++++
 arch/arm/plat-s5p/Makefile                     |    5 +++
 arch/arm/plat-s5p/dev-fimc0.c                  |   36 ++++++++++++++++++++
 arch/arm/plat-s5p/dev-fimc1.c                  |   36 ++++++++++++++++++++
 arch/arm/plat-s5p/dev-fimc2.c                  |   36 ++++++++++++++++++++
 arch/arm/plat-samsung/include/plat/devs.h      |    4 ++
 arch/arm/plat-samsung/include/plat/fimc-core.h |   43 ++++++++++++++++++++++++
 10 files changed, 194 insertions(+), 0 deletions(-)
 create mode 100644 arch/arm/plat-s5p/dev-fimc0.c
 create mode 100644 arch/arm/plat-s5p/dev-fimc1.c
 create mode 100644 arch/arm/plat-s5p/dev-fimc2.c
 create mode 100644 arch/arm/plat-samsung/include/plat/fimc-core.h

diff --git a/arch/arm/mach-s5pc100/include/mach/map.h b/arch/arm/mach-s5pc100/include/mach/map.h
index c018697..3abe7f5 100644
--- a/arch/arm/mach-s5pc100/include/mach/map.h
+++ b/arch/arm/mach-s5pc100/include/mach/map.h
@@ -99,6 +99,10 @@
 
 #define S5PC100_PA_FB		(0xEE000000)
 
+#define S5PC100_PA_FIMC0	(0xEE200000)
+#define S5PC100_PA_FIMC1	(0xEE300000)
+#define S5PC100_PA_FIMC2	(0xEE400000)
+
 #define S5PC100_PA_I2S0		(0xF2000000)
 #define S5PC100_PA_I2S1		(0xF2100000)
 #define S5PC100_PA_I2S2		(0xF2200000)
@@ -143,6 +147,9 @@
 #define S3C_PA_ONENAND_BUF	S5PC100_PA_ONENAND_BUF
 #define S3C_SZ_ONENAND_BUF	S5PC100_SZ_ONENAND_BUF
 #define S3C_PA_RTC		S5PC100_PA_RTC
+#define S5P_PA_FIMC0		S5PC100_PA_FIMC0
+#define S5P_PA_FIMC1		S5PC100_PA_FIMC1
+#define S5P_PA_FIMC2		S5PC100_PA_FIMC2
 
 #define SAMSUNG_PA_ADC		S5PC100_PA_TSADC
 #define SAMSUNG_PA_CFCON	S5PC100_PA_CFCON
diff --git a/arch/arm/mach-s5pv210/cpu.c b/arch/arm/mach-s5pv210/cpu.c
index ea09c32..a7446d4 100644
--- a/arch/arm/mach-s5pv210/cpu.c
+++ b/arch/arm/mach-s5pv210/cpu.c
@@ -37,6 +37,7 @@
 #include <plat/iic-core.h>
 #include <plat/keypad-core.h>
 #include <plat/sdhci.h>
+#include <plat/fimc-core.h>
 #include <plat/reset.h>
 
 /* Initial IO mappings */
@@ -104,6 +105,10 @@ void __init s5pv210_map_io(void)
 
 	/* Use s5pv210-keypad instead of samsung-keypad */
 	samsung_keypad_setname("s5pv210-keypad");
+
+	s3c_fimc_setname(0, "s5pv210-fimc");
+	s3c_fimc_setname(1, "s5pv210-fimc");
+	s3c_fimc_setname(2, "s5pv210-fimc");
 }
 
 void __init s5pv210_init_clocks(int xtal)
diff --git a/arch/arm/mach-s5pv210/include/mach/map.h b/arch/arm/mach-s5pv210/include/mach/map.h
index 986b285..dd4fb6b 100644
--- a/arch/arm/mach-s5pv210/include/mach/map.h
+++ b/arch/arm/mach-s5pv210/include/mach/map.h
@@ -65,6 +65,10 @@
 
 #define S5PV210_PA_FB		(0xF8000000)
 
+#define S5PV210_PA_FIMC0	(0xFB200000)
+#define S5PV210_PA_FIMC1	(0xFB300000)
+#define S5PV210_PA_FIMC2	(0xFB400000)
+
 #define S5PV210_PA_HSMMC(x)	(0xEB000000 + ((x) * 0x100000))
 
 #define S5PV210_PA_VIC0		(0xF2000000)
@@ -109,6 +113,9 @@
 #define S3C_PA_FB		S5PV210_PA_FB
 #define S3C_PA_RTC		S5PV210_PA_RTC
 #define S3C_PA_WDT		S5PV210_PA_WATCHDOG
+#define S5P_PA_FIMC0		S5PV210_PA_FIMC0
+#define S5P_PA_FIMC1		S5PV210_PA_FIMC1
+#define S5P_PA_FIMC2		S5PV210_PA_FIMC2
 
 #define SAMSUNG_PA_ADC		S5PV210_PA_ADC
 #define SAMSUNG_PA_CFCON	S5PV210_PA_CFCON
diff --git a/arch/arm/plat-s5p/Kconfig b/arch/arm/plat-s5p/Kconfig
index 907ac63..66e40c8 100644
--- a/arch/arm/plat-s5p/Kconfig
+++ b/arch/arm/plat-s5p/Kconfig
@@ -5,6 +5,21 @@
 #
 # Licensed under GPLv2
 
+config S5P_DEV_FIMC0
+	bool
+	help
+	  Compile in platform device definitions for FIMC controller 0
+
+config S5P_DEV_FIMC1
+	bool
+	help
+	  Compile in platform device definitions for FIMC controller 1
+
+config S5P_DEV_FIMC2
+	bool
+	help
+	  Compile in platform device definitions for FIMC controller 2
+
 config PLAT_S5P
 	bool
 	depends on (ARCH_S5P6440 || ARCH_S5P6442 || ARCH_S5PC100 || ARCH_S5PV210 || ARCH_S5PV310)
diff --git a/arch/arm/plat-s5p/Makefile b/arch/arm/plat-s5p/Makefile
index 7e34194..b2e0296 100644
--- a/arch/arm/plat-s5p/Makefile
+++ b/arch/arm/plat-s5p/Makefile
@@ -19,3 +19,8 @@ obj-y				+= clock.o
 obj-y				+= irq.o
 obj-$(CONFIG_S5P_EXT_INT)	+= irq-eint.o
 
+# devices
+
+obj-$(CONFIG_S5P_DEV_FIMC0)	+= dev-fimc0.o
+obj-$(CONFIG_S5P_DEV_FIMC1)	+= dev-fimc1.o
+obj-$(CONFIG_S5P_DEV_FIMC2)	+= dev-fimc2.o
diff --git a/arch/arm/plat-s5p/dev-fimc0.c b/arch/arm/plat-s5p/dev-fimc0.c
new file mode 100644
index 0000000..d3f1a9b
--- /dev/null
+++ b/arch/arm/plat-s5p/dev-fimc0.c
@@ -0,0 +1,36 @@
+/* linux/arch/arm/plat-s5p/dev-fimc0.c
+ *
+ * Copyright (c) 2010 Samsung Electronics
+ *
+ * Base S5P FIMC0 resource and device definitions
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/kernel.h>
+#include <linux/platform_device.h>
+#include <linux/interrupt.h>
+#include <linux/ioport.h>
+#include <mach/map.h>
+
+static struct resource s5p_fimc0_resource[] = {
+	[0] = {
+		.start	= S5P_PA_FIMC0,
+		.end	= S5P_PA_FIMC0 + SZ_1M - 1,
+		.flags	= IORESOURCE_MEM,
+	},
+	[1] = {
+		.start	= IRQ_FIMC0,
+		.end	= IRQ_FIMC0,
+		.flags	= IORESOURCE_IRQ,
+	},
+};
+
+struct platform_device s5p_device_fimc0 = {
+	.name		= "s5p-fimc",
+	.id		= 0,
+	.num_resources	= ARRAY_SIZE(s5p_fimc0_resource),
+	.resource	= s5p_fimc0_resource,
+};
diff --git a/arch/arm/plat-s5p/dev-fimc1.c b/arch/arm/plat-s5p/dev-fimc1.c
new file mode 100644
index 0000000..41bd698
--- /dev/null
+++ b/arch/arm/plat-s5p/dev-fimc1.c
@@ -0,0 +1,36 @@
+/* linux/arch/arm/plat-s5p/dev-fimc1.c
+ *
+ * Copyright (c) 2010 Samsung Electronics
+ *
+ * Base S5P FIMC1 resource and device definitions
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/kernel.h>
+#include <linux/platform_device.h>
+#include <linux/interrupt.h>
+#include <linux/ioport.h>
+#include <mach/map.h>
+
+static struct resource s5p_fimc1_resource[] = {
+	[0] = {
+		.start	= S5P_PA_FIMC1,
+		.end	= S5P_PA_FIMC1 + SZ_1M - 1,
+		.flags	= IORESOURCE_MEM,
+	},
+	[1] = {
+		.start	= IRQ_FIMC1,
+		.end	= IRQ_FIMC1,
+		.flags	= IORESOURCE_IRQ,
+	},
+};
+
+struct platform_device s5p_device_fimc1 = {
+	.name		= "s5p-fimc",
+	.id		= 1,
+	.num_resources	= ARRAY_SIZE(s5p_fimc1_resource),
+	.resource	= s5p_fimc1_resource,
+};
diff --git a/arch/arm/plat-s5p/dev-fimc2.c b/arch/arm/plat-s5p/dev-fimc2.c
new file mode 100644
index 0000000..dfddeda
--- /dev/null
+++ b/arch/arm/plat-s5p/dev-fimc2.c
@@ -0,0 +1,36 @@
+/* linux/arch/arm/plat-s5p/dev-fimc2.c
+ *
+ * Copyright (c) 2010 Samsung Electronics
+ *
+ * Base S5P FIMC2 resource and device definitions
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/kernel.h>
+#include <linux/platform_device.h>
+#include <linux/interrupt.h>
+#include <linux/ioport.h>
+#include <mach/map.h>
+
+static struct resource s5p_fimc2_resource[] = {
+	[0] = {
+		.start	= S5P_PA_FIMC2,
+		.end	= S5P_PA_FIMC2 + SZ_1M - 1,
+		.flags	= IORESOURCE_MEM,
+	},
+	[1] = {
+		.start	= IRQ_FIMC2,
+		.end	= IRQ_FIMC2,
+		.flags	= IORESOURCE_IRQ,
+	},
+};
+
+struct platform_device s5p_device_fimc2 = {
+	.name		= "s5p-fimc",
+	.id		= 2,
+	.num_resources	= ARRAY_SIZE(s5p_fimc2_resource),
+	.resource	= s5p_fimc2_resource,
+};
diff --git a/arch/arm/plat-samsung/include/plat/devs.h b/arch/arm/plat-samsung/include/plat/devs.h
index 4c31d32..85f6f23 100644
--- a/arch/arm/plat-samsung/include/plat/devs.h
+++ b/arch/arm/plat-samsung/include/plat/devs.h
@@ -104,6 +104,10 @@ extern struct platform_device s5pc100_device_iis2;
 
 extern struct platform_device samsung_device_keypad;
 
+extern struct platform_device s5p_device_fimc0;
+extern struct platform_device s5p_device_fimc1;
+extern struct platform_device s5p_device_fimc2;
+
 /* s3c2440 specific devices */
 
 #ifdef CONFIG_CPU_S3C2440
diff --git a/arch/arm/plat-samsung/include/plat/fimc-core.h b/arch/arm/plat-samsung/include/plat/fimc-core.h
new file mode 100644
index 0000000..c2ddd83
--- /dev/null
+++ b/arch/arm/plat-samsung/include/plat/fimc-core.h
@@ -0,0 +1,43 @@
+/*
+ * arch/arm/plat-samsung/include/plat/fimc-core.h
+ *
+ * Copyright 2010 Samsung Electronics Co., Ltd.
+ *	Sylwester Nawrocki <s.nawrocki@samsung.com>
+ *
+ * Samsung camera interface driver core functions
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+#ifndef __ASM_PLAT_FIMC_CORE_H
+#define __ASM_PLAT_FIMC_CORE_H __FILE__
+
+/*
+ * These functions are only for use with the core support code, such as
+ * the CPU-specific initialization code.
+ */
+
+/* Re-define device name to differentiate the subsystem in various SoCs. */
+static inline void s3c_fimc_setname(int id, char *name)
+{
+	switch (id) {
+#ifdef CONFIG_S5P_DEV_FIMC0
+	case 0:
+		s5p_device_fimc0.name = name;
+		break;
+#endif
+#ifdef CONFIG_S5P_DEV_FIMC1
+	case 1:
+		s5p_device_fimc1.name = name;
+		break;
+#endif
+#ifdef CONFIG_S5P_DEV_FIMC2
+	case 2:
+		s5p_device_fimc2.name = name;
+		break;
+#endif
+	}
+}
+
+#endif /* __ASM_PLAT_FIMC_CORE_H */
-- 
1.7.1.569.g6f426

[PATCH v5 3/8] ARM: Samsung: Add platform definitions and helpers for FIMC driver

[Kukjin Kim]

Marek Szyprowski wrote:
> 
> From: Sylwester Nawrocki <s.nawrocki@samsung.com>
> 
> FIMC (CAMIF) device is a camera interface embedded in S3C/S5P Samsung
> SOC series. It supports ITU-R BT.601/656 and MIPI-CSI2 standards,
> memory to memory operations, color conversion, resizing and rotation.
> 
> Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
> ---
> 
> Changes since v4:
> - addressed all minor style issues reported by Kukjin Kim
> 
> Changes since v3:
> - rebased onto latest kgene/for-next tree
> - new entries in map.h files has been sorted by the physicall address
> 
> I'm sending this patch on behalf of Sylwerster who is on holidays this
> week.
> 
> Best regards
> --
> Marek Szyprowski
> Samsung Poland R&D Center
> ---
>  arch/arm/mach-s5pc100/include/mach/map.h       |    7 ++++
>  arch/arm/mach-s5pv210/cpu.c                    |    5 +++
>  arch/arm/mach-s5pv210/include/mach/map.h       |    7 ++++
>  arch/arm/plat-s5p/Kconfig                      |   15 ++++++++
>  arch/arm/plat-s5p/Makefile                     |    5 +++
>  arch/arm/plat-s5p/dev-fimc0.c                  |   36
> ++++++++++++++++++++
>  arch/arm/plat-s5p/dev-fimc1.c                  |   36
> ++++++++++++++++++++
>  arch/arm/plat-s5p/dev-fimc2.c                  |   36
> ++++++++++++++++++++
>  arch/arm/plat-samsung/include/plat/devs.h      |    4 ++
>  arch/arm/plat-samsung/include/plat/fimc-core.h |   43
> ++++++++++++++++++++++++
>  10 files changed, 194 insertions(+), 0 deletions(-)
>  create mode 100644 arch/arm/plat-s5p/dev-fimc0.c
>  create mode 100644 arch/arm/plat-s5p/dev-fimc1.c
>  create mode 100644 arch/arm/plat-s5p/dev-fimc2.c
>  create mode 100644 arch/arm/plat-samsung/include/plat/fimc-core.h
> 
> diff --git a/arch/arm/mach-s5pc100/include/mach/map.h b/arch/arm/mach-
> s5pc100/include/mach/map.h
> index c018697..3abe7f5 100644
> --- a/arch/arm/mach-s5pc100/include/mach/map.h
> +++ b/arch/arm/mach-s5pc100/include/mach/map.h
> @@ -99,6 +99,10 @@
> 
>  #define S5PC100_PA_FB		(0xEE000000)
> 
> +#define S5PC100_PA_FIMC0	(0xEE200000)
> +#define S5PC100_PA_FIMC1	(0xEE300000)
> +#define S5PC100_PA_FIMC2	(0xEE400000)
> +
>  #define S5PC100_PA_I2S0		(0xF2000000)
>  #define S5PC100_PA_I2S1		(0xF2100000)
>  #define S5PC100_PA_I2S2		(0xF2200000)
> @@ -143,6 +147,9 @@
>  #define S3C_PA_ONENAND_BUF	S5PC100_PA_ONENAND_BUF
>  #define S3C_SZ_ONENAND_BUF	S5PC100_SZ_ONENAND_BUF
>  #define S3C_PA_RTC		S5PC100_PA_RTC
> +#define S5P_PA_FIMC0		S5PC100_PA_FIMC0
> +#define S5P_PA_FIMC1		S5PC100_PA_FIMC1
> +#define S5P_PA_FIMC2		S5PC100_PA_FIMC2
> 
>  #define SAMSUNG_PA_ADC		S5PC100_PA_TSADC
>  #define SAMSUNG_PA_CFCON	S5PC100_PA_CFCON
> diff --git a/arch/arm/mach-s5pv210/cpu.c b/arch/arm/mach-s5pv210/cpu.c
> index ea09c32..a7446d4 100644
> --- a/arch/arm/mach-s5pv210/cpu.c
> +++ b/arch/arm/mach-s5pv210/cpu.c
> @@ -37,6 +37,7 @@
>  #include <plat/iic-core.h>
>  #include <plat/keypad-core.h>
>  #include <plat/sdhci.h>
> +#include <plat/fimc-core.h>
>  #include <plat/reset.h>
> 
>  /* Initial IO mappings */
> @@ -104,6 +105,10 @@ void __init s5pv210_map_io(void)
> 
>  	/* Use s5pv210-keypad instead of samsung-keypad */
>  	samsung_keypad_setname("s5pv210-keypad");
> +
> +	s3c_fimc_setname(0, "s5pv210-fimc");
> +	s3c_fimc_setname(1, "s5pv210-fimc");
> +	s3c_fimc_setname(2, "s5pv210-fimc");
>  }
> 
>  void __init s5pv210_init_clocks(int xtal)
> diff --git a/arch/arm/mach-s5pv210/include/mach/map.h b/arch/arm/mach-
> s5pv210/include/mach/map.h
> index 986b285..dd4fb6b 100644
> --- a/arch/arm/mach-s5pv210/include/mach/map.h
> +++ b/arch/arm/mach-s5pv210/include/mach/map.h
> @@ -65,6 +65,10 @@
> 
>  #define S5PV210_PA_FB		(0xF8000000)
> 
> +#define S5PV210_PA_FIMC0	(0xFB200000)
> +#define S5PV210_PA_FIMC1	(0xFB300000)
> +#define S5PV210_PA_FIMC2	(0xFB400000)
> +
>  #define S5PV210_PA_HSMMC(x)	(0xEB000000 + ((x) * 0x100000))
> 
>  #define S5PV210_PA_VIC0		(0xF2000000)
> @@ -109,6 +113,9 @@
>  #define S3C_PA_FB		S5PV210_PA_FB
>  #define S3C_PA_RTC		S5PV210_PA_RTC
>  #define S3C_PA_WDT		S5PV210_PA_WATCHDOG
> +#define S5P_PA_FIMC0		S5PV210_PA_FIMC0
> +#define S5P_PA_FIMC1		S5PV210_PA_FIMC1
> +#define S5P_PA_FIMC2		S5PV210_PA_FIMC2
> 
>  #define SAMSUNG_PA_ADC		S5PV210_PA_ADC
>  #define SAMSUNG_PA_CFCON	S5PV210_PA_CFCON
> diff --git a/arch/arm/plat-s5p/Kconfig b/arch/arm/plat-s5p/Kconfig
> index 907ac63..66e40c8 100644
> --- a/arch/arm/plat-s5p/Kconfig
> +++ b/arch/arm/plat-s5p/Kconfig
> @@ -5,6 +5,21 @@
>  #
>  # Licensed under GPLv2
> 
> +config S5P_DEV_FIMC0
> +	bool
> +	help
> +	  Compile in platform device definitions for FIMC controller 0
> +
> +config S5P_DEV_FIMC1
> +	bool
> +	help
> +	  Compile in platform device definitions for FIMC controller 1
> +
> +config S5P_DEV_FIMC2
> +	bool
> +	help
> +	  Compile in platform device definitions for FIMC controller 2
> +
>  config PLAT_S5P
>  	bool
>  	depends on (ARCH_S5P6440 || ARCH_S5P6442 || ARCH_S5PC100 ||
> ARCH_S5PV210 || ARCH_S5PV310)
> diff --git a/arch/arm/plat-s5p/Makefile b/arch/arm/plat-s5p/Makefile
> index 7e34194..b2e0296 100644
> --- a/arch/arm/plat-s5p/Makefile
> +++ b/arch/arm/plat-s5p/Makefile
> @@ -19,3 +19,8 @@ obj-y				+= clock.o
>  obj-y				+= irq.o
>  obj-$(CONFIG_S5P_EXT_INT)	+= irq-eint.o
> 
> +# devices
> +
> +obj-$(CONFIG_S5P_DEV_FIMC0)	+= dev-fimc0.o
> +obj-$(CONFIG_S5P_DEV_FIMC1)	+= dev-fimc1.o
> +obj-$(CONFIG_S5P_DEV_FIMC2)	+= dev-fimc2.o
> diff --git a/arch/arm/plat-s5p/dev-fimc0.c b/arch/arm/plat-s5p/dev-fimc0.c
> new file mode 100644
> index 0000000..d3f1a9b
> --- /dev/null
> +++ b/arch/arm/plat-s5p/dev-fimc0.c
> @@ -0,0 +1,36 @@
> +/* linux/arch/arm/plat-s5p/dev-fimc0.c
> + *
> + * Copyright (c) 2010 Samsung Electronics
> + *
> + * Base S5P FIMC0 resource and device definitions
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License version 2 as
> + * published by the Free Software Foundation.
> + */
> +
> +#include <linux/kernel.h>
> +#include <linux/platform_device.h>
> +#include <linux/interrupt.h>
> +#include <linux/ioport.h>
> +#include <mach/map.h>
> +
> +static struct resource s5p_fimc0_resource[] = {
> +	[0] = {
> +		.start	= S5P_PA_FIMC0,
> +		.end	= S5P_PA_FIMC0 + SZ_1M - 1,
> +		.flags	= IORESOURCE_MEM,
> +	},
> +	[1] = {
> +		.start	= IRQ_FIMC0,
> +		.end	= IRQ_FIMC0,
> +		.flags	= IORESOURCE_IRQ,
> +	},
> +};
> +
> +struct platform_device s5p_device_fimc0 = {
> +	.name		= "s5p-fimc",
> +	.id		= 0,
> +	.num_resources	= ARRAY_SIZE(s5p_fimc0_resource),
> +	.resource	= s5p_fimc0_resource,
> +};
> diff --git a/arch/arm/plat-s5p/dev-fimc1.c b/arch/arm/plat-s5p/dev-fimc1.c
> new file mode 100644
> index 0000000..41bd698
> --- /dev/null
> +++ b/arch/arm/plat-s5p/dev-fimc1.c
> @@ -0,0 +1,36 @@
> +/* linux/arch/arm/plat-s5p/dev-fimc1.c
> + *
> + * Copyright (c) 2010 Samsung Electronics
> + *
> + * Base S5P FIMC1 resource and device definitions
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License version 2 as
> + * published by the Free Software Foundation.
> + */
> +
> +#include <linux/kernel.h>
> +#include <linux/platform_device.h>
> +#include <linux/interrupt.h>
> +#include <linux/ioport.h>
> +#include <mach/map.h>
> +
> +static struct resource s5p_fimc1_resource[] = {
> +	[0] = {
> +		.start	= S5P_PA_FIMC1,
> +		.end	= S5P_PA_FIMC1 + SZ_1M - 1,
> +		.flags	= IORESOURCE_MEM,
> +	},
> +	[1] = {
> +		.start	= IRQ_FIMC1,
> +		.end	= IRQ_FIMC1,
> +		.flags	= IORESOURCE_IRQ,
> +	},
> +};
> +
> +struct platform_device s5p_device_fimc1 = {
> +	.name		= "s5p-fimc",
> +	.id		= 1,
> +	.num_resources	= ARRAY_SIZE(s5p_fimc1_resource),
> +	.resource	= s5p_fimc1_resource,
> +};
> diff --git a/arch/arm/plat-s5p/dev-fimc2.c b/arch/arm/plat-s5p/dev-fimc2.c
> new file mode 100644
> index 0000000..dfddeda
> --- /dev/null
> +++ b/arch/arm/plat-s5p/dev-fimc2.c
> @@ -0,0 +1,36 @@
> +/* linux/arch/arm/plat-s5p/dev-fimc2.c
> + *
> + * Copyright (c) 2010 Samsung Electronics
> + *
> + * Base S5P FIMC2 resource and device definitions
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License version 2 as
> + * published by the Free Software Foundation.
> + */
> +
> +#include <linux/kernel.h>
> +#include <linux/platform_device.h>
> +#include <linux/interrupt.h>
> +#include <linux/ioport.h>
> +#include <mach/map.h>
> +
> +static struct resource s5p_fimc2_resource[] = {
> +	[0] = {
> +		.start	= S5P_PA_FIMC2,
> +		.end	= S5P_PA_FIMC2 + SZ_1M - 1,
> +		.flags	= IORESOURCE_MEM,
> +	},
> +	[1] = {
> +		.start	= IRQ_FIMC2,
> +		.end	= IRQ_FIMC2,
> +		.flags	= IORESOURCE_IRQ,
> +	},
> +};
> +
> +struct platform_device s5p_device_fimc2 = {
> +	.name		= "s5p-fimc",
> +	.id		= 2,
> +	.num_resources	= ARRAY_SIZE(s5p_fimc2_resource),
> +	.resource	= s5p_fimc2_resource,
> +};
> diff --git a/arch/arm/plat-samsung/include/plat/devs.h b/arch/arm/plat-
> samsung/include/plat/devs.h
> index 4c31d32..85f6f23 100644
> --- a/arch/arm/plat-samsung/include/plat/devs.h
> +++ b/arch/arm/plat-samsung/include/plat/devs.h
> @@ -104,6 +104,10 @@ extern struct platform_device s5pc100_device_iis2;
> 
>  extern struct platform_device samsung_device_keypad;
> 
> +extern struct platform_device s5p_device_fimc0;
> +extern struct platform_device s5p_device_fimc1;
> +extern struct platform_device s5p_device_fimc2;
> +
>  /* s3c2440 specific devices */
> 
>  #ifdef CONFIG_CPU_S3C2440
> diff --git a/arch/arm/plat-samsung/include/plat/fimc-core.h
b/arch/arm/plat-
> samsung/include/plat/fimc-core.h
> new file mode 100644
> index 0000000..c2ddd83
> --- /dev/null
> +++ b/arch/arm/plat-samsung/include/plat/fimc-core.h
> @@ -0,0 +1,43 @@
> +/*
> + * arch/arm/plat-samsung/include/plat/fimc-core.h
> + *
> + * Copyright 2010 Samsung Electronics Co., Ltd.
> + *	Sylwester Nawrocki <s.nawrocki@samsung.com>
> + *
> + * Samsung camera interface driver core functions
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License version 2 as
> + * published by the Free Software Foundation.
> + */
> +#ifndef __ASM_PLAT_FIMC_CORE_H
> +#define __ASM_PLAT_FIMC_CORE_H __FILE__
> +
> +/*
> + * These functions are only for use with the core support code, such as
> + * the CPU-specific initialization code.
> + */
> +
> +/* Re-define device name to differentiate the subsystem in various SoCs.
*/
> +static inline void s3c_fimc_setname(int id, char *name)
> +{
> +	switch (id) {
> +#ifdef CONFIG_S5P_DEV_FIMC0
> +	case 0:
> +		s5p_device_fimc0.name = name;
> +		break;
> +#endif
> +#ifdef CONFIG_S5P_DEV_FIMC1
> +	case 1:
> +		s5p_device_fimc1.name = name;
> +		break;
> +#endif
> +#ifdef CONFIG_S5P_DEV_FIMC2
> +	case 2:
> +		s5p_device_fimc2.name = name;
> +		break;
> +#endif
> +	}
> +}
> +
> +#endif /* __ASM_PLAT_FIMC_CORE_H */
> --
Looks ok..will apply.

Thanks.

Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.

[PATCH v3 4/8] ARM: Samsung: Add common Aquila and GONI code

[Sylwester Nawrocki]

Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Pawel Osciak <p.osciak@samsung.com>
---
 arch/arm/mach-s5pv210/Kconfig              |    5 ++++
 arch/arm/mach-s5pv210/Makefile             |    2 +
 arch/arm/mach-s5pv210/common-aquila-goni.c |   35 ++++++++++++++++++++++++++++
 arch/arm/mach-s5pv210/common-aquila-goni.h |    2 +
 4 files changed, 44 insertions(+), 0 deletions(-)
 create mode 100644 arch/arm/mach-s5pv210/common-aquila-goni.c
 create mode 100644 arch/arm/mach-s5pv210/common-aquila-goni.h

diff --git a/arch/arm/mach-s5pv210/Kconfig b/arch/arm/mach-s5pv210/Kconfig
index 12a2c6b..039ba8c 100644
--- a/arch/arm/mach-s5pv210/Kconfig
+++ b/arch/arm/mach-s5pv210/Kconfig
@@ -90,6 +90,11 @@ config MACH_SMDKC110
 
 endmenu
 
+config COMMON_AQUILA_GONI
+	bool
+	help
+	  Compile common code for Samsung Aquila and Samsung GONI machines
+
 config S5PC110_DEV_ONENAND
 	bool
 	help
diff --git a/arch/arm/mach-s5pv210/Makefile b/arch/arm/mach-s5pv210/Makefile
index 05048c5..a4c0bc9 100644
--- a/arch/arm/mach-s5pv210/Makefile
+++ b/arch/arm/mach-s5pv210/Makefile
@@ -22,6 +22,8 @@ obj-$(CONFIG_MACH_SMDKV210)	+= mach-smdkv210.o
 obj-$(CONFIG_MACH_SMDKC110)	+= mach-smdkc110.o
 obj-$(CONFIG_MACH_GONI)		+= mach-goni.o
 
+obj-$(CONFIG_COMMON_AQUILA_GONI)	+= common-aquila-goni.o
+
 # device support
 
 obj-y				+= dev-audio.o
diff --git a/arch/arm/mach-s5pv210/common-aquila-goni.c b/arch/arm/mach-s5pv210/common-aquila-goni.c
new file mode 100644
index 0000000..4d72531
--- /dev/null
+++ b/arch/arm/mach-s5pv210/common-aquila-goni.c
@@ -0,0 +1,35 @@
+#include <linux/clk.h>
+#include <linux/err.h>
+#include <plat/fimc.h>
+
+#include "common-aquila-goni.h"
+
+void __init s5pv210_common_fimc_clk_init(void)
+{
+	int i;
+	struct clk *clk_fimc, *parent;
+
+	struct device *fimc_devs[] = {
+		&s5p_device_fimc0.dev,
+		&s5p_device_fimc1.dev,
+		&s5p_device_fimc2.dev
+	};
+
+	parent = clk_get(NULL, "mout_epll");
+	if (IS_ERR(parent))
+		return;
+
+	for (i = 0; i < ARRAY_SIZE(fimc_devs); i++) {
+		if (fimc_devs[i]) {
+			clk_fimc = clk_get(fimc_devs[i], "sclk_fimc");
+
+			if (IS_ERR(clk_fimc))
+				continue;
+
+			clk_set_parent(clk_fimc, parent);
+			clk_set_rate(clk_fimc, 133000000);
+			clk_enable(clk_fimc);
+		}
+	}
+	clk_put(parent);
+}
diff --git a/arch/arm/mach-s5pv210/common-aquila-goni.h b/arch/arm/mach-s5pv210/common-aquila-goni.h
new file mode 100644
index 0000000..f666462
--- /dev/null
+++ b/arch/arm/mach-s5pv210/common-aquila-goni.h
@@ -0,0 +1,2 @@
+
+extern void s5pv210_common_fimc_clk_init(void);
-- 
1.7.2

[PATCH v3 4/8] ARM: Samsung: Add common Aquila and GONI code

[Kukjin Kim]

Sylwester Nawrocki wrote:
> 
Hi Sylwester,

Hmm...no comments here?

> Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
> Signed-off-by: Pawel Osciak <p.osciak@samsung.com>

I wonder we need really above multiple sign for this, just only one c file?

> ---
>  arch/arm/mach-s5pv210/Kconfig              |    5 ++++
>  arch/arm/mach-s5pv210/Makefile             |    2 +
>  arch/arm/mach-s5pv210/common-aquila-goni.c |   35
> ++++++++++++++++++++++++++++
>  arch/arm/mach-s5pv210/common-aquila-goni.h |    2 +
>  4 files changed, 44 insertions(+), 0 deletions(-)
>  create mode 100644 arch/arm/mach-s5pv210/common-aquila-goni.c
>  create mode 100644 arch/arm/mach-s5pv210/common-aquila-goni.h
> 
> diff --git a/arch/arm/mach-s5pv210/Kconfig b/arch/arm/mach-s5pv210/Kconfig
> index 12a2c6b..039ba8c 100644
> --- a/arch/arm/mach-s5pv210/Kconfig
> +++ b/arch/arm/mach-s5pv210/Kconfig
> @@ -90,6 +90,11 @@ config MACH_SMDKC110
> 
>  endmenu
> 
> +config COMMON_AQUILA_GONI

do we _really_ need this?

> +	bool
> +	help
> +	  Compile common code for Samsung Aquila and Samsung GONI
> machines
> +
>  config S5PC110_DEV_ONENAND
>  	bool
>  	help
> diff --git a/arch/arm/mach-s5pv210/Makefile
b/arch/arm/mach-s5pv210/Makefile
> index 05048c5..a4c0bc9 100644
> --- a/arch/arm/mach-s5pv210/Makefile
> +++ b/arch/arm/mach-s5pv210/Makefile
> @@ -22,6 +22,8 @@ obj-$(CONFIG_MACH_SMDKV210)	+= mach-
> smdkv210.o
>  obj-$(CONFIG_MACH_SMDKC110)	+= mach-smdkc110.o
>  obj-$(CONFIG_MACH_GONI)		+= mach-goni.o
> 
> +obj-$(CONFIG_COMMON_AQUILA_GONI)	+= common-aquila-goni.o
> +
>  # device support
> 
>  obj-y				+= dev-audio.o
> diff --git a/arch/arm/mach-s5pv210/common-aquila-goni.c b/arch/arm/mach-
> s5pv210/common-aquila-goni.c
> new file mode 100644
> index 0000000..4d72531
> --- /dev/null
> +++ b/arch/arm/mach-s5pv210/common-aquila-goni.c

Just setup-fimc.c is enough...
I don't know why we need common-aquila-goni now.

And your following patches in this patch-set perfectly same except just
name.
[PATCH v3 5/8] ARM: s5pv210: enable FIMC on Aquila
[PATCH v3 6/8] ARM: s5pv210: enable FIMC on Goni

Hmm...

> @@ -0,0 +1,35 @@
> +#include <linux/clk.h>
> +#include <linux/err.h>
> +#include <plat/fimc.h>
> +
> +#include "common-aquila-goni.h"
> +
> +void __init s5pv210_common_fimc_clk_init(void)
> +{
> +	int i;
> +	struct clk *clk_fimc, *parent;
> +
> +	struct device *fimc_devs[] = {
> +		&s5p_device_fimc0.dev,
> +		&s5p_device_fimc1.dev,
> +		&s5p_device_fimc2.dev
> +	};
> +
> +	parent = clk_get(NULL, "mout_epll");
> +	if (IS_ERR(parent))
> +		return;
> +
> +	for (i = 0; i < ARRAY_SIZE(fimc_devs); i++) {
> +		if (fimc_devs[i]) {
> +			clk_fimc = clk_get(fimc_devs[i], "sclk_fimc");
> +
> +			if (IS_ERR(clk_fimc))
> +				continue;
> +
> +			clk_set_parent(clk_fimc, parent);
> +			clk_set_rate(clk_fimc, 133000000);

Is this for direct fifo mode?

> +			clk_enable(clk_fimc);
> +		}
> +	}
> +	clk_put(parent);
> +}
> diff --git a/arch/arm/mach-s5pv210/common-aquila-goni.h b/arch/arm/mach-
> s5pv210/common-aquila-goni.h
> new file mode 100644
> index 0000000..f666462
> --- /dev/null
> +++ b/arch/arm/mach-s5pv210/common-aquila-goni.h
> @@ -0,0 +1,2 @@
> +
> +extern void s5pv210_common_fimc_clk_init(void);
> --

I do not think that we need common-aquila-goni.[ch] now to us.

Thanks.

Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.

[PATCH v3 4/8] ARM: Samsung: Add common Aquila and GONI code

[Pawel Osciak]

Hello,

>Kukjin Kim <kgene.kim@samsung.com> wrote:
>Sylwester Nawrocki wrote:
>>
>Hi Sylwester,
>
>Hmm...no comments here?
>
>> Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
>> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
>> Signed-off-by: Pawel Osciak <p.osciak@samsung.com>
>
>I wonder we need really above multiple sign for this, just only one c file?
>

Sylwester is the main author, I am also the author of this, although I agree
it is a small patch. Mr. Park is here as the person that gives the permission
for the patches to be published under GPL.

>> ---
>>  arch/arm/mach-s5pv210/Kconfig              |    5 ++++
>>  arch/arm/mach-s5pv210/Makefile             |    2 +
>>  arch/arm/mach-s5pv210/common-aquila-goni.c |   35
>> ++++++++++++++++++++++++++++
>>  arch/arm/mach-s5pv210/common-aquila-goni.h |    2 +
>>  4 files changed, 44 insertions(+), 0 deletions(-)
>>  create mode 100644 arch/arm/mach-s5pv210/common-aquila-goni.c
>>  create mode 100644 arch/arm/mach-s5pv210/common-aquila-goni.h
>>
>> diff --git a/arch/arm/mach-s5pv210/Kconfig b/arch/arm/mach-s5pv210/Kconfig
>> index 12a2c6b..039ba8c 100644
>> --- a/arch/arm/mach-s5pv210/Kconfig
>> +++ b/arch/arm/mach-s5pv210/Kconfig
>> @@ -90,6 +90,11 @@ config MACH_SMDKC110
>>
>>  endmenu
>>
>> +config COMMON_AQUILA_GONI
>
>do we _really_ need this?
>

The alternative is to have identical code in both Aquila and Goni files.

>> +	bool
>> +	help
>> +	  Compile common code for Samsung Aquila and Samsung GONI
>> machines
>> +
>>  config S5PC110_DEV_ONENAND
>>  	bool
>>  	help
>> diff --git a/arch/arm/mach-s5pv210/Makefile
>b/arch/arm/mach-s5pv210/Makefile
>> index 05048c5..a4c0bc9 100644
>> --- a/arch/arm/mach-s5pv210/Makefile
>> +++ b/arch/arm/mach-s5pv210/Makefile
>> @@ -22,6 +22,8 @@ obj-$(CONFIG_MACH_SMDKV210)	+= mach-
>> smdkv210.o
>>  obj-$(CONFIG_MACH_SMDKC110)	+= mach-smdkc110.o
>>  obj-$(CONFIG_MACH_GONI)		+= mach-goni.o
>>
>> +obj-$(CONFIG_COMMON_AQUILA_GONI)	+= common-aquila-goni.o
>> +
>>  # device support
>>
>>  obj-y				+= dev-audio.o
>> diff --git a/arch/arm/mach-s5pv210/common-aquila-goni.c b/arch/arm/mach-
>> s5pv210/common-aquila-goni.c
>> new file mode 100644
>> index 0000000..4d72531
>> --- /dev/null
>> +++ b/arch/arm/mach-s5pv210/common-aquila-goni.c
>
>Just setup-fimc.c is enough...
>I don't know why we need common-aquila-goni now.
>

The alternative was to have identical clock setup code in both mach-aquila
and mach-goni files.

>And your following patches in this patch-set perfectly same except just
>name.
>[PATCH v3 5/8] ARM: s5pv210: enable FIMC on Aquila
>[PATCH v3 6/8] ARM: s5pv210: enable FIMC on Goni
>
>Hmm...
>

One is for Aquila and one is for Goni, sorry, I don't understand what do
you mean here... Would you prefer them to be combined into one patch?

>> @@ -0,0 +1,35 @@
>> +#include <linux/clk.h>
>> +#include <linux/err.h>
>> +#include <plat/fimc.h>
>> +
>> +#include "common-aquila-goni.h"
>> +
>> +void __init s5pv210_common_fimc_clk_init(void)
>> +{
>> +	int i;
>> +	struct clk *clk_fimc, *parent;
>> +
>> +	struct device *fimc_devs[] = {
>> +		&s5p_device_fimc0.dev,
>> +		&s5p_device_fimc1.dev,
>> +		&s5p_device_fimc2.dev
>> +	};
>> +
>> +	parent = clk_get(NULL, "mout_epll");
>> +	if (IS_ERR(parent))
>> +		return;
>> +
>> +	for (i = 0; i < ARRAY_SIZE(fimc_devs); i++) {
>> +		if (fimc_devs[i]) {
>> +			clk_fimc = clk_get(fimc_devs[i], "sclk_fimc");
>> +
>> +			if (IS_ERR(clk_fimc))
>> +				continue;
>> +
>> +			clk_set_parent(clk_fimc, parent);
>> +			clk_set_rate(clk_fimc, 133000000);
>
>Is this for direct fifo mode?
>

Bootloader is not setting up clocks correctly and defaults do not work.
It's not only for fifo, fimc doesn't work at all without this.

>> +			clk_enable(clk_fimc);
>> +		}
>> +	}
>> +	clk_put(parent);
>> +}
>> diff --git a/arch/arm/mach-s5pv210/common-aquila-goni.h b/arch/arm/mach-
>> s5pv210/common-aquila-goni.h
>> new file mode 100644
>> index 0000000..f666462
>> --- /dev/null
>> +++ b/arch/arm/mach-s5pv210/common-aquila-goni.h
>> @@ -0,0 +1,2 @@
>> +
>> +extern void s5pv210_common_fimc_clk_init(void);
>> --
>
>I do not think that we need common-aquila-goni.[ch] now to us.
>

What would you propose as the alternative? Have duplicate code in both machine
files?


Best regards
--
Pawel Osciak
Linux Platform Group
Samsung Poland R&D Center

[PATCH v3 4/8] ARM: Samsung: Add common Aquila and GONI code

[Kukjin Kim]

Pawel Osciak wrote:
> 
> Hello,
> 
> >Kukjin Kim <kgene.kim@samsung.com> wrote:
> >Sylwester Nawrocki wrote:
> >>
> >Hi Sylwester,
> >
> >Hmm...no comments here?
> >
> >> Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
> >> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
> >> Signed-off-by: Pawel Osciak <p.osciak@samsung.com>
> >
> >I wonder we need really above multiple sign for this, just only one c file?
> >
> 
> Sylwester is the main author, I am also the author of this, although I agree
> it is a small patch. Mr. Park is here as the person that gives the permission
> for the patches to be published under GPL.
> 
...

> >> ---
> >>  arch/arm/mach-s5pv210/Kconfig              |    5 ++++
> >>  arch/arm/mach-s5pv210/Makefile             |    2 +
> >>  arch/arm/mach-s5pv210/common-aquila-goni.c |   35
> >> ++++++++++++++++++++++++++++
> >>  arch/arm/mach-s5pv210/common-aquila-goni.h |    2 +
> >>  4 files changed, 44 insertions(+), 0 deletions(-)
> >>  create mode 100644 arch/arm/mach-s5pv210/common-aquila-goni.c
> >>  create mode 100644 arch/arm/mach-s5pv210/common-aquila-goni.h
> >>
> >> diff --git a/arch/arm/mach-s5pv210/Kconfig b/arch/arm/mach-s5pv210/Kconfig
> >> index 12a2c6b..039ba8c 100644
> >> --- a/arch/arm/mach-s5pv210/Kconfig
> >> +++ b/arch/arm/mach-s5pv210/Kconfig
> >> @@ -90,6 +90,11 @@ config MACH_SMDKC110
> >>
> >>  endmenu
> >>
> >> +config COMMON_AQUILA_GONI
> >
> >do we _really_ need this?
> >
> 
> The alternative is to have identical code in both Aquila and Goni files.
> 
I mean this is just for fimc clock setting...this is not only for Auqila and GONI machines even though need to update to be used in other machines.

> >> +	bool
> >> +	help
> >> +	  Compile common code for Samsung Aquila and Samsung GONI
> >> machines
> >> +
> >>  config S5PC110_DEV_ONENAND
> >>  	bool
> >>  	help
> >> diff --git a/arch/arm/mach-s5pv210/Makefile
> >b/arch/arm/mach-s5pv210/Makefile
> >> index 05048c5..a4c0bc9 100644
> >> --- a/arch/arm/mach-s5pv210/Makefile
> >> +++ b/arch/arm/mach-s5pv210/Makefile
> >> @@ -22,6 +22,8 @@ obj-$(CONFIG_MACH_SMDKV210)	+= mach-
> >> smdkv210.o
> >>  obj-$(CONFIG_MACH_SMDKC110)	+= mach-smdkc110.o
> >>  obj-$(CONFIG_MACH_GONI)		+= mach-goni.o
> >>
> >> +obj-$(CONFIG_COMMON_AQUILA_GONI)	+= common-aquila-goni.o
> >> +
> >>  # device support
> >>
> >>  obj-y				+= dev-audio.o
> >> diff --git a/arch/arm/mach-s5pv210/common-aquila-goni.c b/arch/arm/mach-
> >> s5pv210/common-aquila-goni.c
> >> new file mode 100644
> >> index 0000000..4d72531
> >> --- /dev/null
> >> +++ b/arch/arm/mach-s5pv210/common-aquila-goni.c
> >
> >Just setup-fimc.c is enough...
> >I don't know why we need common-aquila-goni now.
> >
> 
> The alternative was to have identical clock setup code in both mach-aquila
> and mach-goni files.
> 
It's possible in setup-fimc.c

> >And your following patches in this patch-set perfectly same except just
> >name.
> >[PATCH v3 5/8] ARM: s5pv210: enable FIMC on Aquila
> >[PATCH v3 6/8] ARM: s5pv210: enable FIMC on Goni
> >
> >Hmm...
> >
> 
> One is for Aquila and one is for Goni, sorry, I don't understand what do
> you mean here... Would you prefer them to be combined into one patch?
> 
> >> @@ -0,0 +1,35 @@
> >> +#include <linux/clk.h>
> >> +#include <linux/err.h>
> >> +#include <plat/fimc.h>
> >> +
> >> +#include "common-aquila-goni.h"
> >> +
> >> +void __init s5pv210_common_fimc_clk_init(void)
> >> +{
> >> +	int i;
> >> +	struct clk *clk_fimc, *parent;
> >> +
> >> +	struct device *fimc_devs[] = {
> >> +		&s5p_device_fimc0.dev,
> >> +		&s5p_device_fimc1.dev,
> >> +		&s5p_device_fimc2.dev
> >> +	};
> >> +
> >> +	parent = clk_get(NULL, "mout_epll");

Is not there in case of using 'mout_mpll' as parent clock?

> >> +	if (IS_ERR(parent))
> >> +		return;
> >> +
> >> +	for (i = 0; i < ARRAY_SIZE(fimc_devs); i++) {
> >> +		if (fimc_devs[i]) {
> >> +			clk_fimc = clk_get(fimc_devs[i], "sclk_fimc");
> >> +
> >> +			if (IS_ERR(clk_fimc))
> >> +				continue;
> >> +
> >> +			clk_set_parent(clk_fimc, parent);
> >> +			clk_set_rate(clk_fimc, 133000000);
> >
> >Is this for direct fifo mode?
> >
> 
> Bootloader is not setting up clocks correctly and defaults do not work.
> It's not only for fifo, fimc doesn't work at all without this.
> 
> >> +			clk_enable(clk_fimc);

Should being in driver...I don't know why we should enable fimc clock in here.
Basically, each driver clock should be enabled in each drivers...

> >> +		}
> >> +	}
> >> +	clk_put(parent);
> >> +}
> >> diff --git a/arch/arm/mach-s5pv210/common-aquila-goni.h b/arch/arm/mach-
> >> s5pv210/common-aquila-goni.h
> >> new file mode 100644
> >> index 0000000..f666462
> >> --- /dev/null
> >> +++ b/arch/arm/mach-s5pv210/common-aquila-goni.h
> >> @@ -0,0 +1,2 @@
> >> +
> >> +extern void s5pv210_common_fimc_clk_init(void);

If this is only for Aquila and GONI, should be common_aquila_goni_fimc_clk_init().
But it's quite long :-( ... anyway, as I said, I don't think this is only for Aquila and GONI.

> >> --
> >
> >I do not think that we need common-aquila-goni.[ch] now to us.
> >
> 
> What would you propose as the alternative? Have duplicate code in both machine
> files?
> 
setup-fimc.c, but need to sort it out so that all machines can use that.

Thanks.

Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.

[PATCH v3 5/8] ARM: s5pv210: enable FIMC on Aquila

[Sylwester Nawrocki]

Add support for FIMC on Samsung Aquila board.

Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
---
 arch/arm/mach-s5pv210/Kconfig       |    4 ++++
 arch/arm/mach-s5pv210/mach-aquila.c |    7 +++++++
 2 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-s5pv210/Kconfig b/arch/arm/mach-s5pv210/Kconfig
index 039ba8c..b81b91b 100644
--- a/arch/arm/mach-s5pv210/Kconfig
+++ b/arch/arm/mach-s5pv210/Kconfig
@@ -58,9 +58,13 @@ menu "S5PC110 Machines"
 config MACH_AQUILA
 	bool "Aquila"
 	select CPU_S5PV210
+	select COMMON_AQUILA_GONI
 	select ARCH_SPARSEMEM_ENABLE
 	select S5PV210_SETUP_FB_24BPP
 	select S3C_DEV_FB
+	select S5P_DEV_FIMC0
+	select S5P_DEV_FIMC1
+	select S5P_DEV_FIMC2
 	select S5PC110_DEV_ONENAND
 	help
 	  Machine support for the Samsung Aquila target based on S5PC110 SoC
diff --git a/arch/arm/mach-s5pv210/mach-aquila.c b/arch/arm/mach-s5pv210/mach-aquila.c
index 0992618..7528514 100644
--- a/arch/arm/mach-s5pv210/mach-aquila.c
+++ b/arch/arm/mach-s5pv210/mach-aquila.c
@@ -35,6 +35,9 @@
 #include <plat/devs.h>
 #include <plat/cpu.h>
 #include <plat/fb.h>
+#include <plat/fimc.h>
+
+#include "common-aquila-goni.h"
 
 /* Following are default values for UCON, ULCON and UFCON UART registers */
 #define S5PV210_UCON_DEFAULT	(S3C2410_UCON_TXILEVEL |	\
@@ -445,6 +448,9 @@ static struct platform_device *aquila_devices[] __initdata = {
 	&aquila_device_gpiokeys,
 	&s3c_device_fb,
 	&s5pc110_device_onenand,
+	&s5p_device_fimc0,
+	&s5p_device_fimc1,
+	&s5p_device_fimc2,
 };
 
 static void __init aquila_map_io(void)
@@ -465,6 +471,7 @@ static void __init aquila_machine_init(void)
 	s3c_fb_set_platdata(&aquila_lcd_pdata);
 
 	platform_add_devices(aquila_devices, ARRAY_SIZE(aquila_devices));
+	s5pv210_common_fimc_clk_init();
 }
 
 MACHINE_START(AQUILA, "Aquila")
-- 
1.7.2

[PATCH v3 5/8] ARM: s5pv210: enable FIMC on Aquila

[Kukjin Kim]

Sylwester Nawrocki wrote:
> 
> Add support for FIMC on Samsung Aquila board.
> 
> Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
> ---
>  arch/arm/mach-s5pv210/Kconfig       |    4 ++++
>  arch/arm/mach-s5pv210/mach-aquila.c |    7 +++++++
>  2 files changed, 11 insertions(+), 0 deletions(-)
> 
> diff --git a/arch/arm/mach-s5pv210/Kconfig b/arch/arm/mach-s5pv210/Kconfig
> index 039ba8c..b81b91b 100644
> --- a/arch/arm/mach-s5pv210/Kconfig
> +++ b/arch/arm/mach-s5pv210/Kconfig
> @@ -58,9 +58,13 @@ menu "S5PC110 Machines"
>  config MACH_AQUILA
>  	bool "Aquila"
>  	select CPU_S5PV210
> +	select COMMON_AQUILA_GONI

...

>  	select ARCH_SPARSEMEM_ENABLE
>  	select S5PV210_SETUP_FB_24BPP
>  	select S3C_DEV_FB
> +	select S5P_DEV_FIMC0
> +	select S5P_DEV_FIMC1
> +	select S5P_DEV_FIMC2
>  	select S5PC110_DEV_ONENAND
>  	help
>  	  Machine support for the Samsung Aquila target based on S5PC110
> SoC
> diff --git a/arch/arm/mach-s5pv210/mach-aquila.c
b/arch/arm/mach-s5pv210/mach-
> aquila.c
> index 0992618..7528514 100644
> --- a/arch/arm/mach-s5pv210/mach-aquila.c
> +++ b/arch/arm/mach-s5pv210/mach-aquila.c
> @@ -35,6 +35,9 @@
>  #include <plat/devs.h>
>  #include <plat/cpu.h>
>  #include <plat/fb.h>
> +#include <plat/fimc.h>
> +
> +#include "common-aquila-goni.h"

Hmm...please refer to my another comment.

> 
>  /* Following are default values for UCON, ULCON and UFCON UART registers
*/
>  #define S5PV210_UCON_DEFAULT	(S3C2410_UCON_TXILEVEL |	\
> @@ -445,6 +448,9 @@ static struct platform_device *aquila_devices[]
__initdata =
> {
>  	&aquila_device_gpiokeys,
>  	&s3c_device_fb,
>  	&s5pc110_device_onenand,
> +	&s5p_device_fimc0,
> +	&s5p_device_fimc1,
> +	&s5p_device_fimc2,
>  };
> 
>  static void __init aquila_map_io(void)
> @@ -465,6 +471,7 @@ static void __init aquila_machine_init(void)
>  	s3c_fb_set_platdata(&aquila_lcd_pdata);
> 
>  	platform_add_devices(aquila_devices, ARRAY_SIZE(aquila_devices));
> +	s5pv210_common_fimc_clk_init();

Hmm...really need this fimc_clk_init here not driver?

>  }
> 
>  MACHINE_START(AQUILA, "Aquila")
> --


Thanks.

Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.

[PATCH v3 5/8] ARM: s5pv210: enable FIMC on Aquila

[Pawel Osciak]

Hello,

>Kukjin Kim <kgene.kim@samsung.com> wrote:
>Sylwester Nawrocki wrote:
>>
>> Add support for FIMC on Samsung Aquila board.
>>
>> Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
>> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
>> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
>> ---
>>  arch/arm/mach-s5pv210/Kconfig       |    4 ++++
>>  arch/arm/mach-s5pv210/mach-aquila.c |    7 +++++++
>>  2 files changed, 11 insertions(+), 0 deletions(-)
>>
>> diff --git a/arch/arm/mach-s5pv210/Kconfig b/arch/arm/mach-s5pv210/Kconfig
>> index 039ba8c..b81b91b 100644
>> --- a/arch/arm/mach-s5pv210/Kconfig
>> +++ b/arch/arm/mach-s5pv210/Kconfig
>> @@ -58,9 +58,13 @@ menu "S5PC110 Machines"
>>  config MACH_AQUILA
>>  	bool "Aquila"
>>  	select CPU_S5PV210
>> +	select COMMON_AQUILA_GONI
>
>...
>

Please see my previous comments.

>>  	select ARCH_SPARSEMEM_ENABLE
>>  	select S5PV210_SETUP_FB_24BPP
>>  	select S3C_DEV_FB
>> +	select S5P_DEV_FIMC0
>> +	select S5P_DEV_FIMC1
>> +	select S5P_DEV_FIMC2
>>  	select S5PC110_DEV_ONENAND
>>  	help
>>  	  Machine support for the Samsung Aquila target based on S5PC110
>> SoC
>> diff --git a/arch/arm/mach-s5pv210/mach-aquila.c
>b/arch/arm/mach-s5pv210/mach-
>> aquila.c
>> index 0992618..7528514 100644
>> --- a/arch/arm/mach-s5pv210/mach-aquila.c
>> +++ b/arch/arm/mach-s5pv210/mach-aquila.c
>> @@ -35,6 +35,9 @@
>>  #include <plat/devs.h>
>>  #include <plat/cpu.h>
>>  #include <plat/fb.h>
>> +#include <plat/fimc.h>
>> +
>> +#include "common-aquila-goni.h"
>
>Hmm...please refer to my another comment.
>

Ditto.

>>
>>  /* Following are default values for UCON, ULCON and UFCON UART registers
>*/
>>  #define S5PV210_UCON_DEFAULT	(S3C2410_UCON_TXILEVEL |	\
>> @@ -445,6 +448,9 @@ static struct platform_device *aquila_devices[]
>__initdata =
>> {
>>  	&aquila_device_gpiokeys,
>>  	&s3c_device_fb,
>>  	&s5pc110_device_onenand,
>> +	&s5p_device_fimc0,
>> +	&s5p_device_fimc1,
>> +	&s5p_device_fimc2,
>>  };
>>
>>  static void __init aquila_map_io(void)
>> @@ -465,6 +471,7 @@ static void __init aquila_machine_init(void)
>>  	s3c_fb_set_platdata(&aquila_lcd_pdata);
>>
>>  	platform_add_devices(aquila_devices, ARRAY_SIZE(aquila_devices));
>> +	s5pv210_common_fimc_clk_init();
>
>Hmm...really need this fimc_clk_init here not driver?
>

I believe that the whole idea is that drivers should not be involved in
clocks setup, especially in setting up source parameters...


Best regards
--
Pawel Osciak
Linux Platform Group
Samsung Poland R&D Center

[PATCH v3 6/8] ARM: s5pv210: enable FIMC on Goni

[Sylwester Nawrocki]

Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Pawel Osciak <p.osciak@samsung.com>
---
 arch/arm/mach-s5pv210/Kconfig     |    4 ++++
 arch/arm/mach-s5pv210/mach-goni.c |    7 +++++++
 2 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-s5pv210/Kconfig b/arch/arm/mach-s5pv210/Kconfig
index b81b91b..51e2d73 100644
--- a/arch/arm/mach-s5pv210/Kconfig
+++ b/arch/arm/mach-s5pv210/Kconfig
@@ -72,9 +72,13 @@ config MACH_AQUILA
 config MACH_GONI
 	bool "GONI"
 	select CPU_S5PV210
+	select COMMON_AQUILA_GONI
 	select ARCH_SPARSEMEM_ENABLE
 	select S5PV210_SETUP_FB_24BPP
 	select S3C_DEV_FB
+	select S5P_DEV_FIMC0
+	select S5P_DEV_FIMC1
+	select S5P_DEV_FIMC2
 	select S5PC110_DEV_ONENAND
 	help
 	  Machine support for Samsung GONI board
diff --git a/arch/arm/mach-s5pv210/mach-goni.c b/arch/arm/mach-s5pv210/mach-goni.c
index 7b18505..1659217 100644
--- a/arch/arm/mach-s5pv210/mach-goni.c
+++ b/arch/arm/mach-s5pv210/mach-goni.c
@@ -35,6 +35,9 @@
 #include <plat/devs.h>
 #include <plat/cpu.h>
 #include <plat/fb.h>
+#include <plat/fimc.h>
+
+#include "common-aquila-goni.h"
 
 /* Following are default values for UCON, ULCON and UFCON UART registers */
 #define S5PV210_UCON_DEFAULT	(S3C2410_UCON_TXILEVEL |	\
@@ -426,6 +429,9 @@ static struct platform_device *goni_devices[] __initdata = {
 	&s5pc110_device_onenand,
 	&goni_i2c_gpio_pmic,
 	&goni_device_gpiokeys,
+	&s5p_device_fimc0,
+	&s5p_device_fimc1,
+	&s5p_device_fimc2,
 };
 
 static void __init goni_map_io(void)
@@ -445,6 +451,7 @@ static void __init goni_machine_init(void)
 	s3c_fb_set_platdata(&goni_lcd_pdata);
 
 	platform_add_devices(goni_devices, ARRAY_SIZE(goni_devices));
+	s5pv210_common_fimc_clk_init();
 }
 
 MACHINE_START(GONI, "GONI")
-- 
1.7.2

[PATCH v3 7/8] ARM: S5PC100: enable FIMC on SMDKC100

[Sylwester Nawrocki]

Add support for FIMC on Samsung SMDKC100 board.

Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
---
 arch/arm/mach-s5pc100/Kconfig         |    3 +++
 arch/arm/mach-s5pc100/mach-smdkc100.c |    4 ++++
 2 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-s5pc100/Kconfig b/arch/arm/mach-s5pc100/Kconfig
index cd7f4e9..6cc254c 100644
--- a/arch/arm/mach-s5pc100/Kconfig
+++ b/arch/arm/mach-s5pc100/Kconfig
@@ -65,6 +65,9 @@ config MACH_SMDKC100
 	select S5PC100_SETUP_IDE
 	select S5PC100_SETUP_KEYPAD
 	select S5PC100_SETUP_SDHCI
+	select S5P_DEV_FIMC0
+	select S5P_DEV_FIMC1
+	select S5P_DEV_FIMC2
 	help
 	  Machine support for the Samsung SMDKC100
 
diff --git a/arch/arm/mach-s5pc100/mach-smdkc100.c b/arch/arm/mach-s5pc100/mach-smdkc100.c
index a00dd09..53ea3c2 100644
--- a/arch/arm/mach-s5pc100/mach-smdkc100.c
+++ b/arch/arm/mach-s5pc100/mach-smdkc100.c
@@ -47,6 +47,7 @@
 #include <plat/adc.h>
 #include <plat/keypad.h>
 #include <plat/ts.h>
+#include <plat/fimc.h>
 
 /* Following are default values for UCON, ULCON and UFCON UART registers */
 #define S5PC100_UCON_DEFAULT	(S3C2410_UCON_TXILEVEL |	\
@@ -192,6 +193,9 @@ static struct platform_device *smdkc100_devices[] __initdata = {
 	&s5pc100_device_iis0,
 	&samsung_device_keypad,
 	&s5pc100_device_ac97,
+	&s5p_device_fimc0,
+	&s5p_device_fimc1,
+	&s5p_device_fimc2,
 };
 
 static struct s3c2410_ts_mach_info s3c_ts_platform __initdata = {
-- 
1.7.2

[PATCH v3 8/8] ARM: s5pv210: Override FIMC driver name on Aquila board

[Sylwester Nawrocki]

Change variant of the FIMC driver for compatibility with older
SoC version (EVT0) used on Aquila board.

Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
---
 arch/arm/mach-s5pv210/mach-aquila.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-s5pv210/mach-aquila.c b/arch/arm/mach-s5pv210/mach-aquila.c
index 7528514..c6cc3f5 100644
--- a/arch/arm/mach-s5pv210/mach-aquila.c
+++ b/arch/arm/mach-s5pv210/mach-aquila.c
@@ -36,6 +36,7 @@
 #include <plat/cpu.h>
 #include <plat/fb.h>
 #include <plat/fimc.h>
+#include <plat/fimc-core.h>
 
 #include "common-aquila-goni.h"
 
@@ -467,6 +468,10 @@ static void __init aquila_machine_init(void)
 	i2c_register_board_info(AP_I2C_GPIO_PMIC_BUS_4, i2c_gpio_pmic_devs,
 			ARRAY_SIZE(i2c_gpio_pmic_devs));
 
+	s3c_fimc_setname(0, "s5p-fimc");
+	s3c_fimc_setname(1, "s5p-fimc");
+	s3c_fimc_setname(2, "s5p-fimc");
+
 	/* FB */
 	s3c_fb_set_platdata(&aquila_lcd_pdata);
 
-- 
1.7.2