linuxmsm/laptops-kernel
0
0
Fork 0
mirror of https://github.com/linux-msm/laptops-kernel.git synced 2026-08-13 14:19:53 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'apple-soc-fixes-7.0' of https://git.kernel.org/pub/scm/linux/kernel/git/sven/linux into soc/late2

Browse Source 
Apple SoC fixes for 7.0

Two commits without any functional changes that arrived just before the
merge window opened:
- Update Sasha's email address in all dt-bindings, MAINTAINERS and add
  him to mailmap
- Fix a typo in spi1-nvram.dtsi

* tag 'apple-soc-fixes-7.0' of https://git.kernel.org/pub/scm/linux/kernel/git/sven/linux:
  arm64: dts: apple: Fix spelling error
  dt-bindings: Update Sasha Finkelstein's email address
  mailmap: Update Sasha Finkelstein's email address

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann
2026-04-20 17:26:46 +02:00
parent 8b0beb4584 c7ff53ef45
commit d21877ac27
11 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.mailmap
+1
View File
@@ -741,6 +741,7 @@ Sarangdhar Joshi <spjoshi@codeaurora.org>
Saravana Kannan <saravanak@kernel.org> <skannan@codeaurora.org>
Saravana Kannan <saravanak@kernel.org> <saravanak@google.com>
Sascha Hauer <s.hauer@pengutronix.de>
Sasha Finkelstein <k@chaosmail.tech> <fnkl.kernel@gmail.com>
Sahitya Tummala <quic_stummala@quicinc.com> <stummala@codeaurora.org>
Sathishkumar Muruganandam <quic_murugana@quicinc.com> <murugana@codeaurora.org>
Satya Priya <quic_skakitap@quicinc.com> <quic_c_skakit@quicinc.com> <skakit@codeaurora.org>
Documentation/devicetree/bindings/display/apple,h7-display-pipe-mipi.yaml
+1 -1
View File
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Apple pre-DCP display controller MIPI interface
maintainers:
- Sasha Finkelstein <fnkl.kernel@gmail.com>
- Sasha Finkelstein <k@chaosmail.tech>
description:
The MIPI controller part of the pre-DCP Apple display controller
Documentation/devicetree/bindings/display/apple,h7-display-pipe.yaml
+1 -1
View File
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Apple pre-DCP display controller
maintainers:
- Sasha Finkelstein <fnkl.kernel@gmail.com>
- Sasha Finkelstein <k@chaosmail.tech>
description:
A secondary display controller used to drive the "touchbar" on
Documentation/devicetree/bindings/display/panel/apple,summit.yaml
+1 -1
View File
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Apple "Summit" display panel
maintainers:
- Sasha Finkelstein <fnkl.kernel@gmail.com>
- Sasha Finkelstein <k@chaosmail.tech>
description:
An OLED panel used as a touchbar on certain Apple laptops.
Documentation/devicetree/bindings/gpu/apple,agx.yaml
+1 -1
View File
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Apple SoC GPU
maintainers:
- Sasha Finkelstein <fnkl.kernel@gmail.com>
- Sasha Finkelstein <k@chaosmail.tech>
properties:
compatible:
Documentation/devicetree/bindings/input/touchscreen/apple,z2-multitouch.yaml
+1 -1
View File
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Apple touchscreens attached using the Z2 protocol
maintainers:
- Sasha Finkelstein <fnkl.kernel@gmail.com>
- Sasha Finkelstein <k@chaosmail.tech>
description: A series of touschscreen controllers used in Apple products
Documentation/devicetree/bindings/nvmem/apple,spmi-nvmem.yaml
+1 -1
View File
@@ -9,7 +9,7 @@ title: Apple SPMI NVMEM
description: Exports a series of SPMI registers as NVMEM cells
maintainers:
- Sasha Finkelstein <fnkl.kernel@gmail.com>
- Sasha Finkelstein <k@chaosmail.tech>
allOf:
- $ref: nvmem.yaml#
Documentation/devicetree/bindings/pwm/apple,s5l-fpwm.yaml
+1 -1
View File
@@ -8,7 +8,7 @@ title: Apple FPWM controller
maintainers:
- asahi@lists.linux.dev
- Sasha Finkelstein <fnkl.kernel@gmail.com>
- Sasha Finkelstein <k@chaosmail.tech>
description: PWM controller used for keyboard backlight on ARM Macs
Documentation/devicetree/bindings/spmi/apple,spmi.yaml
+1 -1
View File
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Apple SPMI controller
maintainers:
- Sasha Finkelstein <fnkl.kernel@gmail.com>
- Sasha Finkelstein <k@chaosmail.tech>
description: A SPMI controller present on most Apple SoCs
MAINTAINERS
+1 -1
View File
@@ -8691,7 +8691,7 @@ F: include/linux/host1x.h
F: include/uapi/drm/tegra_drm.h
DRM DRIVERS FOR PRE-DCP APPLE DISPLAY OUTPUT
M: Sasha Finkelstein <fnkl.kernel@gmail.com>
M: Sasha Finkelstein <k@chaosmail.tech>
R: Janne Grunau <j@jannau.net>
L: dri-devel@lists.freedesktop.org
L: asahi@lists.linux.dev
arch/arm64/boot/dts/apple/spi1-nvram.dtsi
+1 -1
View File
@@ -2,7 +2,7 @@
//
// Devicetree include for common spi-nor nvram flash.
//
// Apple uses a consistent configiguration for the nvram on all known M1* and
// Apple uses a consistent configuration for the nvram on all known M1* and
// M2* devices.
//
// Copyright The Asahi Linux Contributors