Skip to content

Commit 46aa130

Browse files
committed
Merge: Add Tegra264 support
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-10/-/merge_requests/1390 JIRA: https://issues.redhat.com/browse/RHEL-109772 ## Summary of Changes The following series adds further support for Tegra264. Signed-off-by: Marcin Juszkiewicz <mjuszkiewicz@redhat.com> Approved-by: Lenny Szubowicz <lszubowi@redhat.com> Approved-by: John W. Linville <linville@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: Scott Weaver <scweaver@redhat.com>
2 parents 17a76d1 + 08515b1 commit 46aa130

Some content is hidden

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

41 files changed

+4134
-401
lines changed

Documentation/devicetree/bindings/memory-controllers/nvidia,tegra186-mc.yaml

Lines changed: 82 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ properties:
3232
- nvidia,tegra186-mc
3333
- nvidia,tegra194-mc
3434
- nvidia,tegra234-mc
35+
- nvidia,tegra264-mc
3536

3637
reg:
3738
minItems: 6
@@ -42,8 +43,12 @@ properties:
4243
maxItems: 18
4344

4445
interrupts:
45-
items:
46-
- description: MC general interrupt
46+
minItems: 1
47+
maxItems: 8
48+
49+
interrupt-names:
50+
minItems: 1
51+
maxItems: 8
4752

4853
"#address-cells":
4954
const: 2
@@ -74,6 +79,7 @@ patternProperties:
7479
- nvidia,tegra186-emc
7580
- nvidia,tegra194-emc
7681
- nvidia,tegra234-emc
82+
- nvidia,tegra264-emc
7783

7884
reg:
7985
minItems: 1
@@ -127,6 +133,15 @@ patternProperties:
127133
reg:
128134
minItems: 2
129135

136+
- if:
137+
properties:
138+
compatible:
139+
const: nvidia,tegra264-emc
140+
then:
141+
properties:
142+
reg:
143+
minItems: 2
144+
130145
additionalProperties: false
131146

132147
required:
@@ -158,6 +173,12 @@ allOf:
158173
- const: ch2
159174
- const: ch3
160175

176+
interrupts:
177+
items:
178+
- description: MC general interrupt
179+
180+
interrupt-names: false
181+
161182
- if:
162183
properties:
163184
compatible:
@@ -189,6 +210,12 @@ allOf:
189210
- const: ch14
190211
- const: ch15
191212

213+
interrupts:
214+
items:
215+
- description: MC general interrupt
216+
217+
interrupt-names: false
218+
192219
- if:
193220
properties:
194221
compatible:
@@ -220,6 +247,59 @@ allOf:
220247
- const: ch14
221248
- const: ch15
222249

250+
interrupts:
251+
items:
252+
- description: MC general interrupt
253+
254+
interrupt-names: false
255+
256+
- if:
257+
properties:
258+
compatible:
259+
const: nvidia,tegra264-mc
260+
then:
261+
properties:
262+
reg:
263+
minItems: 17
264+
maxItems: 17
265+
description: 17 memory controller channels
266+
267+
reg-names:
268+
items:
269+
- const: broadcast
270+
- const: ch0
271+
- const: ch1
272+
- const: ch2
273+
- const: ch3
274+
- const: ch4
275+
- const: ch5
276+
- const: ch6
277+
- const: ch7
278+
- const: ch8
279+
- const: ch9
280+
- const: ch10
281+
- const: ch11
282+
- const: ch12
283+
- const: ch13
284+
- const: ch14
285+
- const: ch15
286+
287+
interrupts:
288+
minItems: 8
289+
maxItems: 8
290+
description: One interrupt line for each MC component
291+
292+
interrupt-names:
293+
items:
294+
- const: mcf
295+
- const: hub1
296+
- const: hub2
297+
- const: hub3
298+
- const: hub4
299+
- const: hub5
300+
- const: sbs
301+
- const: channel
302+
223303
additionalProperties: false
224304

225305
required:

arch/arm64/configs/defconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -262,6 +262,7 @@ CONFIG_IMX_SCU=y
262262
CONFIG_QCOM_TZMEM_MODE_SHMBRIDGE=y
263263
CONFIG_QCOM_QSEECOM=y
264264
CONFIG_QCOM_QSEECOM_UEFISECAPP=y
265+
CONFIG_TEGRA_BPMP=y
265266
CONFIG_GNSS=m
266267
CONFIG_GNSS_MTK_SERIAL=m
267268
CONFIG_MTD=y
@@ -1378,6 +1379,7 @@ CONFIG_PLATFORM_MHU=y
13781379
CONFIG_BCM2835_MBOX=y
13791380
CONFIG_QCOM_APCS_IPC=y
13801381
CONFIG_MTK_ADSP_MBOX=m
1382+
CONFIG_TEGRA_HSP_MBOX=y
13811383
CONFIG_QCOM_IPCC=y
13821384
CONFIG_ROCKCHIP_IOMMU=y
13831385
CONFIG_TEGRA_IOMMU_SMMU=y

0 commit comments

Comments
 (0)