Unverified Commit 64954d19 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'samsung-drivers-5.16' of... 

Merge tag 'samsung-drivers-5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into arm/drivers

Samsung SoC drivers changes for v5.16

1. Convert Exynos ChipID and ASV driver to a module and make it a
   default, instead of selected. The driver is not essential, so it
   could be disabled, if needed.
2. Add support for Exynos850 and Exynos Auto v9 to Exynos ChipID and ASV
   driver.
3. Get rid of HAVE_S3C_RTC because it was adding just another layer
   instead of direct dependencies.
4. Minor cleanups.

* tag 'samsung-drivers-5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  soc: samsung: exynos-chipid: add exynosautov9 SoC support
  rtc: s3c: remove HAVE_S3C_RTC in favor of direct dependencies
  soc: samsung: exynos-chipid: Add Exynos850 support
  dt-bindings: samsung: exynos-chipid: Document Exynos850 compatible
  soc: samsung: exynos-chipid: Pass revision reg offsets
  soc: samsung: pm_domains: drop unused is_off field
  arm64: exynos: don't have ARCH_EXYNOS select EXYNOS_CHIPID
  soc: samsung: exynos-chipid: do not enforce built-in
  soc: samsung: exynos-chipid: convert to a module
  soc: samsung: exynos-chipid: avoid soc_device_to_device()
  soc: samsung: exynos-pmu: Fix compilation when nothing selects CONFIG_MFD_CORE

Link: https://lore.kernel.org/r/20211026094709.75692-2-krzysztof.kozlowski@canonical.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents c6807970 b417d1e8

Documentation/devicetree/bindings/arm/samsung/exynos-chipid.yaml

+3 −2
Original line number Diff line number Diff line
@@ -11,8 +11,9 @@ maintainers: 


properties:

  compatible:

    items:

      - const: samsung,exynos4210-chipid

    enum:

      - samsung,exynos4210-chipid

      - samsung,exynos850-chipid



  reg:

    maxItems: 1

arch/arm/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -475,7 +475,6 @@ config ARCH_S3C24XX 
	select GPIOLIB

	select GENERIC_IRQ_MULTI_HANDLER

	select HAVE_S3C2410_I2C if I2C

	select HAVE_S3C_RTC if RTC_CLASS

	select NEED_MACH_IO_H

	select S3C2410_WATCHDOG

	select SAMSUNG_ATAGS

arch/arm/mach-exynos/Kconfig

+0 −2
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ menuconfig ARCH_EXYNOS 
	select ARM_GIC

	select EXYNOS_IRQ_COMBINER

	select COMMON_CLK_SAMSUNG

	select EXYNOS_CHIPID

	select EXYNOS_THERMAL

	select EXYNOS_PMU

	select EXYNOS_SROM
@@ -22,7 +21,6 @@ menuconfig ARCH_EXYNOS 
	select HAVE_ARM_ARCH_TIMER if ARCH_EXYNOS5

	select HAVE_ARM_SCU if SMP

	select HAVE_S3C2410_I2C if I2C

	select HAVE_S3C_RTC if RTC_CLASS

	select PINCTRL

	select PINCTRL_EXYNOS

	select PM_GENERIC_DOMAINS if PM

arch/arm/mach-s5pv210/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ config ARCH_S5PV210 
	select COMMON_CLK_SAMSUNG

	select GPIOLIB

	select HAVE_S3C2410_I2C if I2C

	select HAVE_S3C_RTC if RTC_CLASS

	select PINCTRL

	select PINCTRL_EXYNOS

	select SOC_SAMSUNG

arch/arm64/Kconfig.platforms

+0 −2
Original line number Diff line number Diff line
@@ -92,10 +92,8 @@ config ARCH_BRCMSTB 
config ARCH_EXYNOS

	bool "ARMv8 based Samsung Exynos SoC family"

	select COMMON_CLK_SAMSUNG

	select EXYNOS_CHIPID

	select EXYNOS_PM_DOMAINS if PM_GENERIC_DOMAINS

	select EXYNOS_PMU

	select HAVE_S3C_RTC if RTC_CLASS

	select PINCTRL

	select PINCTRL_EXYNOS

	select PM_GENERIC_DOMAINS if PM