Skip to content

Commit

Permalink
[media] s5p-mfc: Add support for MFC v8 available in Exynos 5433 SoCs
Browse files Browse the repository at this point in the history
Exynos5433 SoC has MFC v8 hardware module, but it has more
complex clock hierarchy, so a new compatible is added.

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
  • Loading branch information
Marek Szyprowski authored and Mauro Carvalho Chehab committed Nov 30, 2016
1 parent 1bce6fb commit 0036113
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 0 deletions.
1 change: 1 addition & 0 deletions Documentation/devicetree/bindings/media/s5p-mfc.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ Required properties:
(b) "samsung,mfc-v6" for MFC v6 present in Exynos5 SoCs
(c) "samsung,mfc-v7" for MFC v7 present in Exynos5420 SoC
(d) "samsung,mfc-v8" for MFC v8 present in Exynos5800 SoC
(e) "samsung,exynos5433-mfc" for MFC v8 present in Exynos5433 SoC

- reg : Physical base address of the IP registers and length of memory
mapped region.
Expand Down
14 changes: 14 additions & 0 deletions drivers/media/platform/s5p-mfc/s5p_mfc.c
Original file line number Diff line number Diff line change
Expand Up @@ -1531,6 +1531,17 @@ static struct s5p_mfc_variant mfc_drvdata_v8 = {
.num_clocks = 1,
};

static struct s5p_mfc_variant mfc_drvdata_v8_5433 = {
.version = MFC_VERSION_V8,
.version_bit = MFC_V8_BIT,
.port_num = MFC_NUM_PORTS_V8,
.buf_size = &buf_size_v8,
.buf_align = &mfc_buf_align_v8,
.fw_name[0] = "s5p-mfc-v8.fw",
.clk_names = {"pclk", "aclk", "aclk_xiu"},
.num_clocks = 3,
};

static const struct of_device_id exynos_mfc_match[] = {
{
.compatible = "samsung,mfc-v5",
Expand All @@ -1544,6 +1555,9 @@ static const struct of_device_id exynos_mfc_match[] = {
}, {
.compatible = "samsung,mfc-v8",
.data = &mfc_drvdata_v8,
}, {
.compatible = "samsung,exynos5433-mfc",
.data = &mfc_drvdata_v8_5433,
},
{},
};
Expand Down

0 comments on commit 0036113

Please sign in to comment.