From patchwork Wed Nov 16 09:04:58 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Szyprowski X-Patchwork-Id: 9431147 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 2AF976021C for ; Wed, 16 Nov 2016 09:06:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1AA9A28682 for ; Wed, 16 Nov 2016 09:06:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0F59628EB1; Wed, 16 Nov 2016 09:06:02 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 03E9228682 for ; Wed, 16 Nov 2016 09:06:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964805AbcKPJF6 (ORCPT ); Wed, 16 Nov 2016 04:05:58 -0500 Received: from mailout1.w1.samsung.com ([210.118.77.11]:57066 "EHLO mailout1.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934006AbcKPJFl (ORCPT ); Wed, 16 Nov 2016 04:05:41 -0500 Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout1.w1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0OGQ00DM5990ZH80@mailout1.w1.samsung.com>; Wed, 16 Nov 2016 09:05:24 +0000 (GMT) Received: from eusmges1.samsung.com (unknown [203.254.199.239]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20161116090523eucas1p28ef6ead98ef89e07c7145ffaec379cee~He80wBOmV1707517075eucas1p2w; Wed, 16 Nov 2016 09:05:23 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges1.samsung.com (EUCPMTA) with SMTP id B3.EB.23383.4512C285; Wed, 16 Nov 2016 09:05:24 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20161116090523eucas1p12a4b95363e9d2b0a823141a2f1c226e1~He80G9tep3117131171eucas1p12; Wed, 16 Nov 2016 09:05:23 +0000 (GMT) X-AuditID: cbfec7ef-f79e76d000005b57-c0-582c21547802 Received: from eusync2.samsung.com ( [203.254.199.212]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id 30.5A.07726.8512C285; Wed, 16 Nov 2016 09:05:28 +0000 (GMT) Received: from AMDC2765.digital.local ([106.116.147.25]) by eusync2.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0OGQ00GDL98JU960@eusync2.samsung.com>; Wed, 16 Nov 2016 09:05:22 +0000 (GMT) From: Marek Szyprowski To: linux-media@vger.kernel.org, linux-samsung-soc@vger.kernel.org Cc: Marek Szyprowski , Sylwester Nawrocki , Krzysztof Kozlowski , Seung-Woo Kim , Bartlomiej Zolnierkiewicz , Javier Martinez Canillas , Andrzej Hajda , Inki Dae Subject: [PATCH 9/9] s5p-mfc: Add support for MFC v8 available in Exynos 5433 SoCs Date: Wed, 16 Nov 2016 10:04:58 +0100 Message-id: <1479287098-30493-10-git-send-email-m.szyprowski@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1479287098-30493-1-git-send-email-m.szyprowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrAIsWRmVeSWpSXmKPExsWy7djPc7ohijoRBi9ma1jcWneO1WLjjPWs FpPuT2CxePN2DZPF+fMb2C16NmxltZhxfh+Txdojd9ktDr9pB3Inv2Rz4PLYtKqTzWNL/112 j74tqxg9Pm+SC2CJ4rJJSc3JLEst0rdL4Mro/axe8I+/YvPTrAbG1bxdjJwcEgImEuevPWWE sMUkLtxbz9bFyMUhJLCMUaL/0C8o5zOjxLYrW5hhOiYf+M2KUNWxgAnCaWCSmP5sHjtIFZuA oUTX2y42EFtEwEli4ay/7CBFzAJPmCS+NfSBjRIWCJFYfeArUIKDg0VAVeLiMmuQMK+Ap8Su 1m2sENvkJE4emwxmcwLFn8x8xQIyR0LgP5tE57SFLCC9EgKyEpsOQF3nIjG5dy87hC0s8er4 FihbRqKz4yAThN3PKNHUqg1hz2CUOPcWGhbWEoePXwTbxSzAJzFp23RmiPG8Eh1tQhAlHhL3 p9yGOs1RYsG5mWC2kMAcRomFEz0nMMosYGRYxSiSWlqcm55abKhXnJhbXJqXrpecn7uJERjP p/8df7+D8WlzyCFGAQ5GJR7eBeraEUKsiWXFlbmHGCU4mJVEeK8L6kQI8aYkVlalFuXHF5Xm pBYfYpTmYFES59274Eq4kEB6YklqdmpqQWoRTJaJg1OqgTHibxF76Y0fywxLq5e7fkkKC2G+ nv7h8vEpq87aekzmmVs9xZnlPX+5BkufVyFPetdyhnX/7U314r68ZN6/nKVDTozbLltl1nnO eeJXL1+sf9rErzizMvrfsvDZ/6Nn6q6ZJz85M/dy0Ow0c9+Qfxfmf2suuWOeJjPlSMo+5v1a s8T56gOYDZVYijMSDbWYi4oTASGQuKbjAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrPLMWRmVeSWpSXmKPExsVy+t/xK7oRijoRBrse6FncWneO1WLjjPWs FpPuT2CxePN2DZPF+fMb2C16NmxltZhxfh+Txdojd9ktDr9pB3Inv2Rz4PLYtKqTzWNL/112 j74tqxg9Pm+SC2CJcrPJSE1MSS1SSM1Lzk/JzEu3VQoNcdO1UFLIS8xNtVWK0PUNCVJSKEvM KQXyjAzQgINzgHuwkr5dgltG72f1gn/8FZufZjUwrubtYuTkkBAwkZh84DcrhC0mceHeerYu Ri4OIYEljBKrnp1mB0kICTQxScyeWwFiswkYSnS97WIDsUUEnCQWzvrLDtLALPCESeLMu/1M IAlhgRCJ82fagKZycLAIqEpcXGYNEuYV8JTY1boNapmcxMljk8FsTqD4k5mvWEDKhQQ8JJYf NZ3AyLuAkWEVo0hqaXFuem6xoV5xYm5xaV66XnJ+7iZGYGBvO/Zz8w7GSxuDDzEKcDAq8fAu UNeOEGJNLCuuzD3EKMHBrCTCe11QJ0KINyWxsiq1KD++qDQntfgQoynQSROZpUST84FRl1cS b2hiaG5paGRsYWFuZKQkzlvy4Uq4kEB6YklqdmpqQWoRTB8TB6dUA6OAjOK95r+3OfakP3yc saRZQKTSVcN3cq/r1YB7k2avv77Ky2i79JH9G1i0f657q778WQ1T+7Ovq/YuNV1npvzcNXVe SkSq8OvTp3ZP3tbc0Hizw9vmw4fTPStiz9b52sou1FzLcjjpjfsmib/uUzybawM02zYfnup9 UOuGrmSZj3NZ+xp1Z28lluKMREMt5qLiRACoeSY3ggIAAA== X-MTR: 20000000000000000@CPGS X-CMS-MailID: 20161116090523eucas1p12a4b95363e9d2b0a823141a2f1c226e1 X-Msg-Generator: CA X-Sender-IP: 182.198.249.179 X-Local-Sender: =?UTF-8?B?TWFyZWsgU3p5cHJvd3NraRtTUlBPTC1LZXJuZWwgKFRQKRs=?= =?UTF-8?B?7IK87ISx7KCE7J6QG1NlbmlvciBTb2Z0d2FyZSBFbmdpbmVlcg==?= X-Global-Sender: =?UTF-8?B?TWFyZWsgU3p5cHJvd3NraRtTUlBPTC1LZXJuZWwgKFRQKRtT?= =?UTF-8?B?YW1zdW5nIEVsZWN0cm9uaWNzG1NlbmlvciBTb2Z0d2FyZSBFbmdpbmVlcg==?= X-Sender-Code: =?UTF-8?B?QzEwG0VIURtDMTBDRDAyQ0QwMjczOTI=?= CMS-TYPE: 201P X-HopCount: 7 X-CMS-RootMailID: 20161116090523eucas1p12a4b95363e9d2b0a823141a2f1c226e1 X-RootMTR: 20161116090523eucas1p12a4b95363e9d2b0a823141a2f1c226e1 References: <1479287098-30493-1-git-send-email-m.szyprowski@samsung.com> Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Exynos5433 SoC has MFC v8 hardware module, but it has more complex clock hierarchy, so a new compatible has been added. Signed-off-by: Marek Szyprowski Acked-by: Krzysztof Kozlowski --- Documentation/devicetree/bindings/media/s5p-mfc.txt | 1 + drivers/media/platform/s5p-mfc/s5p_mfc.c | 14 ++++++++++++++ 2 files changed, 15 insertions(+) diff --git a/Documentation/devicetree/bindings/media/s5p-mfc.txt b/Documentation/devicetree/bindings/media/s5p-mfc.txt index 92c94f5ecbf1..2c901286d818 100644 --- a/Documentation/devicetree/bindings/media/s5p-mfc.txt +++ b/Documentation/devicetree/bindings/media/s5p-mfc.txt @@ -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. diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc.c b/drivers/media/platform/s5p-mfc/s5p_mfc.c index fa674e8e09a8..d11a2405b3d2 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc.c +++ b/drivers/media/platform/s5p-mfc/s5p_mfc.c @@ -1530,6 +1530,17 @@ static int s5p_mfc_resume(struct device *dev) .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", @@ -1543,6 +1554,9 @@ static int s5p_mfc_resume(struct device *dev) }, { .compatible = "samsung,mfc-v8", .data = &mfc_drvdata_v8, + }, { + .compatible = "samsung,exynos5433-mfc", + .data = &mfc_drvdata_v8_5433, }, {}, };