All of lore.kernel.org
 help / color / mirror / Atom feed
From: Tomasz Figa <t.figa@samsung.com>
To: linux-samsung-soc@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org,
	linux-kernel@vger.kernel.org, Kukjin Kim <kgene.kim@samsung.com>,
	Marek Szyprowski <m.szyprowski@samsung.com>,
	Tomasz Figa <tomasz.figa@gmail.com>,
	Daniel Drake <drake@endlessm.com>,
	Tomasz Figa <t.figa@samsung.com>
Subject: [PATCH v2 4/6] ARM: SAMSUNG: Restore Samsung PM Debug functionality
Date: Wed, 25 Jun 2014 13:43:54 +0200	[thread overview]
Message-ID: <1403696634-12779-1-git-send-email-t.figa@samsung.com> (raw)
In-Reply-To: <1403618235-19353-5-git-send-email-t.figa@samsung.com>

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 <t.figa@samsung.com>
---
 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 <file:Documentation/arm/Samsung-S3C24XX/Suspend.txt>
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 <linux/serial_core.h>
+#include <linux/serial_s3c.h>
 #include <linux/io.h>
 
 #include <asm/mach/map.h>
-- 
1.9.3


WARNING: multiple messages have this Message-ID (diff)
From: t.figa@samsung.com (Tomasz Figa)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 4/6] ARM: SAMSUNG: Restore Samsung PM Debug functionality
Date: Wed, 25 Jun 2014 13:43:54 +0200	[thread overview]
Message-ID: <1403696634-12779-1-git-send-email-t.figa@samsung.com> (raw)
In-Reply-To: <1403618235-19353-5-git-send-email-t.figa@samsung.com>

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 <t.figa@samsung.com>
---
 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 <file:Documentation/arm/Samsung-S3C24XX/Suspend.txt>
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 <linux/serial_core.h>
+#include <linux/serial_s3c.h>
 #include <linux/io.h>
 
 #include <asm/mach/map.h>
-- 
1.9.3

  parent reply	other threads:[~2014-06-25 11:44 UTC|newest]

