Commit 507bd4b6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'soc-late-7.1' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc 

Pull more SoC updates from Arnd Bergmann:
 "These are the contents that arrived during the easter vacation and
  didn't make it into the last 7.0 bugfixes or the first set of branches
  for the merge window. Aside from a reset controller bugfix and an
  update to the MAINTAINERS entry, this is all devicetree changes.

  The Marvell devicetree updates contain the usual minor updates and
  bugfixes, along with a two larger but trivial patches to drop unused
  dtsi files, the single broadcom fix addresses a build time warning
  introduced during the merge window.

  The freescale, amlogic, and apple changes missed the last fixes branch
  for 7.0"

* tag 'soc-late-7.1' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (38 commits)
  arm64: dts: meson-gxl-p230: fix ethernet PHY interrupt number
  arm64: dts: amlogic: meson-axg: Add missing cache information to cpu0
  arm64: dts: amlogic: t7: khadas-vim4: fix board model name
  arm64: dts: amlogic: Fix GIC register ranges for Amlogic T7
  arm64: dts: amlogic: t7: khadas-vim4: fix memory layout for 8GB RAM
  arm64: dts: amlogic: s6: Drop CPU masks from GICv3 PPI interrupts
  Documentation/process: maintainer-soc: Document purpose of defconfigs
  Documentation/process: maintainer-soc: Trim from trivial ask-DT
  ARM: dts: bcm4709: fix bus range assignment
  arm64: dts: apple: Fix spelling error
  dt-bindings: Update Sasha Finkelstein's email address
  mailmap: Update Sasha Finkelstein's email address
  arm64: dts: marvell: armada-37xx: swap PHYs' order in USB3 controller node
  arm64: dts: marvell: armada-37xx: use 'usb2-phy' in USB3 controller's phy-names
  arm64: dts: imx8mm-tqma8mqml: Correct PAD settings for PMIC_nINT
  arm64: dts: imx8mn-tqma8mqnl: Correct PAD settings for PMIC_nINT
  arm64: dts: imx8mm-emtop-som: Correct PAD settings for PMIC_nINT
  reset: amlogic: t7: Fix null reset ops
  arm64: dts: imx8mp-data-modul-edm-sbc: Correct PAD settings for PMIC_nINT
  arm64: dts: imx8mp-dhcom-som: Correct PAD settings for PMIC_nINT
  ...
parents 8841842c dd5dc191

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -743,6 +743,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/arm/marvell/armada-7k-8k.yaml

+11 −0
Original line number Diff line number Diff line
@@ -21,6 +21,17 @@ properties: 
          - const: marvell,armada-ap806-dual

          - const: marvell,armada-ap806



      - description:

          Falcon (DB-98CX85x0) Development board COM Express Carrier plus

          Armada 7020 SoC COM Express CPU module

        items:

          - const: marvell,armada7020-falcon-carrier

          - const: marvell,db-falcon-carrier

          - const: marvell,armada7020-cpu-module

          - const: marvell,armada7020

          - const: marvell,armada-ap806-dual

          - const: marvell,armada-ap806



      - description: Armada 7040 SoC

        items:

          - enum:

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.