Skip to content

Commit 1f327c5

Browse files
committed
Merge: arm64: Update nvidia tegra-related devicetree files
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/2355 These are all essentially documentation changes. No code changes. Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2186348 Omitted-fix: e7ccd8a "dt-bindings: power: renesas,apmu: Fix cpus property limits" Omitted-fix: be1de12 "dt-bindings: remoteproc: st,stm32-rproc: Fix phandle-array parameters description" The hunks being fixed by these were not applied in this patch series (they were dropped). Signed-off-by: Mark Salter <msalter@redhat.com> Approved-by: Charles Mirabile <cmirabil@redhat.com> Approved-by: Steve Best <sbest@redhat.com> Signed-off-by: Jan Stancek <jstancek@redhat.com>
2 parents 730eb31 + b5c818b commit 1f327c5

File tree

123 files changed

+18185
-12056
lines changed

Some content is hidden

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

123 files changed

+18185
-12056
lines changed

Documentation/devicetree/bindings/arm/tegra/nvidia,tegra-ccplex-cluster.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ required:
4040
- compatible
4141
- reg
4242
- nvidia,bpmp
43-
- status
4443

4544
examples:
4645
- |
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: "http://devicetree.org/schemas/arm/tegra/nvidia,tegra194-axi2apb.yaml#"
5+
$schema: "http://devicetree.org/meta-schemas/core.yaml#"
6+
7+
title: NVIDIA Tegra194 AXI2APB bridge
8+
9+
maintainers:
10+
- Sumit Gupta <sumitg@nvidia.com>
11+
12+
properties:
13+
$nodename:
14+
pattern: "^axi2apb@([0-9a-f]+)$"
15+
16+
compatible:
17+
enum:
18+
- nvidia,tegra194-axi2apb
19+
20+
reg:
21+
maxItems: 6
22+
description: Physical base address and length of registers for all bridges
23+
24+
additionalProperties: false
25+
26+
required:
27+
- compatible
28+
- reg
29+
30+
examples:
31+
- |
32+
axi2apb: axi2apb@2390000 {
33+
compatible = "nvidia,tegra194-axi2apb";
34+
reg = <0x02390000 0x1000>,
35+
<0x023a0000 0x1000>,
36+
<0x023b0000 0x1000>,
37+
<0x023c0000 0x1000>,
38+
<0x023d0000 0x1000>,
39+
<0x023e0000 0x1000>;
40+
};
Lines changed: 97 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: "http://devicetree.org/schemas/arm/tegra/nvidia,tegra194-cbb.yaml#"
5+
$schema: "http://devicetree.org/meta-schemas/core.yaml#"
6+
7+
title: NVIDIA Tegra194 CBB 1.0 bindings
8+
9+
maintainers:
10+
- Sumit Gupta <sumitg@nvidia.com>
11+
12+
description: |+
13+
The Control Backbone (CBB) is comprised of the physical path from an
14+
initiator to a target's register configuration space. CBB 1.0 has
15+
multiple hierarchical sub-NOCs (Network-on-Chip) and connects various
16+
initiators and targets using different bridges like AXIP2P, AXI2APB.
17+
18+
This driver handles errors due to illegal register accesses reported
19+
by the NOCs inside the CBB. NOCs reporting errors are cluster NOCs
20+
"AON-NOC, SCE-NOC, RCE-NOC, BPMP-NOC, CV-NOC" and "CBB Central NOC"
21+
which is the main NOC.
22+
23+
By default, the access issuing initiator is informed about the error
24+
using SError or Data Abort exception unless the ERD (Error Response
25+
Disable) is enabled/set for that initiator. If the ERD is enabled, then
26+
SError or Data Abort is masked and the error is reported with interrupt.
27+
28+
- For CCPLEX (CPU Complex) initiator, the driver sets ERD bit. So, the
29+
errors due to illegal accesses from CCPLEX are reported by interrupts.
30+
If ERD is not set, then error is reported by SError.
31+
- For other initiators, the ERD is disabled. So, the access issuing
32+
initiator is informed about the illegal access by Data Abort exception.
33+
In addition, an interrupt is also generated to CCPLEX. These initiators
34+
include all engines using Cortex-R5 (which is ARMv7 CPU cluster) and
35+
engines like TSEC (Security co-processor), NVDEC (NVIDIA Video Decoder
36+
engine) etc which can initiate transactions.
37+
38+
The driver prints relevant debug information like Error Code, Error
39+
Description, Master, Address, AXI ID, Cache, Protection, Security Group
40+
etc on receiving error notification.
41+
42+
properties:
43+
$nodename:
44+
pattern: "^[a-z]+-noc@[0-9a-f]+$"
45+
46+
compatible:
47+
enum:
48+
- nvidia,tegra194-cbb-noc
49+
- nvidia,tegra194-aon-noc
50+
- nvidia,tegra194-bpmp-noc
51+
- nvidia,tegra194-rce-noc
52+
- nvidia,tegra194-sce-noc
53+
54+
reg:
55+
maxItems: 1
56+
57+
interrupts:
58+
description:
59+
CCPLEX receives secure or nonsecure interrupt depending on error type.
60+
A secure interrupt is received for SEC(firewall) & SLV errors and a
61+
non-secure interrupt is received for TMO & DEC errors.
62+
items:
63+
- description: non-secure interrupt
64+
- description: secure interrupt
65+
66+
nvidia,axi2apb:
67+
$ref: '/schemas/types.yaml#/definitions/phandle'
68+
description:
69+
Specifies the node having all axi2apb bridges which need to be checked
70+
for any error logged in their status register.
71+
72+
nvidia,apbmisc:
73+
$ref: '/schemas/types.yaml#/definitions/phandle'
74+
description:
75+
Specifies the apbmisc node which need to be used for reading the ERD
76+
register.
77+
78+
additionalProperties: false
79+
80+
required:
81+
- compatible
82+
- reg
83+
- interrupts
84+
- nvidia,apbmisc
85+
86+
examples:
87+
- |
88+
#include <dt-bindings/interrupt-controller/arm-gic.h>
89+
90+
cbb-noc@2300000 {
91+
compatible = "nvidia,tegra194-cbb-noc";
92+
reg = <0x02300000 0x1000>;
93+
interrupts = <GIC_SPI 230 IRQ_TYPE_LEVEL_HIGH>,
94+
<GIC_SPI 231 IRQ_TYPE_LEVEL_HIGH>;
95+
nvidia,axi2apb = <&axi2apb>;
96+
nvidia,apbmisc = <&apbmisc>;
97+
};

Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-pmc.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ properties:
209209
"^[a-z0-9]+$":
210210
type: object
211211

