Merge tag 'sfi-removal-5.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

Pull Simple Firmware Interface (SFI) support removal from Rafael Wysocki:
 "Drop support for depercated platforms using SFI, drop the entire
  support for SFI that has been long deprecated too and make some
  janitorial changes on top of that (Andy Shevchenko)"

* tag 'sfi-removal-5.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  x86/platform/intel-mid: Update Copyright year and drop file names
  x86/platform/intel-mid: Remove unused header inclusion in intel-mid.h
  x86/platform/intel-mid: Drop unused __intel_mid_cpu_chip and Co.
  x86/platform/intel-mid: Get rid of intel_scu_ipc_legacy.h
  x86/PCI: Describe @reg for type1_access_ok()
  x86/PCI: Get rid of custom x86 model comparison
  sfi: Remove framework for deprecated firmware
  cpufreq: sfi-cpufreq: Remove driver for deprecated firmware
  media: atomisp: Remove unused header
  mfd: intel_msic: Remove driver for deprecated platform
  x86/apb_timer: Remove driver for deprecated platform
  x86/platform/intel-mid: Remove unused leftovers (vRTC)
  x86/platform/intel-mid: Remove unused leftovers (msic)
  x86/platform/intel-mid: Remove unused leftovers (msic_thermal)
  x86/platform/intel-mid: Remove unused leftovers (msic_power_btn)
  x86/platform/intel-mid: Remove unused leftovers (msic_gpio)
  x86/platform/intel-mid: Remove unused leftovers (msic_battery)
  x86/platform/intel-mid: Remove unused leftovers (msic_ocd)
  x86/platform/intel-mid: Remove unused leftovers (msic_audio)
  platform/x86: intel_scu_wdt: Drop mistakenly added const

diff --cc Documentation/admin-guide/kernel-parameters.txt
Simple merge

diff --cc MAINTAINERS
index e91fe5b33b0e5cadd7bed0a68f4f74bca3a85795,fd41b96d71bba6f88b20355f12901311725ecfd2..878e558f5d7e1dd2d8d9a5b1d6af307ed2a41ad2
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -16314,21 -16234,6 +16312,14 @@@ S: Maintaine
  F:    Documentation/fb/sm712fb.rst
  F:    drivers/video/fbdev/sm712*
  
- SIMPLE FIRMWARE INTERFACE (SFI)
- S:    Obsolete
- W:    http://simplefirmware.org/
- F:    arch/x86/platform/sfi/
- F:    drivers/sfi/
- F:    include/linux/sfi*.h
- 
 +SILVACO I3C DUAL-ROLE MASTER
 +M:    Miquel Raynal <miquel.raynal@bootlin.com>
 +M:    Conor Culhane <conor.culhane@silvaco.com>
 +L:    linux-i3c@lists.infradead.org
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/i3c/silvaco,i3c-master.yaml
 +F:    drivers/i3c/master/svc-i3c-master.c
 +
  SIMPLEFB FB DRIVER
  M:    Hans de Goede <hdegoede@redhat.com>
  L:    linux-fbdev@vger.kernel.org

diff --cc arch/x86/Kconfig
index 792517c078c5e148b0f9817dd23944ee233eeaf0,7f5b7705526634ca2c51037d9a299c7f0061a02f..3b21020249067405c3501ec441be665658e55ef6
--- 1/arch/x86/Kconfig
--- 2/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@ -894,20 -889,8 +893,8 @@@ config HPET_TIME
  
  config HPET_EMULATE_RTC
        def_bool y
 -      depends on HPET_TIMER && (RTC=y || RTC=m || RTC_DRV_CMOS=m || RTC_DRV_CMOS=y)
 +      depends on HPET_TIMER && (RTC_DRV_CMOS=m || RTC_DRV_CMOS=y)
  
- config APB_TIMER
-       def_bool y if X86_INTEL_MID
-       prompt "Intel MID APB Timer Support" if X86_INTEL_MID
-       select DW_APB_TIMER
-       depends on X86_INTEL_MID && SFI
-       help
-        APB timer is the replacement for 8254, HPET on X86 MID platforms.
-        The APBT provides a stable time base on SMP
-        systems, unlike the TSC, but it is more expensive to access,
-        as it is off-chip. APB timers are always running regardless of CPU
-        C states, they are used as per CPU clockevent device when possible.
- 
  # Mark as expert because too many people got it wrong.
  # The code disables itself when not needed.
  config DMI

diff --cc arch/x86/platform/Makefile
Simple merge

diff --cc drivers/Makefile
Simple merge

diff --cc drivers/cpufreq/Makefile
Simple merge

diff --cc drivers/mfd/Kconfig
Simple merge

diff --cc drivers/mfd/Makefile
Simple merge