From patchwork Mon Jun 17 16:34:14 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Figa X-Patchwork-Id: 2735641 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 69A9EC0AB1 for ; Mon, 17 Jun 2013 17:24:36 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7054020430 for ; Mon, 17 Jun 2013 17:24:35 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9E17E20426 for ; Mon, 17 Jun 2013 17:24:33 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UocUW-00030B-Lz; Mon, 17 Jun 2013 16:41:18 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UocSF-0006SF-18; Mon, 17 Jun 2013 16:38:55 +0000 Received: from mailout1.w1.samsung.com ([210.118.77.11]) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UocPD-000632-Ms for linux-arm-kernel@lists.infradead.org; Mon, 17 Jun 2013 16:35:51 +0000 Received: from eucpsbgm1.samsung.com (unknown [203.254.199.244]) by mailout1.w1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MOJ0085OQ1L6450@mailout1.w1.samsung.com> for linux-arm-kernel@lists.infradead.org; Mon, 17 Jun 2013 17:34:54 +0100 (BST) X-AuditID: cbfec7f4-b7fd76d0000035e1-bb-51bf3aaeb735 Received: from eusync3.samsung.com ( [203.254.199.213]) by eucpsbgm1.samsung.com (EUCPMTA) with SMTP id D7.85.13793.EAA3FB15; Mon, 17 Jun 2013 17:34:54 +0100 (BST) Received: from amdc1227.digital.local ([106.116.147.199]) by eusync3.samsung.com (Oracle Communications Messaging Server 7u4-23.01(7.0.4.23.0) 64bit (built Aug 10 2011)) with ESMTPA id <0MOJ002RHQ1OMHC0@eusync3.samsung.com>; Mon, 17 Jun 2013 17:34:54 +0100 (BST) From: Tomasz Figa To: linux-samsung-soc@vger.kernel.org Subject: [PATCH v2 29/38] thermal: exynos: Support both Exynos4x12 SoCs Date: Mon, 17 Jun 2013 18:34:14 +0200 Message-id: <1371486863-12398-30-git-send-email-t.figa@samsung.com> X-Mailer: git-send-email 1.8.2.1 In-reply-to: <1371486863-12398-1-git-send-email-t.figa@samsung.com> References: <1371486863-12398-1-git-send-email-t.figa@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrMLMWRmVeSWpSXmKPExsVy+t/xq7rrrPYHGjyfKmzxd9Ixdos1+38y WfQuuMpmcbbpDbvFpsfXWC0+9x5htJhxfh+Txdojd9ktTl3/zGbx5GEfm8XhN+2sFutnvGax ODZjCaMDr8fvX5MYPRbvecnkcefaHjaPzUvqPa6caGL16NuyitHj+I3tTB6fN8kFcERx2aSk 5mSWpRbp2yVwZTw8u5S54CVHxY9NXUwNjFfYuxg5OSQETCSmzPrEBGGLSVy4t56ti5GLQ0hg KaPE5L+XmSGcPiaJUw1LWUGq2ATUJD43PGIDsUUEVCU+ty1gByliFrjCLLFwfysjSEJYwF3i 5bQTYGNZgIq6P98Bs3kFnCXuTp7JCLFOQeL49m1gNidQfHHfLWYQW0jASWL3zEusExh5FzAy rGIUTS1NLihOSs811CtOzC0uzUvXS87P3cQICdgvOxgXH7M6xCjAwajEw5sgtj9QiDWxrLgy 9xCjBAezkghv7MR9gUK8KYmVValF+fFFpTmpxYcYmTg4pRoYjc6aJ5j4/y9+6XTaoEHGv88n Yt1JrewCHU37uS/fz7oQFvyX8+TMbAHu2WcvPzxklpTwU9253HFGRJTfUl+/V31nBJbbsGw9 JzdrEq/Ozh9Fhw4LOsw5Gn33nhO3LtuL39zbkhpyT541EC93ydap8L/Tu2LHjemdbYpOzyYE XU5YIzDZvuyIEktxRqKhFnNRcSIA3pLMADYCAAA= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130617_123547_895608_6EA9BB2F X-CRM114-Status: UNSURE ( 9.11 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -8.0 (--------) Cc: Kukjin Kim , Arnd Bergmann , linux-pm@vger.kernel.org, Tomasz Figa , Eduardo Valentin , Kyungmin Park , Thomas Abraham , Sylwester Nawrocki , Olof Johansson , Zhang Rui , linux-arm-kernel@lists.infradead.org, Marek Szyprowski X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-5.3 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, 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 Exynos4212 and Exynos4412 have the same thermal block, so there is no reason to include support only for Exynos4412 in this driver. Cc: linux-pm@vger.kernel.org Cc: Zhang Rui Cc: Eduardo Valentin Signed-off-by: Tomasz Figa Signed-off-by: Kyungmin Park --- drivers/thermal/exynos_thermal.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/thermal/exynos_thermal.c b/drivers/thermal/exynos_thermal.c index 788b1dd..4cbe3ee 100644 --- a/drivers/thermal/exynos_thermal.c +++ b/drivers/thermal/exynos_thermal.c @@ -817,7 +817,8 @@ static struct exynos_tmu_platform_data const exynos4210_default_tmu_data = { #define EXYNOS4210_TMU_DRV_DATA (NULL) #endif -#if defined(CONFIG_SOC_EXYNOS5250) || defined(CONFIG_SOC_EXYNOS4412) +#if defined(CONFIG_SOC_EXYNOS5250) || defined(CONFIG_SOC_EXYNOS4412) || \ + defined(CONFIG_SOC_EXYNOS4212) static struct exynos_tmu_platform_data const exynos_default_tmu_data = { .threshold_falling = 10, .trigger_levels[0] = 85,