212-
patternProperties:
212+
properties:
213213
clocks:
214214
minItems: 1
215215
maxItems: 8

Documentation/devicetree/bindings/bus/nvidia,tegra210-aconnect.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@ properties:
4040
maxItems: 1
4141

4242
"#address-cells":
43-
const: 1
43+
enum: [ 1, 2 ]
4444

4545
"#size-cells":
46-
const: 1
46+
enum: [ 1, 2 ]
4747

4848
ranges: true
4949

Documentation/devicetree/bindings/clock/nvidia,tegra124-car.yaml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -106,10 +106,3 @@ examples:
106106
#clock-cells = <1>;
107107
#reset-cells = <1>;
108108
};
109-
110-
usb-controller@c5004000 {
111-
compatible = "nvidia,tegra20-ehci";
112-
reg = <0xc5004000 0x4000>;
113-
clocks = <&car TEGRA124_CLK_USB2>;
114-
resets = <&car TEGRA124_CLK_USB2>;
115-
};

Documentation/devicetree/bindings/clock/nvidia,tegra124-dfll.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ clock@70110000 {
136136
};
137137

138138
/* pinmux nodes added for completeness. Binding doc can be found in:
139-
* Documentation/devicetree/bindings/pinctrl/nvidia,tegra210-pinmux.txt
139+
* Documentation/devicetree/bindings/pinctrl/nvidia,tegra210-pinmux.yaml
140140
*/
141141

142142
pinmux: pinmux@700008d4 {

Documentation/devicetree/bindings/clock/nvidia,tegra20-car.yaml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,3 @@ examples:
6060
#clock-cells = <1>;
6161
#reset-cells = <1>;
6262
};
63-
64-
usb-controller@c5004000 {
65-
compatible = "nvidia,tegra20-ehci";
66-
reg = <0xc5004000 0x4000>;
67-
clocks = <&car TEGRA20_CLK_USB2>;
68-
resets = <&car TEGRA20_CLK_USB2>;
69-
};

Documentation/devicetree/bindings/display/tegra/nvidia,tegra114-mipi.txt

Lines changed: 0 additions & 41 deletions
This file was deleted.
Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/display/tegra/nvidia,tegra114-mipi.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: NVIDIA Tegra MIPI pad calibration controller
8+
9+
maintainers:
10+
- Thierry Reding <thierry.reding@gmail.com>
11+
- Jon Hunter <jonathanh@nvidia.com>
12+
13+
properties:
14+
$nodename:
15+
pattern: "^mipi@[0-9a-f]+$"
16+
17+
compatible:
18+
enum:
19+
- nvidia,tegra114-mipi
20+
- nvidia,tegra210-mipi
21+
- nvidia,tegra186-mipi
22+
23+
reg:
24+
maxItems: 1
25+
26+
clocks:
27+
items:
28+
- description: module clock
29+
30+
clock-names:
31+
items:
32+
- const: mipi-cal
33+
34+
power-domains:
35+
maxItems: 1
36+
37+
"#nvidia,mipi-calibrate-cells":
38+
description: The number of cells in a MIPI calibration specifier.
39+
Should be 1. The single cell specifies a bitmask of the pads that
40+
need to be calibrated for a given device.
41+
$ref: "/schemas/types.yaml#/definitions/uint32"
42+
const: 1
43+
44+
additionalProperties: false
45+
46+
required:
47+
- compatible
48+
- reg
49+
- clocks
50+
- "#nvidia,mipi-calibrate-cells"
51+
52+
examples:
53+
- |
54+
#include <dt-bindings/clock/tegra114-car.h>
55+
56+
mipi@700e3000 {
57+
compatible = "nvidia,tegra114-mipi";
58+
reg = <0x700e3000 0x100>;
59+
clocks = <&tegra_car TEGRA114_CLK_MIPI_CAL>;
60+
clock-names = "mipi-cal";
61+
#nvidia,mipi-calibrate-cells = <1>;
62+
};
63+
64+
dsia: dsi@54300000 {
65+
compatible = "nvidia,tegra114-dsi";
66+
reg = <0x54300000 0x00040000>;
67+
clocks = <&tegra_car TEGRA114_CLK_DSIA>,
68+
<&tegra_car TEGRA114_CLK_DSIALP>,
69+
<&tegra_car TEGRA114_CLK_PLL_D_OUT0>;
70+
clock-names = "dsi", "lp", "parent";
71+
resets = <&tegra_car 48>;
72+
reset-names = "dsi";
73+
nvidia,mipi-calibrate = <&mipi 0x060>; /* DSIA & DSIB pads */
74+
};

0 commit comments

Comments
 (0)