From patchwork Wed Dec 17 06:22:19 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tony nadackal X-Patchwork-Id: 5505361 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 1A55C9F30B for ; Wed, 17 Dec 2014 06:29:38 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4A79520A23 for ; Wed, 17 Dec 2014 06:29:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0FEB920A22 for ; Wed, 17 Dec 2014 06:29:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751649AbaLQG3f (ORCPT ); Wed, 17 Dec 2014 01:29:35 -0500 Received: from mailout2.samsung.com ([203.254.224.25]:20780 "EHLO mailout2.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751410AbaLQG3e (ORCPT ); Wed, 17 Dec 2014 01:29:34 -0500 Received: from epcpsbgr3.samsung.com (u143.gpu120.samsung.co.kr [203.254.230.143]) by mailout2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0NGP0021NRD8I350@mailout2.samsung.com>; Wed, 17 Dec 2014 15:29:32 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [172.20.52.125]) by epcpsbgr3.samsung.com (EPCPMTA) with SMTP id B6.AC.18484.CC221945; Wed, 17 Dec 2014 15:29:32 +0900 (KST) X-AuditID: cbfee68f-f791c6d000004834-b1-549122ccb167 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 91.1F.09430.CC221945; Wed, 17 Dec 2014 15:29:32 +0900 (KST) Received: from chromebld-server.sisodomain.com ([107.108.73.106]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0NGP00HYERCI7ZJ0@mmp2.samsung.com>; Wed, 17 Dec 2014 15:29:32 +0900 (KST) From: Tony K Nadackal To: linux-media@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org Cc: mchehab@osg.samsung.com, j.anaszewski@samsung.com, kgene@kernel.org, k.debski@samsung.com, s.nawrocki@samsung.com, bhushan.r@samsung.com, Tony K Nadackal Subject: [PATCH] [media] s5p-jpeg: Clear JPEG_CODEC_ON bits in sw reset function Date: Wed, 17 Dec 2014 11:52:19 +0530 Message-id: <1418797339-27877-1-git-send-email-tony.kn@samsung.com> X-Mailer: git-send-email 2.2.0 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrALMWRmVeSWpSXmKPExsWyRsSkVveM0sQQg0XPdC2Wrf3HYtF79Tmj xY/XF9gs+h+/ZrbY9Pgaq0XPhq2sFjPO72OyWP2swuLwm3ZWi1cXXzE5cHlsWtXJ5rF5Sb3H lv677B59W1YxenzeJBfAGsVlk5Kak1mWWqRvl8CV8aFxA3vBIo6KSRtWMjcwtrB3MXJySAiY SDzac5sVwhaTuHBvPVsXIxeHkMBSRomfDQvgin41tLNCJKYzSvy/8I4RwpnAJDFxSQMbSBWb gLbEjB8PwTpEBLIkLt5cBxZnFtjOKPF2nhSILSwQIHFvzyagGg4OFgFViS33mEHCvALOEg+e 7mWBWCYnseXWI3aQ+RICk9klTv3eygiSYBEQkPg2+RALSK+EgKzEpgPMEPWSEgdX3GCZwCi4 gJFhFaNoakFyQXFSepGxXnFibnFpXrpecn7uJkZgQJ/+96x/B+PdA9aHGAU4GJV4eF9cnxAi xJpYVlyZe4jRFGjDRGYp0eR8YNzklcQbGpsZWZiamBobmVuaKYnzLpT6GSwkkJ5YkpqdmlqQ WhRfVJqTWnyIkYmDU6qBsXrJJw2z/cIXjK/Ub85b7u2vo///2j8Dtsm31Se2r+6fsJm5+4xB mdCZ02w76sp/HvprJvlLz8n6FF8Zo2t5clhBwPGpO9WEje/xt+/l/iZ+m1dp156X71eL6RcU tu/+JbpgmqGl85a6vS0NFzwuNm+qMbXn1w25M9PefrqGGmdjyQfRJYwrlFiKMxINtZiLihMB EzkLQGMCAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprFIsWRmVeSWpSXmKPExsVy+t9jQd0zShNDDBYdU7FYtvYfi0Xv1eeM Fj9eX2Cz6H/8mtli0+NrrBY9G7ayWsw4v4/JYvWzCovDb9pZLV5dfMXkwOWxaVUnm8fmJfUe W/rvsnv0bVnF6PF5k1wAa1QDo01GamJKapFCal5yfkpmXrqtkndwvHO8qZmBoa6hpYW5kkJe Ym6qrZKLT4CuW2YO0FFKCmWJOaVAoYDE4mIlfTtME0JD3HQtYBojdH1DguB6jAzQQMIaxowP jRvYCxZxVEzasJK5gbGFvYuRk0NCwETiV0M7K4QtJnHh3nq2LkYuDiGB6YwS/y+8Y4RwJjBJ TFzSwAZSxSagLTHjx0OwbhGBLImLN9eBxZkFtjNKvJ0nBWILCwRI3NuzCaiGg4NFQFViyz1m kDCvgLPEg6d7WSCWyUlsufWIfQIj9wJGhlWMoqkFyQXFSem5RnrFibnFpXnpesn5uZsYwfHy THoH46oGi0OMAhyMSjy8L69PCBFiTSwrrsw9xCjBwawkwntXemKIEG9KYmVValF+fFFpTmrx IUZToOUTmaVEk/OBsZxXEm9obGJuamxqaWJhYmapJM6rZN8WIiSQnliSmp2aWpBaBNPHxMEp 1cBo39KUfIXT/bxlsCjHvy8vFgee2rZ+x1TbjXMsEoMFYtMWrxPW/9FyqW2q6bm7EZ/SXON7 3k6tj3oevmr6sRfbt63Xu9f9ICPT85CATXcK159LvXs3PmKdl3zbhMVnj4fs65ULXz99cf/g 2abX8oF8mQ1GLvIGAs3pTt1vguPeLSgLSQtZ7qalxFKckWioxVxUnAgAUzXQcq0CAAA= DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Bits EXYNOS4_DEC_MODE and EXYNOS4_ENC_MODE do not get cleared on software reset. These bits need to be cleared explicitly. Signed-off-by: Tony K Nadackal --- This patch is created and tested on top of linux-next-20141210. It can be cleanly applied on media-next and kgene/for-next. drivers/media/platform/s5p-jpeg/jpeg-hw-exynos4.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/media/platform/s5p-jpeg/jpeg-hw-exynos4.c b/drivers/media/platform/s5p-jpeg/jpeg-hw-exynos4.c index ab6d6f43..e53f13a 100644 --- a/drivers/media/platform/s5p-jpeg/jpeg-hw-exynos4.c +++ b/drivers/media/platform/s5p-jpeg/jpeg-hw-exynos4.c @@ -21,6 +21,10 @@ void exynos4_jpeg_sw_reset(void __iomem *base) unsigned int reg; reg = readl(base + EXYNOS4_JPEG_CNTL_REG); + writel(reg & ~(EXYNOS4_DEC_MODE | EXYNOS4_ENC_MODE), + base + EXYNOS4_JPEG_CNTL_REG); + + reg = readl(base + EXYNOS4_JPEG_CNTL_REG); writel(reg & ~EXYNOS4_SOFT_RESET_HI, base + EXYNOS4_JPEG_CNTL_REG); udelay(100);