[PATCH 0/2] arm64: defconfig: Enable Apple Silicon drivers

[PATCH 0/2] arm64: defconfig: Enable Apple Silicon drivers

[Janne Grunau]

Many Apple silicon specific drivers used "default ARCH_APPLE". [1]
attempted to fix this and add the drivers to arm64's defconfig. While
default Kconfig removals were merged adding the drivers to defconfig
was not. A follow-up based on the discussion was never sent and then
apparently forgotten.
This small series addresses that. APPLE_PMGR_PWRSTATE is now selected by
ARCH_APPLE as it is considered critical for booting just like interrupt
controller. Since its absence does not break booting completely but
leaves just a mostly useless system allow !PM builds without
APPLE_PMGR_PWRSTATE.
The defconfig change is updated to include forgotten drivers and drivers
which were added in the meantime.

1: https://lore.kernel.org/asahi/20250612-apple-kconfig-defconfig-v1-0-0e6f9cb512c1@kernel.org/

Signed-off-by: Janne Grunau <j@jannau.net>
---
Janne Grunau (1):
      arm64: select APPLE_PMGR_PWRSTATE for ARCH_APPLE

Sven Peter (1):
      arm64: defconfig: Enable Apple Silicon drivers

 arch/arm64/Kconfig.platforms |  1 +
 arch/arm64/configs/defconfig | 27 +++++++++++++++++++++++++++
 2 files changed, 28 insertions(+)
---
base-commit: 8f0b4cce4481fb22653697cced8d0d04027cb1e8
change-id: 20251231-arch-arm64-apple-defconfig-22de55a3d1cc

Best regards,
-- 
Janne Grunau <j@jannau.net>

[PATCH 1/2] arm64: select APPLE_PMGR_PWRSTATE for ARCH_APPLE

[Janne Grunau]

Critical devices like the NVMe on Apple silicon systems depend on
APPLE_PMGR_PWRSTATE and others are powered down coming out of reset so
select APPLE_PMGR_PWRSTATE to ensure these devices work. Since the
systems are not totally unsusable (boot to initramfs is expected to
work) allow !PM builds without APPLE_PMGR_PWRSTATE.

Link: https://lore.kernel.org/asahi/2e022f4e-4c87-4da1-9d02-f7a3ae7c5798@arm.com/
Suggested-by: Robin Murphy <robin.murphy@arm.com>
Signed-off-by: Janne Grunau <j@jannau.net>
---
 arch/arm64/Kconfig.platforms | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms
index fff14807c965a19cd5ba7a2445be5fd77d94e7a8..200e5067560e4ac2cfeda01c97cfae112954a0fc 100644
--- a/arch/arm64/Kconfig.platforms
+++ b/arch/arm64/Kconfig.platforms
@@ -36,6 +36,7 @@ config ARCH_ALPINE
 config ARCH_APPLE
 	bool "Apple Silicon SoC family"
 	select APPLE_AIC
+	select APPLE_PMGR_PWRSTATE if PM
 	help
 	  This enables support for Apple's in-house ARM SoC family, such
 	  as the Apple M1.

-- 
2.52.0

[PATCH 2/2] arm64: defconfig: Enable Apple Silicon drivers

[Janne Grunau]

From: Sven Peter <sven@kernel.org>

Enable drivers for hardware present on Apple Silicon machines. None of
these drivers are critical so build them as modules. The reset and RTC
macsmc drivers would be useful as built-in drivers but they have large
dependencies so keep them as modules.

The size increases are minor and are offsetted by already merged
"default ARCH_APPLE" removals from the linked original submission.

vmlinux 157782640 -> 157902032 (+119392)
Image    41007616 ->  41073152 (+ 65536)

Link: https://lore.kernel.org/asahi/20250612-apple-kconfig-defconfig-v1-0-0e6f9cb512c1@kernel.org/
Signed-off-by: Sven Peter <sven@kernel.org>
Signed-off-by: Janne Grunau <j@jannau.net>

---
Changes compared to the original submission:
- Remove AIC and APPLE_PMGR_PWRSTATE as those are selected by ARCH_APPLE
- Add new macsmc drivers (mfd, reset, hwmon, rtc and gpio)
- Add BACKLIGHT_APPLE_DWI, DRM_PANEL_SUMMIT and NVMEM_APPLE_SPMI
  (suggested by Nick Chan)
- Add PWM_APPLE and APPLE_M1_CPU_PMU
---
 arch/arm64/configs/defconfig | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index 45288ec9eaf7365427d98195c48e2f8065a8bb1b..7370e56196cb65257ea6ee42b2872a4ed5dc0964 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -100,6 +100,7 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
 CONFIG_CPUFREQ_DT=y
 CONFIG_ACPI_CPPC_CPUFREQ=m
 CONFIG_ARM_ALLWINNER_SUN50I_CPUFREQ_NVMEM=m
+CONFIG_ARM_APPLE_SOC_CPUFREQ=m
 CONFIG_ARM_ARMADA_37XX_CPUFREQ=y
 CONFIG_ARM_SCPI_CPUFREQ=y
 CONFIG_ARM_IMX_CPUFREQ_DT=m
@@ -223,6 +224,7 @@ CONFIG_HOTPLUG_PCI_ACPI=y
 CONFIG_PCI_AARDVARK=y
 CONFIG_PCIE_ALTERA=y
 CONFIG_PCIE_ALTERA_MSI=y
+CONFIG_PCIE_APPLE=m
 CONFIG_PCIE_BRCMSTB=m
 CONFIG_PCI_HOST_THUNDER_PEM=y
 CONFIG_PCI_HOST_THUNDER_ECAM=y
@@ -301,6 +303,7 @@ CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_NBD=m
 CONFIG_VIRTIO_BLK=y
 CONFIG_BLK_DEV_NVME=m
+CONFIG_NVME_APPLE=m
 CONFIG_QCOM_COINCELL=m
 CONFIG_QCOM_FASTRPC=m
 CONFIG_SRAM=y
@@ -464,6 +467,7 @@ CONFIG_KEYBOARD_CROS_EC=y
 CONFIG_KEYBOARD_MTK_PMIC=m
 CONFIG_MOUSE_ELAN_I2C=m
 CONFIG_INPUT_TOUCHSCREEN=y
+CONFIG_TOUCHSCREEN_APPLE_Z2=m
 CONFIG_TOUCHSCREEN_ATMEL_MXT=m
 CONFIG_TOUCHSCREEN_GOODIX=m
 CONFIG_TOUCHSCREEN_GOODIX_BERLIN_SPI=m
@@ -551,6 +555,7 @@ CONFIG_I2C_MT65XX=y
 CONFIG_I2C_MV64XXX=y
 CONFIG_I2C_OMAP=y
 CONFIG_I2C_OWL=y
+CONFIG_I2C_APPLE=m
 CONFIG_I2C_PXA=y
 CONFIG_I2C_QCOM_CCI=m
 CONFIG_I2C_QCOM_GENI=m
@@ -565,6 +570,7 @@ CONFIG_I2C_UNIPHIER_F=y
 CONFIG_I2C_RCAR=y
 CONFIG_I2C_CROS_EC_TUNNEL=y
 CONFIG_SPI=y
+CONFIG_SPI_APPLE=m
 CONFIG_SPI_ARMADA_3700=y
 CONFIG_SPI_BCM2835=m
 CONFIG_SPI_BCM2835AUX=m
@@ -601,7 +607,9 @@ CONFIG_SPI_TEGRA210_QUAD=m
 CONFIG_SPI_TEGRA114=m
 CONFIG_SPI_SPIDEV=m
 CONFIG_SPMI=y
+CONFIG_SPMI_APPLE=m
 CONFIG_SPMI_MTK_PMIF=m
+CONFIG_PINCTRL_APPLE_GPIO=m
 CONFIG_PINCTRL_BRCMSTB=y
 CONFIG_PINCTRL_BCM2712=y
 CONFIG_PINCTRL_DA9062=m
@@ -698,9 +706,11 @@ CONFIG_GPIO_ADP5585=m
 CONFIG_GPIO_PCF857X=m
 CONFIG_GPIO_TPIC2810=m
 CONFIG_GPIO_BD9571MWV=m
+CONFIG_GPIO_MACSMC=m
 CONFIG_GPIO_MAX77620=y
 CONFIG_GPIO_SL28CPLD=m
 CONFIG_GPIO_AGGREGATOR=m
+CONFIG_POWER_RESET_MACSMC=m
 CONFIG_POWER_RESET_MSM=y
 CONFIG_POWER_RESET_QCOM_PON=m
 CONFIG_POWER_RESET_TORADEX_EC=m
@@ -721,6 +731,7 @@ CONFIG_SENSORS_ARM_SCMI=y
 CONFIG_SENSORS_ARM_SCPI=y
 CONFIG_SENSORS_GPIO_FAN=m
 CONFIG_SENSORS_JC42=m
+CONFIG_SENSORS_MACSMC_HWMON=m
 CONFIG_SENSORS_LM75=m
 CONFIG_SENSORS_LM90=m
 CONFIG_SENSORS_PWM_FAN=m
@@ -782,6 +793,7 @@ CONFIG_RENESAS_RZG2LWDT=y
 CONFIG_RENESAS_RZV2HWDT=y
 CONFIG_UNIPHIER_WATCHDOG=y
 CONFIG_PM8916_WATCHDOG=m
+CONFIG_APPLE_WATCHDOG=m
 CONFIG_BCM2835_WDT=y
 CONFIG_BCM7038_WDT=m
 CONFIG_MFD_ADP5585=m
@@ -789,6 +801,7 @@ CONFIG_MFD_ALTERA_SYSMGR=y
 CONFIG_MFD_BD9571MWV=y
 CONFIG_MFD_AXP20X_I2C=y
 CONFIG_MFD_AXP20X_RSB=y
+CONFIG_MFD_MACSMC=m
 CONFIG_MFD_DA9062=m
 CONFIG_MFD_EXYNOS_LPASS=m
 CONFIG_MFD_HI6421_PMIC=y
@@ -946,6 +959,7 @@ CONFIG_DRM_TEGRA=m
 CONFIG_DRM_PANEL_BOE_TV101WUM_NL6=m
 CONFIG_DRM_PANEL_LVDS=m
 CONFIG_DRM_PANEL_SIMPLE=m
+CONFIG_DRM_PANEL_SUMMIT=m
 CONFIG_DRM_PANEL_EDP=m
 CONFIG_DRM_PANEL_HIMAX_HX8279=m
 CONFIG_DRM_PANEL_HIMAX_HX83112A=m
@@ -1012,6 +1026,7 @@ CONFIG_FB=y
 CONFIG_FB_EFI=y
 CONFIG_FB_MODE_HELPERS=y
 CONFIG_BACKLIGHT_PWM=m
+CONFIG_BACKLIGHT_APPLE_DWI=m
 CONFIG_BACKLIGHT_QCOM_WLED=m
 CONFIG_BACKLIGHT_LP855X=m
 CONFIG_LOGO=y
@@ -1026,6 +1041,7 @@ CONFIG_SND_USB_AUDIO=m
 CONFIG_SND_USB_AUDIO_QMI=m
 CONFIG_SND_SOC=m
 CONFIG_SND_SOC_USB=m
+CONFIG_SND_SOC_APPLE_MCA=m
 CONFIG_SND_BCM2835_SOC_I2S=m
 CONFIG_SND_SOC_FSL_ASRC=m
 CONFIG_SND_SOC_FSL_MICFIL=m
@@ -1316,7 +1332,9 @@ CONFIG_RTC_DRV_XGENE=y
 CONFIG_RTC_DRV_TI_K3=m
 CONFIG_RTC_DRV_RENESAS_RTCA3=m
 CONFIG_RTC_DRV_NVIDIA_VRS10=m
+CONFIG_RTC_DRV_MACSMC=m
 CONFIG_DMADEVICES=y
+CONFIG_APPLE_ADMAC=m
 CONFIG_DMA_BCM2835=y
 CONFIG_DMA_SUN6I=m
 CONFIG_FSL_EDMA=y
@@ -1362,6 +1380,7 @@ CONFIG_CROS_EC_RPMSG=m
 CONFIG_CROS_EC_SPI=y
 CONFIG_CROS_KBD_LED_BACKLIGHT=m
 CONFIG_CROS_EC_CHARDEV=m
+CONFIG_COMMON_CLK_APPLE_NCO=m
 CONFIG_COMMON_CLK_RK808=y
 CONFIG_COMMON_CLK_SCMI=y
 CONFIG_COMMON_CLK_SCPI=y
@@ -1525,6 +1544,7 @@ CONFIG_ARM_SMMU=y
 CONFIG_ARM_SMMU_V3=y
 CONFIG_MTK_IOMMU=y
 CONFIG_QCOM_IOMMU=y
+CONFIG_APPLE_DART=m
 CONFIG_REMOTEPROC=y
 CONFIG_IMX_REMOTEPROC=y
 CONFIG_MTK_SCP=m
@@ -1544,6 +1564,9 @@ CONFIG_RPMSG_QCOM_SMD=y
 CONFIG_RPMSG_VIRTIO=y
 CONFIG_SOUNDWIRE=m
 CONFIG_SOUNDWIRE_QCOM=m
+CONFIG_APPLE_MAILBOX=m
+CONFIG_APPLE_RTKIT=m
+CONFIG_APPLE_SART=m
 CONFIG_FSL_DPAA=y
 CONFIG_FSL_MC_DPIO=y
 CONFIG_FSL_RCPM=y
@@ -1625,6 +1648,7 @@ CONFIG_IIO_CROS_EC_BARO=m
 CONFIG_MPL3115=m
 CONFIG_PWM=y
 CONFIG_PWM_ADP5585=m
+CONFIG_PWM_APPLE=m
 CONFIG_PWM_BCM2835=m
 CONFIG_PWM_BRCMSTB=m
 CONFIG_PWM_CROS_EC=m
@@ -1720,11 +1744,14 @@ CONFIG_QCOM_L2_PMU=y
 CONFIG_QCOM_L3_PMU=y
 CONFIG_ARM_SPE_PMU=m
 CONFIG_ARM_DMC620_PMU=m
+CONFIG_APPLE_M1_CPU_PMU=y
 CONFIG_HISI_PMU=y
 CONFIG_ARM_CORESIGHT_PMU_ARCH_SYSTEM_PMU=m
 CONFIG_NVIDIA_CORESIGHT_PMU_ARCH_SYSTEM_PMU=m
 CONFIG_MESON_DDR_PMU=m
 CONFIG_NVMEM_LAYOUT_SL28_VPD=m
+CONFIG_NVMEM_APPLE_EFUSES=m
+CONFIG_NVMEM_APPLE_SPMI=m
 CONFIG_NVMEM_IMX_OCOTP=y
 CONFIG_NVMEM_IMX_OCOTP_ELE=m
 CONFIG_NVMEM_IMX_OCOTP_SCU=y

-- 
2.52.0

Re: [PATCH 2/2] arm64: defconfig: Enable Apple Silicon drivers

[Piotr Masłowski]

Hello, I'm not a kernel developer so this might be entirely irrelevant,
but while browsing the list I noticed something you might've missed:

On Wed Dec 31, 2025 at 16:42 CET, Janne Grunau wrote:
> From: Sven Peter <sven@kernel.org>
>
> Enable drivers for hardware present on Apple Silicon machines. None of
> these drivers are critical so build them as modules.
[...]
> Link: https://lore.kernel.org/asahi/20250612-apple-kconfig-defconfig-v1-0-0e6f9cb512c1@kernel.org/
> Signed-off-by: Sven Peter <sven@kernel.org>
> Signed-off-by: Janne Grunau <j@jannau.net>
>
> ---
> Changes compared to the original submission:
> - Remove AIC and APPLE_PMGR_PWRSTATE as those are selected by ARCH_APPLE
> - Add new macsmc drivers (mfd, reset, hwmon, rtc and gpio)
> - Add BACKLIGHT_APPLE_DWI, DRM_PANEL_SUMMIT and NVMEM_APPLE_SPMI
>   (suggested by Nick Chan)

What about DRM_ADP which Nick also mentioned?

> - Add PWM_APPLE and APPLE_M1_CPU_PMU
[...]

I tried to check whether it had possibly been taken care of elsewhere,
but I didn't find anything related on the mailing list(s) nor in the repo.

Cheers,
Piotr Masłowski

Re: [PATCH 2/2] arm64: defconfig: Enable Apple Silicon drivers

[Janne Grunau]

On Wed, Dec 31, 2025 at 07:14:13PM +0100, Piotr Masłowski wrote:
> Hello, I'm not a kernel developer so this might be entirely irrelevant,
> but while browsing the list I noticed something you might've missed:
> 
> On Wed Dec 31, 2025 at 16:42 CET, Janne Grunau wrote:
> > From: Sven Peter <sven@kernel.org>
> >
> > Enable drivers for hardware present on Apple Silicon machines. None of
> > these drivers are critical so build them as modules.
> [...]
> > Link: https://lore.kernel.org/asahi/20250612-apple-kconfig-defconfig-v1-0-0e6f9cb512c1@kernel.org/
> > Signed-off-by: Sven Peter <sven@kernel.org>
> > Signed-off-by: Janne Grunau <j@jannau.net>
> >
> > ---
> > Changes compared to the original submission:
> > - Remove AIC and APPLE_PMGR_PWRSTATE as those are selected by ARCH_APPLE
> > - Add new macsmc drivers (mfd, reset, hwmon, rtc and gpio)
> > - Add BACKLIGHT_APPLE_DWI, DRM_PANEL_SUMMIT and NVMEM_APPLE_SPMI
> >   (suggested by Nick Chan)
> 
> What about DRM_ADP which Nick also mentioned?
> 
> > - Add PWM_APPLE and APPLE_M1_CPU_PMU
> [...]
> 
> I tried to check whether it had possibly been taken care of elsewhere,
> but I didn't find anything related on the mailing list(s) nor in the repo.

Good catch, I missed it in Nick's list. Comma or new line separated
entries would have been easier to read. I also missed the network and
bluetooth devices:

- BRCMFMAC_PCIE
- BT_HCIBCM4377
- TIGON3
- AQTION

Missing as well although only in linux-next is PHY_APPLE_ATC

What is the merge policy for defconfig changes? If this can be merged
for v6.19 I won't bother with a v2 and add them later in a subsequent
change.

If it will be picked up only for the next cycle (v7.0?) I'll send a v2
with the missing configs. Any advise how to deal with PHY_APPLE_ATC? It
depends on commit 8e98ca1e74db ("phy: apple: Add Apple Type-C PHY")
currently only in
https://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git/log/?h=next

Janne

Re: [PATCH 2/2] arm64: defconfig: Enable Apple Silicon drivers

[Sven Peter]

Hi,


On 07.01.26 12:20, Janne Grunau wrote:
[...]
> 
> What is the merge policy for defconfig changes? If this can be merged
> for v6.19 I won't bother with a v2 and add them later in a subsequent
> change.


I'll pick up the defconfig change this cycle and sent it upstream. We 
can then follow up next cycle with the missings ones and PHY_APPLE_ATC 
which should be in Torvald's tree by then.

Not sure about the Kconfig.platforms change though, does that go through 
the SoC tree or the arm64 tree?


Sven

Re: [PATCH 2/2] arm64: defconfig: Enable Apple Silicon drivers

[Krzysztof Kozlowski]

On 31/12/2025 16:42, Janne Grunau wrote:
> From: Sven Peter <sven@kernel.org>
> 
> Enable drivers for hardware present on Apple Silicon machines. None of
> these drivers are critical so build them as modules. The reset and RTC
> macsmc drivers would be useful as built-in drivers but they have large
> dependencies so keep them as modules.
> 
> The size increases are minor and are offsetted by already merged
> "default ARCH_APPLE" removals from the linked original submission.
> 
> vmlinux 157782640 -> 157902032 (+119392)
> Image    41007616 ->  41073152 (+ 65536)
> 
> Link: https://lore.kernel.org/asahi/20250612-apple-kconfig-defconfig-v1-0-0e6f9cb512c1@kernel.org/
> Signed-off-by: Sven Peter <sven@kernel.org>
> Signed-off-by: Janne Grunau <j@jannau.net>
> 


Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com>

Best regards,
Krzysztof

Re: [PATCH 0/2] arm64: defconfig: Enable Apple Silicon drivers

[Sven Peter]

On Wed, 31 Dec 2025 16:42:37 +0100, Janne Grunau wrote:
> Many Apple silicon specific drivers used "default ARCH_APPLE". [1]
> attempted to fix this and add the drivers to arm64's defconfig. While
> default Kconfig removals were merged adding the drivers to defconfig
> was not. A follow-up based on the discussion was never sent and then
> apparently forgotten.
> This small series addresses that. APPLE_PMGR_PWRSTATE is now selected by
> ARCH_APPLE as it is considered critical for booting just like interrupt
> controller. Since its absence does not break booting completely but
> leaves just a mostly useless system allow !PM builds without
> APPLE_PMGR_PWRSTATE.
> The defconfig change is updated to include forgotten drivers and drivers
> which were added in the meantime.
> 
> [...]

Applied to local tree (apple-soc/defconfig-6.20), thanks!

[1/2] arm64: select APPLE_PMGR_PWRSTATE for ARCH_APPLE
      https://github.com/AsahiLinux/linux/commit/92d3935e63df
[2/2] arm64: defconfig: Enable Apple Silicon drivers
      https://github.com/AsahiLinux/linux/commit/8c7a1d258d88

Best regards,
-- 
Sven Peter <sven@kernel.org>