[media] s5p-mfc: Core support for MFC v7

Adds variant data and core support for the MFC v7 firmware

Change-Id: I5dc12438d3bfdf6d254f4ced3089e1881d524e0b
Signed-off-by: Arun Kumar K <arun.kk@samsung.com>
Signed-off-by: Kamil Debski <k.debski@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>

diff --git a/Documentation/devicetree/bindings/media/s5p-mfc.txt b/Documentation/devicetree/bindings/media/s5p-mfc.txt
index a1f6192..b7cbc4c 100644 (file)
--- a/Documentation/devicetree/bindings/media/s5p-mfc.txt
+++ b/Documentation/devicetree/bindings/media/s5p-mfc.txt
@@ -17,6 +17,7 @@ Required properties:
        (b) "samsung,mfc-v6" for MFC v6 present in Exynos5 SoCs
        and additionally "simple-bus" to correctly initialize child
        devices for memory ports (AXI masters)
+       (c) "samsung,mfc-v7" for MFC v7 present in Exynos5420 SoC
 
   - reg : Physical base address of the IP registers and length of memory
          mapped region.

diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc.c b/drivers/media/platform/s5p-mfc/s5p_mfc.c
index c67d446..face9d1 100644 (file)
--- a/drivers/media/platform/s5p-mfc/s5p_mfc.c
+++ b/drivers/media/platform/s5p-mfc/s5p_mfc.c
@@ -1356,6 +1356,32 @@ static struct s5p_mfc_variant mfc_drvdata_v6 = {
        .fw_name        = "s5p-mfc-v6.fw",
 };
 
+struct s5p_mfc_buf_size_v6 mfc_buf_size_v7 = {
+       .dev_ctx        = MFC_CTX_BUF_SIZE_V7,
+       .h264_dec_ctx   = MFC_H264_DEC_CTX_BUF_SIZE_V7,
+       .other_dec_ctx  = MFC_OTHER_DEC_CTX_BUF_SIZE_V7,
+       .h264_enc_ctx   = MFC_H264_ENC_CTX_BUF_SIZE_V7,
+       .other_enc_ctx  = MFC_OTHER_ENC_CTX_BUF_SIZE_V7,
+};
+
+struct s5p_mfc_buf_size buf_size_v7 = {
+       .fw     = MAX_FW_SIZE_V7,
+       .cpb    = MAX_CPB_SIZE_V7,
+       .priv   = &mfc_buf_size_v7,
+};
+
+struct s5p_mfc_buf_align mfc_buf_align_v7 = {
+       .base = 0,
+};
+
+static struct s5p_mfc_variant mfc_drvdata_v7 = {
+       .version        = MFC_VERSION_V7,
+       .port_num       = MFC_NUM_PORTS_V7,
+       .buf_size       = &buf_size_v7,
+       .buf_align      = &mfc_buf_align_v7,
+       .fw_name        = "s5p-mfc-v7.fw",
+};
+
 static struct platform_device_id mfc_driver_ids[] = {
        {
                .name = "s5p-mfc",
@@ -1366,6 +1392,9 @@ static struct platform_device_id mfc_driver_ids[] = {
        }, {
                .name = "s5p-mfc-v6",
                .driver_data = (unsigned long)&mfc_drvdata_v6,
+       }, {
+               .name = "s5p-mfc-v7",
+               .driver_data = (unsigned long)&mfc_drvdata_v7,
        },
        {},
 };
@@ -1378,6 +1407,9 @@ static const struct of_device_id exynos_mfc_match[] = {
        }, {
                .compatible = "samsung,mfc-v6",
                .data = &mfc_drvdata_v6,
+       }, {
+               .compatible = "samsung,mfc-v7",
+               .data = &mfc_drvdata_v7,
        },
        {},
 };

diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_common.h b/drivers/media/platform/s5p-mfc/s5p_mfc_common.h
index 652e956..5873644 100644 (file)
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_common.h
+++ b/drivers/media/platform/s5p-mfc/s5p_mfc_common.h
@@ -24,6 +24,7 @@
 #include <media/videobuf2-core.h>
 #include "regs-mfc.h"
 #include "regs-mfc-v6.h"
+#include "regs-mfc-v7.h"
 
 /* Definitions related to MFC memory */
 
@@ -675,6 +676,7 @@ void set_work_bit_irqsave(struct s5p_mfc_ctx *ctx);
                                (dev->variant->port_num ? 1 : 0) : 0) : 0)
 #define IS_TWOPORT(dev)                (dev->variant->port_num == 2 ? 1 : 0)
 #define IS_MFCV6_PLUS(dev)     (dev->variant->version >= 0x60 ? 1 : 0)
+#define IS_MFCV7(dev)          (dev->variant->version >= 0x70 ? 1 : 0)
 
 #define s5p_mfc_supported_mem_type(mem)        \
        ((mem == V4L2_MEMORY_MMAP || \