Unverified Commit d21877ac authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'apple-soc-fixes-7.0' of... 

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: default avatarArnd Bergmann <arnd@arndb.de>
parents 8b0beb45 c7ff53ef

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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: