Skip to content

Commit 071e5ac

Browse files
committed
Merge tag 'arm-drivers-5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull ARM driver updates from Olof Johansson: - Reset controllers: Adding support for Microchip Sparx5 Switch. - Memory controllers: ARM Primecell PL35x SMC memory controller driver cleanups and improvements. - i.MX SoC drivers: Power domain support for i.MX8MM and i.MX8MN. - Rockchip: RK3568 power domains support + DT binding updates, cleanups. - Qualcomm SoC drivers: Amend socinfo with more SoC/PMIC details, including support for MSM8226, MDM9607, SM6125 and SC8180X. - ARM FFA driver: "Firmware Framework for ARMv8-A", defining management interfaces and communication (including bus model) between partitions both in Normal and Secure Worlds. - Tegra Memory controller changes, including major rework to deal with identity mappings at boot and integration with ARM SMMU pieces. * tag 'arm-drivers-5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (120 commits) firmware: turris-mox-rwtm: add marvell,armada-3700-rwtm-firmware compatible string firmware: turris-mox-rwtm: show message about HWRNG registration firmware: turris-mox-rwtm: fail probing when firmware does not support hwrng firmware: turris-mox-rwtm: report failures better firmware: turris-mox-rwtm: fix reply status decoding function soc: imx: gpcv2: add support for i.MX8MN power domains dt-bindings: add defines for i.MX8MN power domains firmware: tegra: bpmp: Fix Tegra234-only builds iommu/arm-smmu: Use Tegra implementation on Tegra186 iommu/arm-smmu: tegra: Implement SID override programming iommu/arm-smmu: tegra: Detect number of instances at runtime dt-bindings: arm-smmu: Add Tegra186 compatible string firmware: qcom_scm: Add MDM9607 compatible soc: qcom: rpmpd: Add MDM9607 RPM Power Domains soc: renesas: Add support to read LSI DEVID register of RZ/G2{L,LC} SoC's soc: renesas: Add ARCH_R9A07G044 for the new RZ/G2L SoC's dt-bindings: soc: rockchip: drop unnecessary #phy-cells from grf.yaml memory: emif: remove unused frequency and voltage notifiers memory: fsl_ifc: fix leak of private memory on probe failure memory: fsl_ifc: fix leak of IO mapping on probe failure ...
2 parents e083bbd + 2afd1c2 commit 071e5ac

97 files changed

Lines changed: 8428 additions & 5174 deletions

Some content is hidden

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

Documentation/devicetree/bindings/arm/rockchip/pmu.txt

Lines changed: 0 additions & 16 deletions
This file was deleted.
Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
# SPDX-License-Identifier: GPL-2.0
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/arm/rockchip/pmu.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Rockchip Power Management Unit (PMU)
8+
9+
maintainers:
10+
- Elaine Zhang <zhangqing@rock-chips.com>
11+
- Heiko Stuebner <heiko@sntech.de>
12+
13+
description: |
14+
The PMU is used to turn on and off different power domains of the SoCs.
15+
This includes the power to the CPU cores.
16+
17+
select:
18+
properties:
19+
compatible:
20+
contains:
21+
enum:
22+
- rockchip,px30-pmu
23+
- rockchip,rk3066-pmu
24+
- rockchip,rk3288-pmu
25+
- rockchip,rk3399-pmu
26+
27+
required:
28+
- compatible
29+
30+
properties:
31+
compatible:
32+
items:
33+
- enum:
34+
- rockchip,px30-pmu
35+
- rockchip,rk3066-pmu
36+
- rockchip,rk3288-pmu
37+
- rockchip,rk3399-pmu
38+
- const: syscon
39+
- const: simple-mfd
40+
41+
reg:
42+
maxItems: 1
43+
44+
required:
45+
- compatible
46+
- reg
47+
48+
additionalProperties: true
49+
50+
examples:
51+
- |
52+
pmu@20004000 {
53+
compatible = "rockchip,rk3066-pmu", "syscon", "simple-mfd";
54+
reg = <0x20004000 0x100>;
55+
};

Documentation/devicetree/bindings/firmware/qcom,scm.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ Required properties:
1212
* "qcom,scm-ipq4019"
1313
* "qcom,scm-ipq806x"
1414
* "qcom,scm-ipq8074"
15+
* "qcom,scm-mdm9607"
1516
* "qcom,scm-msm8660"
1617
* "qcom,scm-msm8916"
1718
* "qcom,scm-msm8960"

Documentation/devicetree/bindings/iommu/arm,smmu.yaml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,14 @@ properties:
5454
- const: arm,mmu-500
5555
- description: NVIDIA SoCs that program two ARM MMU-500s identically
5656
items:
57+
- description: NVIDIA SoCs that require memory controller interaction
58+
and may program multiple ARM MMU-500s identically with the memory
59+
controller interleaving translations between multiple instances
60+
for improved performance.
61+
items:
5762
- enum:
58-
- nvidia,tegra194-smmu
63+
- const: nvidia,tegra194-smmu
64+
- const: nvidia,tegra186-smmu
5965
- const: nvidia,smmu-500
6066
- items:
6167
- const: arm,mmu-500
@@ -165,10 +171,11 @@ allOf:
165171
contains:
166172
enum:
167173
- nvidia,tegra194-smmu
174+
- nvidia,tegra186-smmu
168175
then:
169176
properties:
170177
reg:
171-
minItems: 2
178+
minItems: 1
172179
maxItems: 2
173180
else:
174181
properties:

Documentation/devicetree/bindings/phy/phy-rockchip-inno-usb2.yaml

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,6 @@ properties:
3030
"#clock-cells":
3131
const: 0
3232

33-
"#phy-cells":
34-
const: 0
35-
3633
clocks:
3734
maxItems: 1
3835

@@ -120,7 +117,6 @@ required:
120117
- reg
121118
- clock-output-names
122119
- "#clock-cells"
123-
- "#phy-cells"
124120
- host-port
125121
- otg-port
126122

@@ -131,26 +127,25 @@ examples:
131127
#include <dt-bindings/clock/rk3399-cru.h>
132128
#include <dt-bindings/interrupt-controller/arm-gic.h>
133129
#include <dt-bindings/interrupt-controller/irq.h>
134-
u2phy0: usb2-phy@e450 {
130+
u2phy0: usb2phy@e450 {
135131
compatible = "rockchip,rk3399-usb2phy";
136132
reg = <0xe450 0x10>;
137133
clocks = <&cru SCLK_USB2PHY0_REF>;
138134
clock-names = "phyclk";
139135
clock-output-names = "clk_usbphy0_480m";
140136
#clock-cells = <0>;
141-
#phy-cells = <0>;
142137
143138
u2phy0_host: host-port {
144-
#phy-cells = <0>;
145139
interrupts = <GIC_SPI 27 IRQ_TYPE_LEVEL_HIGH 0>;
146140
interrupt-names = "linestate";
141+
#phy-cells = <0>;
147142
};
148143
149144
u2phy0_otg: otg-port {
150-
#phy-cells = <0>;
151145
interrupts = <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH 0>,
152146
<GIC_SPI 104 IRQ_TYPE_LEVEL_HIGH 0>,
153147
<GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH 0>;
154148
interrupt-names = "otg-bvalid", "otg-id", "linestate";
149+
#phy-cells = <0>;
155150
};
156151
};

Documentation/devicetree/bindings/power/fsl,imx-gpcv2.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,9 @@ properties:
2525
compatible:
2626
enum:
2727
- fsl,imx7d-gpc
28+
- fsl,imx8mn-gpc
2829
- fsl,imx8mq-gpc
30+
- fsl,imx8mm-gpc
2931

3032
reg:
3133
maxItems: 1
@@ -54,6 +56,7 @@ properties:
5456
Power domain index. Valid values are defined in
5557
include/dt-bindings/power/imx7-power.h for fsl,imx7d-gpc and
5658
include/dt-bindings/power/imx8m-power.h for fsl,imx8mq-gpc
59+
include/dt-bindings/power/imx8mm-power.h for fsl,imx8mm-gpc
5760
maxItems: 1
5861

5962
clocks:

Documentation/devicetree/bindings/power/qcom,rpmpd.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ description:
1616
properties:
1717
compatible:
1818
enum:
19+
- qcom,mdm9607-rpmpd
1920
- qcom,msm8916-rpmpd
2021
- qcom,msm8939-rpmpd
2122
- qcom,msm8976-rpmpd
@@ -26,6 +27,7 @@ properties:
2627
- qcom,sdm660-rpmpd
2728
- qcom,sc7180-rpmhpd
2829
- qcom,sc7280-rpmhpd
30+
- qcom,sc8180x-rpmhpd
2931
- qcom,sdm845-rpmhpd
3032
- qcom,sdx55-rpmhpd
3133
- qcom,sm8150-rpmhpd

0 commit comments

Comments
 (0)