Thread overview: 84+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-06-24 13:57 [PATCH 0/6] Various Samsung fixes for v3.16-rc3 Tomasz Figa
2014-06-24 13:57 ` Tomasz Figa
2014-06-24 13:57 ` [PATCH 1/6] mmc: sdhci-s3c: Fix local I/O clock gating Tomasz Figa
2014-06-24 13:57   ` Tomasz Figa
2014-07-14  8:05   ` Jaehoon Chung
2014-07-14  8:05     ` Jaehoon Chung
2014-06-24 13:57 ` [PATCH 2/6] ARM: EXYNOS: Fix core ID used by platsmp and hotplug code Tomasz Figa
2014-06-24 13:57   ` Tomasz Figa
2014-06-24 13:57   ` Tomasz Figa
2014-07-08 13:21   ` Kukjin Kim
2014-07-08 13:21     ` Kukjin Kim
2014-07-14  9:50     ` Tomasz Figa
2014-07-14  9:50       ` Tomasz Figa
2014-07-14  9:50       ` Tomasz Figa
2014-07-15 18:00       ` Kukjin Kim
2014-07-15 18:00         ` Kukjin Kim
2014-06-24 13:57 ` [PATCH 3/6] clk: samsung: exynos4: Remove SRC_MASK_ISP gates Tomasz Figa
2014-06-24 13:57   ` Tomasz Figa
2014-06-24 13:57   ` Tomasz Figa
2014-06-25  9:58   ` Daniel Drake
2014-06-25  9:58     ` Daniel Drake
2014-06-25 10:10     ` Tomasz Figa
2014-06-25 10:10       ` Tomasz Figa
2014-06-30 13:50   ` Tomasz Figa
2014-06-30 13:50     ` Tomasz Figa
2014-06-24 13:57 ` [PATCH 4/6] ARM: SAMSUNG: Restore Samsung PM Debug functionality Tomasz Figa
2014-06-24 13:57   ` Tomasz Figa
2014-06-25 10:09   ` Daniel Drake
2014-06-25 10:09     ` Daniel Drake
2014-06-25 11:41     ` Tomasz Figa
2014-06-25 11:41       ` Tomasz Figa
2014-06-25 11:43   ` Tomasz Figa [this message]
2014-06-25 11:43     ` [PATCH v2 " Tomasz Figa
2014-06-26  9:24     ` Daniel Drake
2014-06-26  9:24       ` Daniel Drake
2014-07-14  9:52     ` Tomasz Figa
2014-07-14  9:52       ` Tomasz Figa
2014-07-08 13:48   ` [PATCH " Kukjin Kim
2014-07-08 13:48     ` Kukjin Kim
2014-07-08 13:54     ` Tomasz Figa
2014-07-08 13:54       ` Tomasz Figa
2014-07-15 18:02       ` Kukjin Kim
2014-07-15 18:02         ` Kukjin Kim
2014-07-15 23:59         ` Tomasz Figa
2014-07-15 23:59           ` Tomasz Figa
2014-07-21 10:30           ` Tomasz Figa
2014-07-21 10:30             ` Tomasz Figa
2014-06-24 13:57 ` [PATCH 5/6] ARM: EXYNOS: Fix suspend/resume sequencies Tomasz Figa
2014-06-24 13:57   ` Tomasz Figa
2014-06-24 15:33   ` Abhilash Kesavan
2014-06-24 15:33     ` Abhilash Kesavan
2014-07-08 14:02   ` Kukjin Kim
2014-07-08 14:02     ` Kukjin Kim
2014-06-24 13:57 ` [PATCH 6/6] ARM: EXYNOS: Register cpuidle device only on Exynos4210 and 5250 Tomasz Figa
2014-06-24 13:57   ` Tomasz Figa
2014-07-08 14:15   ` Kukjin Kim
2014-07-08 14:15     ` Kukjin Kim
2014-07-08 15:45     ` Bartlomiej Zolnierkiewicz
2014-07-08 15:45       ` Bartlomiej Zolnierkiewicz
2014-07-10 13:30       ` Kukjin Kim
2014-07-10 13:30         ` Kukjin Kim
2014-06-25 11:52 ` [PATCH v2 5/6] ARM: EXYNOS: Fix suspend/resume sequences Tomasz Figa
2014-06-25 11:52   ` Tomasz Figa
2014-07-14  9:54   ` Tomasz Figa
2014-07-14  9:54     ` Tomasz Figa
2014-07-15 11:19     ` Bartlomiej Zolnierkiewicz
2014-07-15 11:19       ` Bartlomiej Zolnierkiewicz
2014-07-15 12:15       ` Tomasz Figa
2014-07-15 12:15         ` Tomasz Figa
2014-07-15 14:24         ` [PATCH v3] " Tomasz Figa
2014-07-15 14:24           ` Tomasz Figa
2014-07-15 14:26           ` Tomasz Figa
2014-07-15 14:26             ` Tomasz Figa
2014-07-17 14:42             ` Tomasz Figa
2014-07-17 14:42               ` Tomasz Figa
2014-07-21 10:23             ` Tomasz Figa
2014-07-21 10:23               ` Tomasz Figa
2014-07-15 17:31         ` [PATCH v2 5/6] " Chander Kashyap
2014-07-15 17:31           ` Chander Kashyap
2014-07-15 17:31           ` Chander Kashyap
2014-07-01 13:54 ` [PATCH 0/6] Various Samsung fixes for v3.16-rc3 Tomasz Figa
2014-07-01 13:54   ` Tomasz Figa
2014-07-07 23:25   ` Kukjin Kim
2014-07-07 23:25     ` Kukjin Kim

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1403696634-12779-1-git-send-email-t.figa@samsung.com \
    --to=t.figa@samsung.com \
    --cc=drake@endlessm.com \
    --cc=kgene.kim@samsung.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-samsung-soc@vger.kernel.org \
    --cc=m.szyprowski@samsung.com \
    --cc=tomasz.figa@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.