Skip to content

Commit 507bd4b

Browse files
committed
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 ...
2 parents 8841842 + dd5dc19 commit 507bd4b

43 files changed

Lines changed: 81 additions & 314 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.mailmap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -743,6 +743,7 @@ Sarangdhar Joshi <[email protected]>
743743
744744
745745
Sascha Hauer <[email protected]>
746+
746747
747748
Sathishkumar Muruganandam <[email protected]> <[email protected]>
748749

Documentation/devicetree/bindings/arm/marvell/armada-7k-8k.yaml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,17 @@ properties:
2121
- const: marvell,armada-ap806-dual
2222
- const: marvell,armada-ap806
2323

24+
- description:
25+
Falcon (DB-98CX85x0) Development board COM Express Carrier plus
26+
Armada 7020 SoC COM Express CPU module
27+
items:
28+
- const: marvell,armada7020-falcon-carrier
29+
- const: marvell,db-falcon-carrier
30+
- const: marvell,armada7020-cpu-module
31+
- const: marvell,armada7020
32+
- const: marvell,armada-ap806-dual
33+
- const: marvell,armada-ap806
34+
2435
- description: Armada 7040 SoC
2536
items:
2637
- enum:

Documentation/devicetree/bindings/display/apple,h7-display-pipe-mipi.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Apple pre-DCP display controller MIPI interface
88

99
maintainers:
10-
- Sasha Finkelstein <[email protected]>
10+
- Sasha Finkelstein <[email protected]>
1111

1212
description:
1313
The MIPI controller part of the pre-DCP Apple display controller

Documentation/devicetree/bindings/display/apple,h7-display-pipe.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Apple pre-DCP display controller
88

99
maintainers:
10-
- Sasha Finkelstein <[email protected]>
10+
- Sasha Finkelstein <[email protected]>
1111

1212
description:
1313
A secondary display controller used to drive the "touchbar" on

Documentation/devicetree/bindings/display/panel/apple,summit.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Apple "Summit" display panel
88

99
maintainers:
10-
- Sasha Finkelstein <[email protected]>
10+
- Sasha Finkelstein <[email protected]>
1111

1212
description:
1313
An OLED panel used as a touchbar on certain Apple laptops.

Documentation/devicetree/bindings/gpu/apple,agx.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Apple SoC GPU
88

99
maintainers:
10-
- Sasha Finkelstein <[email protected]>
10+
- Sasha Finkelstein <[email protected]>
1111

1212
properties:
1313
compatible:

Documentation/devicetree/bindings/input/touchscreen/apple,z2-multitouch.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Apple touchscreens attached using the Z2 protocol
88

99
maintainers:
10-
- Sasha Finkelstein <[email protected]>
10+
- Sasha Finkelstein <[email protected]>
1111

1212
description: A series of touschscreen controllers used in Apple products
1313

Documentation/devicetree/bindings/nvmem/apple,spmi-nvmem.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ title: Apple SPMI NVMEM
99
description: Exports a series of SPMI registers as NVMEM cells
1010

1111
maintainers:
12-
- Sasha Finkelstein <[email protected]>
12+
- Sasha Finkelstein <[email protected]>
1313

1414
allOf:
1515
- $ref: nvmem.yaml#

Documentation/devicetree/bindings/pwm/apple,s5l-fpwm.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ title: Apple FPWM controller
88

99
maintainers:
1010
11-
- Sasha Finkelstein <[email protected]>
11+
- Sasha Finkelstein <[email protected]>
1212

1313
description: PWM controller used for keyboard backlight on ARM Macs
1414

Documentation/devicetree/bindings/spmi/apple,spmi.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Apple SPMI controller
88

99
maintainers:
10-
- Sasha Finkelstein <[email protected]>
10+
- Sasha Finkelstein <[email protected]>
1111

1212
description: A SPMI controller present on most Apple SoCs
1313

0 commit comments

Comments
 (0)