Skip to content

Commit 33e7929

Browse files
committed
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/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 6053915 + dc5befe commit 33e7929

File tree

3 files changed

+21
-0
lines changed

3 files changed

+21
-0
lines changed

.mailmap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ Ard Biesheuvel <[email protected]> <[email protected]>
102102
Arnaud Patard <[email protected]>
103103
Arnd Bergmann <[email protected]>
104104
Arun Kumar Neelakantam <[email protected]> <[email protected]>
105+
105106
Ashok Raj Nagarajan <[email protected]> <[email protected]>
106107
107108

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,16 @@
7777
};
7878
};
7979

80+
/*
81+
* The driver depends on boot loader initialized state which resets when this
82+
* power-domain is powered off. This happens on suspend or when the driver is
83+
* missing during boot. Mark the domain as always on until the driver can
84+
* handle this.
85+
*/
86+
&ps_dispdfr_be {
87+
apple,always-on;
88+
};
89+
8090
&display_dfr {
8191
status = "okay";
8292
};

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,16 @@
4040
};
4141
};
4242

43+
/*
44+
* The driver depends on boot loader initialized state which resets when this
45+
* power-domain is powered off. This happens on suspend or when the driver is
46+
* missing during boot. Mark the domain as always on until the driver can
47+
* handle this.
48+
*/
49+
&ps_dispdfr_be {
50+
apple,always-on;
51+
};
52+
4353
&display_dfr {
4454
status = "okay";
4555
};

0 commit comments

Comments
 (0)