[GIT PULL 4/5] ARM: samsung: mach/soc for v5.10

From: Krzysztof Kozlowski <krzk@kernel.org>
To: Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
	arm@kernel.org, soc@kernel.org
Cc: linux-samsung-soc@vger.kernel.org, Kukjin Kim <kgene@kernel.org>,
	linux-arm-kernel@lists.infradead.org,
	Krzysztof Kozlowski <krzk@kernel.org>,
	linux-kernel@vger.kernel.org
Subject: [GIT PULL 4/5] ARM: samsung: mach/soc for v5.10
Date: Sun, 20 Sep 2020 18:07:04 +0200	[thread overview]
Message-ID: <20200920160705.9651-5-krzk@kernel.org> (raw)
In-Reply-To: <20200920160705.9651-1-krzk@kernel.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 <file:Documentation/arm/samsung-s3c24xx/suspend.rst>
 +	  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