tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

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>

Arnd Bergmann d21877ac 8b0beb45

+11 -10
+1
.mailmap
··· 741 741 Saravana Kannan <saravanak@kernel.org> <skannan@codeaurora.org> 742 742 Saravana Kannan <saravanak@kernel.org> <saravanak@google.com> 743 743 Sascha Hauer <s.hauer@pengutronix.de> 744 + Sasha Finkelstein <k@chaosmail.tech> <fnkl.kernel@gmail.com> 744 745 Sahitya Tummala <quic_stummala@quicinc.com> <stummala@codeaurora.org> 745 746 Sathishkumar Muruganandam <quic_murugana@quicinc.com> <murugana@codeaurora.org> 746 747 Satya Priya <quic_skakitap@quicinc.com> <quic_c_skakit@quicinc.com> <skakit@codeaurora.org>
+1 -1
Documentation/devicetree/bindings/display/apple,h7-display-pipe-mipi.yaml
··· 7 7 title: Apple pre-DCP display controller MIPI interface 8 8 9 9 maintainers: 10 - - Sasha Finkelstein <fnkl.kernel@gmail.com> 10 + - Sasha Finkelstein <k@chaosmail.tech> 11 11 12 12 description: 13 13 The MIPI controller part of the pre-DCP Apple display controller
+1 -1
Documentation/devicetree/bindings/display/apple,h7-display-pipe.yaml
··· 7 7 title: Apple pre-DCP display controller 8 8 9 9 maintainers: 10 - - Sasha Finkelstein <fnkl.kernel@gmail.com> 10 + - Sasha Finkelstein <k@chaosmail.tech> 11 11 12 12 description: 13 13 A secondary display controller used to drive the "touchbar" on
+1 -1
Documentation/devicetree/bindings/display/panel/apple,summit.yaml
··· 7 7 title: Apple "Summit" display panel 8 8 9 9 maintainers: 10 - - Sasha Finkelstein <fnkl.kernel@gmail.com> 10 + - Sasha Finkelstein <k@chaosmail.tech> 11 11 12 12 description: 13 13 An OLED panel used as a touchbar on certain Apple laptops.
+1 -1
Documentation/devicetree/bindings/gpu/apple,agx.yaml
··· 7 7 title: Apple SoC GPU 8 8 9 9 maintainers: 10 - - Sasha Finkelstein <fnkl.kernel@gmail.com> 10 + - Sasha Finkelstein <k@chaosmail.tech> 11 11 12 12 properties: 13 13 compatible:
+1 -1
Documentation/devicetree/bindings/input/touchscreen/apple,z2-multitouch.yaml
··· 7 7 title: Apple touchscreens attached using the Z2 protocol 8 8 9 9 maintainers: 10 - - Sasha Finkelstein <fnkl.kernel@gmail.com> 10 + - Sasha Finkelstein <k@chaosmail.tech> 11 11 12 12 description: A series of touschscreen controllers used in Apple products 13 13
+1 -1
Documentation/devicetree/bindings/nvmem/apple,spmi-nvmem.yaml
··· 9 9 description: Exports a series of SPMI registers as NVMEM cells 10 10 11 11 maintainers: 12 - - Sasha Finkelstein <fnkl.kernel@gmail.com> 12 + - Sasha Finkelstein <k@chaosmail.tech> 13 13 14 14 allOf: 15 15 - $ref: nvmem.yaml#
+1 -1
Documentation/devicetree/bindings/pwm/apple,s5l-fpwm.yaml
··· 8 8 9 9 maintainers: 10 10 - asahi@lists.linux.dev 11 - - Sasha Finkelstein <fnkl.kernel@gmail.com> 11 + - Sasha Finkelstein <k@chaosmail.tech> 12 12 13 13 description: PWM controller used for keyboard backlight on ARM Macs 14 14
+1 -1
Documentation/devicetree/bindings/spmi/apple,spmi.yaml
··· 7 7 title: Apple SPMI controller 8 8 9 9 maintainers: 10 - - Sasha Finkelstein <fnkl.kernel@gmail.com> 10 + - Sasha Finkelstein <k@chaosmail.tech> 11 11 12 12 description: A SPMI controller present on most Apple SoCs 13 13
+1 -1
MAINTAINERS
··· 8691 8691 F: include/uapi/drm/tegra_drm.h 8692 8692 8693 8693 DRM DRIVERS FOR PRE-DCP APPLE DISPLAY OUTPUT 8694 - M: Sasha Finkelstein <fnkl.kernel@gmail.com> 8694 + M: Sasha Finkelstein <k@chaosmail.tech> 8695 8695 R: Janne Grunau <j@jannau.net> 8696 8696 L: dri-devel@lists.freedesktop.org 8697 8697 L: asahi@lists.linux.dev
+1 -1
arch/arm64/boot/dts/apple/spi1-nvram.dtsi
··· 2 2 // 3 3 // Devicetree include for common spi-nor nvram flash. 4 4 // 5 - // Apple uses a consistent configiguration for the nvram on all known M1* and 5 + // Apple uses a consistent configuration for the nvram on all known M1* and 6 6 // M2* devices. 7 7 // 8 8 // Copyright The Asahi Linux Contributors