From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_PULL_REQUEST,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 69A68C43468 for ; Sun, 20 Sep 2020 16:09:35 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 15A3220EDD for ; Sun, 20 Sep 2020 16:09:35 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="Ok4YKyy3"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="puR9oClB" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 15A3220EDD Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:MIME-Version:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:References:In-Reply-To:Message-Id:Date:Subject:To: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=pxX5tL/KXnYltU31ulUiYCrGj3XK8yipz7yawHLz/2c=; b=Ok4YKyy3upueIKwlx0I/APbyWx zBmGsJaowXMS2M/71moBwzzaET5lsK/spaHH25drcBAZbqhYsW7/GPF/r5RZgNGe22n6cTlLEzyTG dgbstbjxQODAWG1n86N/DyH3BiFS1oXu9U7c5lOAZkDAQSVPiq5iU26ec0Nl6Yflh3tMVIK0cfXox wHNp5EX7EDjqKEnlW469ZdkbNv7VoGN3nTGrKKyec7QQ+Z7KaSqEn9Qy2gK0zfnDblKgtpF747RFf aYuMWIlLRsIskXop/GMEDQtMIgB62X86Cm6beCuVRf+RSuiBhcq5Vf0n7svFYLgN7vgMQ1lyt0x6N bIa9Sapw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kK1sp-0008Ih-8r; Sun, 20 Sep 2020 16:08:11 +0000 Received: from mail.kernel.org ([198.145.29.99]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kK1sj-0008Hu-5U for linux-arm-kernel@lists.infradead.org; Sun, 20 Sep 2020 16:08:06 +0000 Received: from localhost.localdomain (unknown [194.230.155.191]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 381DD2158C; Sun, 20 Sep 2020 16:08:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600618084; bh=YzhA5RMtj728h7c+1HyEayNbyqmph+yzlQEhG+8SVqA=; h=From:List-Id:To:Cc:Subject:Date:In-Reply-To:References:From; b=puR9oClBCHiCpbWRljUscIcJlLmBoccySWS3Mo947R4C+Bh+lBcXMIsM1MIyTeYOA hjTdrdjaVOwM+1OpwiUTRpOnSPCd2v3a6AzivUmZQ23V8N/zeb4hENMt34MHddzClZ IPTvGh91SPmgm9UWOlIp80CVoBMte3GhYJvRuv/I= From: Krzysztof Kozlowski List-Id: To: Olof Johansson , Arnd Bergmann , arm@kernel.org, soc@kernel.org Subject: [GIT PULL 4/5] ARM: samsung: mach/soc for v5.10 Date: Sun, 20 Sep 2020 18:07:04 +0200 Message-Id: <20200920160705.9651-5-krzk@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200920160705.9651-1-krzk@kernel.org> References: <20200920160705.9651-1-krzk@kernel.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200920_120805_351149_75B3AE88 X-CRM114-Status: GOOD ( 15.60 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-samsung-soc@vger.kernel.org, Kukjin Kim , linux-arm-kernel@lists.infradead.org, Krzysztof Kozlowski , linux-kernel@vger.kernel.org MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi, This will conflict around renamed/moved files: 1. arch/arm/mach-s3c/s3c24xx.c: Merge both changes to new location, so: ======= +#include "s3c24xx.h" +#include "fb-core-s3c24xx.h" +#include "nand-core-s3c24xx.h" +#include "spi-core-s3c24xx.h" - static struct map_desc s3c2416_iodesc[] __initdata = { + static struct map_desc s3c2416_iodesc[] __initdata __maybe_unused = { ======= 2. drivers/soc/samsung/Kconfig Add DEBUG_LL && MMU to SAMSUNG_PM_DEBUG section, so: ======= config EXYNOS_PM_DOMAINS bool "Exynos PM domains" if COMPILE_TEST - depends on PM_GENERIC_DOMAINS || COMPILE_TEST + depends on (ARCH_EXYNOS && PM_GENERIC_DOMAINS) || COMPILE_TEST + +config SAMSUNG_PM_DEBUG + bool "Samsung PM Suspend debug" + depends on PM && DEBUG_KERNEL + depends on PLAT_S3C24XX || ARCH_S3C64XX || ARCH_S5PV210 + depends on DEBUG_S3C24XX_UART || DEBUG_S3C2410_UART ++ depends on DEBUG_LL && MMU + help + Say Y here if you want verbose debugging from the PM Suspend and + Resume code. See + for more information. + ======= Best regards, Krzysztof The following changes since commit 9123e3a74ec7b934a4a099e98af6a61c2f80bbf5: Linux 5.9-rc1 (2020-08-16 13:04:57 -0700) are available in the Git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git tags/samsung-soc-5.10 for you to fetch changes up to 0df3c29f6883facf56ba422dbb060a1ad787f865: ARM: s3c64xx: bring back notes from removed debug-macro.S (2020-09-16 19:48:23 +0200) ---------------------------------------------------------------- Samsung mach/soc changes for v5.10 1. Clear unneeded L2C-310 flag which presenc was triggering warning message. 2. Fix build of SAMSUNG_PM_DEBUG without MMU. 3. Minor cleanups and update of linux-samsung-soc mailing list in Maintainers. ---------------------------------------------------------------- Guillaume Tucker (1): ARM: exynos: clear L310_AUX_CTRL_NS_LOCKDOWN in default l2c_aux_val Krzysztof Kozlowski (3): ARM: samsung: fix PM debug build with DEBUG_LL but !MMU ARM: s3c24xx: fix Wunused-variable warning on !MMU ARM: s3c64xx: bring back notes from removed debug-macro.S Lukas Bulwahn (1): MAINTAINERS: mark linux-samsung-soc list non-moderated MAINTAINERS | 14 +++++++------- arch/arm/mach-exynos/exynos.c | 4 ++-- arch/arm/mach-s3c24xx/common.c | 2 +- arch/arm/mach-s3c24xx/s3c2410.c | 2 +- arch/arm/mach-s3c24xx/s3c2412.c | 2 +- arch/arm/mach-s3c24xx/s3c2416.c | 2 +- arch/arm/mach-s3c24xx/s3c2443.c | 2 +- arch/arm/mach-s3c24xx/s3c244x.c | 2 +- arch/arm/mach-s3c64xx/common.c | 7 ++++++- arch/arm/plat-samsung/Kconfig | 1 + 10 files changed, 22 insertions(+), 16 deletions(-) _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel