Unverified Commit 33e79299 authored May 09, 2025 by Arnd Bergmann

Merge tag 'asahi-soc-fixes-6.15' of https://github.com/AsahiLinux/linux into arm/fixes

Apple SoC fixes for 6.15

This tag contains two small commits since rc1:
- Add a .mailmap entry requested by Asahi Lina to better filter her
  emails
- Mark the power domains for the touchbar support introduced with 6.15
  as always on since the driver cannot initialize the touchbar from
  scratch after the domains are powered off (e.g. during suspend).

* tag 'asahi-soc-fixes-6.15' of https://github.com/AsahiLinux/linux:
  arm64: dts: apple: touchbar: Mark ps_dispdfr_be as always-on
  mailmap: Update email for Asahi Lina

Link: https://lore.kernel.org/r/20250423145047.3098-1-sven@svenpeter.dev


Signed-off-by: Arnd Bergmann <arnd@arndb.de>

parents 60539152 dc5befec

.mailmap

+1 −0

Original line number	Diff line number	Diff line
		@@ -102,6 +102,7 @@ Ard Biesheuvel <ardb@kernel.org> <ard.biesheuvel@linaro.org>
		Arnaud Patard <arnaud.patard@rtp-net.org>
		Arnd Bergmann <arnd@arndb.de>
		Arun Kumar Neelakantam <quic_aneela@quicinc.com> <aneela@codeaurora.org>
		Asahi Lina <lina+kernel@asahilina.net> <lina@asahilina.net>
		Ashok Raj Nagarajan <quic_arnagara@quicinc.com> <arnagara@codeaurora.org>
		Ashwin Chaugule <quic_ashwinc@quicinc.com> <ashwinc@codeaurora.org>
		Asutosh Das <quic_asutoshd@quicinc.com> <asutoshd@codeaurora.org>

arch/arm64/boot/dts/apple/t8103-j293.dts

+10 −0

Original line number	Diff line number	Diff line
		@@ -77,6 +77,16 @@ touchbar0: touchbar@0 {
		};
		};

		/*
		* The driver depends on boot loader initialized state which resets when this
		* power-domain is powered off. This happens on suspend or when the driver is
		* missing during boot. Mark the domain as always on until the driver can
		* handle this.
		*/
		&ps_dispdfr_be {
		apple,always-on;
		};

		&display_dfr {
		status = "okay";
		};

arch/arm64/boot/dts/apple/t8112-j493.dts

+10 −0

Original line number	Diff line number	Diff line
		@@ -40,6 +40,16 @@ led-0 {
		};
		};

		/*
		* The driver depends on boot loader initialized state which resets when this
		* power-domain is powered off. This happens on suspend or when the driver is
		* missing during boot. Mark the domain as always on until the driver can
		* handle this.
		*/
		&ps_dispdfr_be {
		apple,always-on;
		};

		&display_dfr {
		status = "okay";
		};