* [GIT PULL 1/5] ARM: defconfig: changes for v5.10
2020-09-20 16:07 [GIT PULL 0/5] Second pull round for Samsung SoC Krzysztof Kozlowski
@ 2020-09-20 16:07 ` Krzysztof Kozlowski
2020-09-20 16:07 ` [GIT PULL 2/5] ARM: dts: samsung " Krzysztof Kozlowski
` (2 subsequent siblings)
3 siblings, 0 replies; 9+ messages in thread
From: Krzysztof Kozlowski @ 2020-09-20 16:07 UTC (permalink / raw)
To: Olof Johansson, Arnd Bergmann, arm, soc
Cc: linux-samsung-soc, Kukjin Kim, linux-arm-kernel,
Krzysztof Kozlowski, linux-kernel
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-defconfig-5.10
for you to fetch changes up to 4c42831b307838f8218f4f3ef0cf5a4349721ca9:
arm64: defconfig: Enable Samsung S3FWRN5 NFC driver (2020-09-10 18:13:47 +0200)
----------------------------------------------------------------
Samsung defconfig changes for v5.10
1. Re-enable platform media drivers as new dependency on
MEDIA_PLATFORM_SUPPORT appeared.
2. Enable ROHM BD718x7 PMIC present on some of boards with i.MX 8 SoCs.
3. Enable Samsung S3FWRN5 NFC driver present on TM2/TM2E boards.
----------------------------------------------------------------
Krzysztof Kozlowski (2):
arm64: defconfig: Enable clock driver for ROHM BD718x7 PMIC
arm64: defconfig: Enable Samsung S3FWRN5 NFC driver
Marek Szyprowski (1):
ARM: exynos_defconfig: enable platform media drivers
arch/arm/configs/exynos_defconfig | 8 ++++----
arch/arm64/configs/defconfig | 4 ++++
2 files changed, 8 insertions(+), 4 deletions(-)
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 9+ messages in thread* [GIT PULL 2/5] ARM: dts: samsung for v5.10
2020-09-20 16:07 [GIT PULL 0/5] Second pull round for Samsung SoC Krzysztof Kozlowski
2020-09-20 16:07 ` [GIT PULL 1/5] ARM: defconfig: changes for v5.10 Krzysztof Kozlowski
@ 2020-09-20 16:07 ` Krzysztof Kozlowski
2020-09-20 16:07 ` [GIT PULL 3/5] arm64: dts: exynos " Krzysztof Kozlowski
2020-09-20 16:07 ` [GIT PULL 4/5] ARM: samsung: mach/soc " Krzysztof Kozlowski
3 siblings, 0 replies; 9+ messages in thread
From: Krzysztof Kozlowski @ 2020-09-20 16:07 UTC (permalink / raw)
To: Olof Johansson, Arnd Bergmann, arm, soc
Cc: linux-samsung-soc, Kukjin Kim, linux-arm-kernel,
Krzysztof Kozlowski, linux-kernel
Hi,
On top of previous pull.
Best regards,
Krzysztof
The following changes since commit d3604c91566a8b06683482e0c7e2fa9473aa8b9a:
ARM: dts: exynos: Silence SATA PHY warning in Exynos5250 (2020-09-06 18:56:39 +0200)
are available in the Git repository at:
https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git tags/samsung-dt-5.10-2
for you to fetch changes up to 6995a4c46331e39646e1bbe4418acf5cf00ef536:
ARM: dts: s5pv210: replace deprecated "gpios" i2c-gpio property in Goni (2020-09-16 19:17:25 +0200)
----------------------------------------------------------------
Samsung DTS ARM changes for v5.10, part two
1. Further cleanup of DTS with dtschema: s5pv210, s3c6410 and s3c24xx.
This fixes many minor dtschema violations, adds few missing
functionalities (like clock for RTC) and improves the code
maintainability in few places. Except the RTC clock, this should not
have visible impact.
2. Fix few remaining Exynos dtschema violations.
----------------------------------------------------------------
Krzysztof Kozlowski (36):
dt-bindings: samsung: pmu: document S5Pv210
ARM: dts: s5pv210: fix pinctrl property of "vibrator-en" regulator in Aries
ARM: dts: s5pv210: remove DMA controller bus node name to fix dtschema warnings
ARM: dts: s5pv210: move fixed clocks under root node
ARM: dts: s5pv210: move PMU node out of clock controller
ARM: dts: s5pv210: remove dedicated 'audio-subsystem' node
ARM: dts: s5pv210: add RTC 32 KHz clock in Aquilla
ARM: dts: s5pv210: add RTC 32 KHz clock in Aries family
ARM: dts: s5pv210: add RTC 32 KHz clock in Goni
ARM: dts: s5pv210: add RTC 32 KHz clock in SMDKC110
ARM: dts: s5pv210: add RTC 32 KHz clock in SMDKV210
ARM: dts: s5pv210: add RTC 32 KHz clock in Torbreck
ARM: dts: s5pv210: use defines for GPIO flags in Aquila
ARM: dts: s5pv210: use defines for GPIO flags in Goni
ARM: dts: s5pv210: use defines for IRQ flags in SMDKV210
ARM: dts: s5pv210: use defines for IRQ flags in Goni
ARM: dts: s5pv210: align SPI GPIO node name with dtschema in Aries
ARM: dts: s5pv210: correct ethernet unit address in SMDKV210
ARM: dts: s3c6410: move fixed clocks under root node in Mini6410
ARM: dts: s3c6410: move fixed clocks under root node in SMDK6410
ARM: dts: s3c6410: align node SROM bus node name with dtschema in Mini6410
ARM: dts: s3c6410: align node SROM bus node name with dtschema in SMDK6410
ARM: dts: s3c6410: remove additional CPU compatible
ARM: dts: s3c24xx: fix number of PWM cells
ARM: dts: s3c24xx: override nodes by label
ARM: dts: s3c24xx: align PWM/timer node name with dtschema
ARM: dts: s3c24xx: add address to CPU node
ARM: dts: s3c24xx: move fixed clocks under root node in SMDK2416
ARM: dts: exynos: add input clock to CMU in Exynos3250
ARM: dts: exynos: add input clock to CMU in Exynos4412 Odroid
ARM: dts: exynos: move assigned-clock* properties to i2s0 node in Odroid XU4
ARM: dts: exynos: Align OPP table name with dt-schema
ARM: dts: s5pv210: move fixed regulators under root node in Aquila
ARM: dts: s5pv210: move fixed regulators under root node in Goni
ARM: dts: s5pv210: replace deprecated "gpios" i2c-gpio property in Aquila
ARM: dts: s5pv210: replace deprecated "gpios" i2c-gpio property in Goni
.../devicetree/bindings/arm/samsung/pmu.yaml | 2 +
arch/arm/boot/dts/exynos3250-artik5.dtsi | 4 +
arch/arm/boot/dts/exynos3250-monk.dts | 4 +
arch/arm/boot/dts/exynos3250-rinato.dts | 4 +
arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 1 +
arch/arm/boot/dts/exynos4412.dtsi | 16 +-
arch/arm/boot/dts/exynos5250.dtsi | 2 +-
arch/arm/boot/dts/exynos5422-odroidxu4.dts | 60 ++++----
arch/arm/boot/dts/s3c2416-smdk2416.dts | 17 +--
arch/arm/boot/dts/s3c2416.dtsi | 111 +++++++-------
arch/arm/boot/dts/s3c24xx.dtsi | 24 +--
arch/arm/boot/dts/s3c6410-mini6410.dts | 32 ++--
arch/arm/boot/dts/s3c6410-smdk6410.dts | 32 ++--
arch/arm/boot/dts/s3c64xx.dtsi | 2 +-
arch/arm/boot/dts/s5pv210-aquila.dts | 73 +++++----
arch/arm/boot/dts/s5pv210-aries.dtsi | 16 +-
arch/arm/boot/dts/s5pv210-goni.dts | 97 ++++++------
arch/arm/boot/dts/s5pv210-smdkc110.dts | 9 ++
arch/arm/boot/dts/s5pv210-smdkv210.dts | 14 +-
arch/arm/boot/dts/s5pv210-torbreck.dts | 9 ++
arch/arm/boot/dts/s5pv210.dtsi | 163 +++++++++------------
21 files changed, 358 insertions(+), 334 deletions(-)
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 9+ messages in thread* [GIT PULL 3/5] arm64: dts: exynos for v5.10
2020-09-20 16:07 [GIT PULL 0/5] Second pull round for Samsung SoC Krzysztof Kozlowski
2020-09-20 16:07 ` [GIT PULL 1/5] ARM: defconfig: changes for v5.10 Krzysztof Kozlowski
2020-09-20 16:07 ` [GIT PULL 2/5] ARM: dts: samsung " Krzysztof Kozlowski
@ 2020-09-20 16:07 ` Krzysztof Kozlowski
2020-09-20 16:07 ` [GIT PULL 4/5] ARM: samsung: mach/soc " Krzysztof Kozlowski
3 siblings, 0 replies; 9+ messages in thread
From: Krzysztof Kozlowski @ 2020-09-20 16:07 UTC (permalink / raw)
To: Olof Johansson, Arnd Bergmann, arm, soc
Cc: linux-samsung-soc, Kukjin Kim, linux-arm-kernel,
Krzysztof Kozlowski, linux-kernel
Hi,
On top of previous pull.
Best regards,
Krzysztof
The following changes since commit 7e98d540f21fde5768b4d28f8b3016ac080735b0:
arm64: dts: exynos: Add compatibles to sysreg nodes (2020-09-01 12:13:04 +0200)
are available in the Git repository at:
https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git tags/samsung-dt64-5.10-2
for you to fetch changes up to fceeb3f69e5d04353758b03d94da4bec99ffaff9:
arm64: dts: exynos: Align OPP table name with dt-schema (2020-09-16 19:12:50 +0200)
----------------------------------------------------------------
Samsung DTS ARM64 changes for v5.10, part two
Minor cleanups: removal of undocumented I2S properties, alignment of OPP
table node name with dtschema.
----------------------------------------------------------------
Krzysztof Kozlowski (2):
arm64: dts: exynos: Remove undocumented i2s properties in Exynos5433
arm64: dts: exynos: Align OPP table name with dt-schema
arch/arm64/boot/dts/exynos/exynos5433.dtsi | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 9+ messages in thread* [GIT PULL 4/5] ARM: samsung: mach/soc for v5.10
2020-09-20 16:07 [GIT PULL 0/5] Second pull round for Samsung SoC Krzysztof Kozlowski
` (2 preceding siblings ...)
2020-09-20 16:07 ` [GIT PULL 3/5] arm64: dts: exynos " Krzysztof Kozlowski
@ 2020-09-20 16:07 ` Krzysztof Kozlowski
2020-09-26 19:50 ` Olof Johansson
3 siblings, 1 reply; 9+ messages in thread
From: Krzysztof Kozlowski @ 2020-09-20 16:07 UTC (permalink / raw)
To: Olof Johansson, Arnd Bergmann, arm, soc
Cc: linux-samsung-soc, Kukjin Kim, linux-arm-kernel,
Krzysztof Kozlowski, linux-kernel
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
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [GIT PULL 4/5] ARM: samsung: mach/soc for v5.10
2020-09-20 16:07 ` [GIT PULL 4/5] ARM: samsung: mach/soc " Krzysztof Kozlowski
@ 2020-09-26 19:50 ` Olof Johansson
0 siblings, 0 replies; 9+ messages in thread
From: Olof Johansson @ 2020-09-26 19:50 UTC (permalink / raw)
To: Krzysztof Kozlowski
Cc: Arnd Bergmann, arm, soc, Kukjin Kim, linux-arm-kernel,
linux-samsung-soc, linux-kernel
Hi,
On Sun, Sep 20, 2020 at 06:07:04PM +0200, Krzysztof Kozlowski wrote:
> 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.
> +
> =======
I don't mind doing this conflict resolution, and will merge it now,
but next time you can just base this branch on the cleanup branch.
-Olof
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [GIT PULL 4/5] ARM: samsung: mach/soc for v5.10
@ 2020-09-26 19:50 ` Olof Johansson
0 siblings, 0 replies; 9+ messages in thread
From: Olof Johansson @ 2020-09-26 19:50 UTC (permalink / raw)
To: Krzysztof Kozlowski
Cc: linux-samsung-soc, Arnd Bergmann, linux-kernel, soc, arm,
Kukjin Kim, linux-arm-kernel
Hi,
On Sun, Sep 20, 2020 at 06:07:04PM +0200, Krzysztof Kozlowski wrote:
> 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.
> +
> =======
I don't mind doing this conflict resolution, and will merge it now,
but next time you can just base this branch on the cleanup branch.
-Olof
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [GIT PULL 4/5] ARM: samsung: mach/soc for v5.10
2020-09-26 19:50 ` Olof Johansson
@ 2020-10-03 19:29 ` Olof Johansson
-1 siblings, 0 replies; 9+ messages in thread
From: Olof Johansson @ 2020-10-03 19:29 UTC (permalink / raw)
To: Krzysztof Kozlowski
Cc: Arnd Bergmann, ARM-SoC Maintainers, SoC Team, Kukjin Kim,
Linux ARM Mailing List,
moderated list:ARM/SAMSUNG EXYNOS ARM ARCHITECTURES,
Linux Kernel Mailing List
On Sat, Oct 3, 2020 at 9:29 PM Olof Johansson <olof@lixom.net> wrote:
>
> Hi,
>
> On Sun, Sep 20, 2020 at 06:07:04PM +0200, Krzysztof Kozlowski wrote:
> > 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.
> > +
> > =======
>
> I don't mind doing this conflict resolution, and will merge it now,
> but next time you can just base this branch on the cleanup branch.
Apologies for sitting on this email, I flush the outbound queue by
hand and seem to have forgotten. :)
-Olof
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [GIT PULL 4/5] ARM: samsung: mach/soc for v5.10
@ 2020-10-03 19:29 ` Olof Johansson
0 siblings, 0 replies; 9+ messages in thread
From: Olof Johansson @ 2020-10-03 19:29 UTC (permalink / raw)
To: Krzysztof Kozlowski
Cc: moderated list:ARM/SAMSUNG EXYNOS ARM ARCHITECTURES,
Arnd Bergmann, Linux Kernel Mailing List, SoC Team,
ARM-SoC Maintainers, Kukjin Kim, Linux ARM Mailing List
On Sat, Oct 3, 2020 at 9:29 PM Olof Johansson <olof@lixom.net> wrote:
>
> Hi,
>
> On Sun, Sep 20, 2020 at 06:07:04PM +0200, Krzysztof Kozlowski wrote:
> > 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.
> > +
> > =======
>
> I don't mind doing this conflict resolution, and will merge it now,
> but next time you can just base this branch on the cleanup branch.
Apologies for sitting on this email, I flush the outbound queue by
hand and seem to have forgotten. :)
-Olof
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 9+ messages in thread