From patchwork Wed Jun 25 11:43:54 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Figa X-Patchwork-Id: 4419831 Return-Path: X-Original-To: patchwork-linux-arm@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 C63849F1D6 for ; Wed, 25 Jun 2014 11:47:13 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DAFE3200F3 for ; Wed, 25 Jun 2014 11:47:12 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1E678200DE for ; Wed, 25 Jun 2014 11:47:11 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WzldK-0005Vy-C3; Wed, 25 Jun 2014 11:44:58 +0000 Received: from mailout3.w1.samsung.com ([210.118.77.13]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WzldG-0005Fn-0O for linux-arm-kernel@lists.infradead.org; Wed, 25 Jun 2014 11:44:55 +0000 Received: from eucpsbgm1.samsung.com (unknown [203.254.199.244]) by mailout3.w1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0N7Q002QA3A63DA0@mailout3.w1.samsung.com> for linux-arm-kernel@lists.infradead.org; Wed, 25 Jun 2014 12:44:30 +0100 (BST) X-AuditID: cbfec7f4-b7fac6d000006cfe-89-53aab61e5ba2 Received: from eusync2.samsung.com ( [203.254.199.212]) by eucpsbgm1.samsung.com (EUCPMTA) with SMTP id FA.77.27902.E16BAA35; Wed, 25 Jun 2014 12:44:30 +0100 (BST) Received: from AMDC1227.digital.local ([106.116.147.199]) by eusync2.samsung.com (Oracle Communications Messaging Server 7u4-23.01(7.0.4.23.0) 64bit (built Aug 10 2011)) with ESMTPA id <0N7Q00H1H39V4GC0@eusync2.samsung.com>; Wed, 25 Jun 2014 12:44:30 +0100 (BST) From: Tomasz Figa To: linux-samsung-soc@vger.kernel.org Subject: [PATCH v2 4/6] ARM: SAMSUNG: Restore Samsung PM Debug functionality Date: Wed, 25 Jun 2014 13:43:54 +0200 Message-id: <1403696634-12779-1-git-send-email-t.figa@samsung.com> X-Mailer: git-send-email 1.9.3 In-reply-to: <1403618235-19353-5-git-send-email-t.figa@samsung.com> References: <1403618235-19353-5-git-send-email-t.figa@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrJJMWRmVeSWpSXmKPExsVy+t/xK7py21YFG/z+bGbxaP5jZoveBVfZ LDY9vsZqcXnXHDaLGef3MVmsPXKX3WL9jNcsFqt2/WF04PBY9D3LY+esu+wem5fUe/RtWcXo 8XmTXABrFJdNSmpOZllqkb5dAlfGieMPmArWcFe837iOvYHxGGcXIweHhICJxKVVCV2MnECm mMSFe+vZuhi5OIQEljJKdHw+CeX0MUlM7FrNAlLFJqAm8bnhERuILSKgKvG5bQE7SBGzQCeT xOG1m8CKhAV8JNoefAIrYgEq+n99FTuIzSvgJNF/8j8bxDo5id5tb5hBbE4BZ4nefY8ZQWwh oJqbe86wT2DkXcDIsIpRNLU0uaA4KT3XUK84Mbe4NC9dLzk/dxMjJLi+7GBcfMzqEKMAB6MS D28Az6pgIdbEsuLK3EOMEhzMSiK89RuAQrwpiZVVqUX58UWlOanFhxiZODilGhiDfrhkT18Y XRm49qlackiJV3e08Opf/8uW77oVtnB/YpBryK4EDcMn7zpZm0JvP+o7yFHStO5bpf/rhWHR xp0aLvdFuXt5vn5d63rkyaaGsA0X5md1/DbgbtX6tM8zZvJ3qUfMak+nHLR/o5ThK7phyqP/ h6K2MvyW3/T1DrfnxK7u89VKC1YosRRnJBpqMRcVJwIAsYB8iQwCAAA= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140625_044454_217084_44840E8A X-CRM114-Status: UNSURE ( 9.34 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -5.0 (-----) Cc: Kukjin Kim , linux-kernel@vger.kernel.org, Tomasz Figa , Tomasz Figa , Daniel Drake , linux-arm-kernel@lists.infradead.org, Marek Szyprowski X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 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=-1.9 required=5.0 tests=BAYES_00, 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 Due to recently merged patches and previous merge conflicts, the Samsung PM Debug functionality no longer can be enabled. This patch fixes incorrect dependency of SAMSUNG_PM_DEBUG on an integer symbol and adds missing header inclusion. Signed-off-by: Tomasz Figa --- arch/arm/plat-samsung/Kconfig | 5 +++-- arch/arm/plat-samsung/pm-debug.c | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig index 301b892..ad9515f 100644 --- a/arch/arm/plat-samsung/Kconfig +++ b/arch/arm/plat-samsung/Kconfig @@ -413,8 +413,9 @@ config S5P_DEV_MFC comment "Power management" config SAMSUNG_PM_DEBUG - bool "S3C2410 PM Suspend debug" - depends on PM && DEBUG_KERNEL && DEBUG_S3C_UART + bool "Samsung PM Suspend debug" + depends on PM && DEBUG_KERNEL + depends on DEBUG_EXYNOS_UART || DEBUG_S3C24XX_UART || DEBUG_S3C2410_UART help Say Y here if you want verbose debugging from the PM Suspend and Resume code. See diff --git a/arch/arm/plat-samsung/pm-debug.c b/arch/arm/plat-samsung/pm-debug.c index 8f19f66..3960960 100644 --- a/arch/arm/plat-samsung/pm-debug.c +++ b/arch/arm/plat-samsung/pm-debug.c @@ -14,6 +14,7 @@ */ #include +#include #include #include