Skip to content

Commit 79e4760

Browse files
committed
Merge tag 'tegra-for-6.5-dt-bindings' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into soc/dt
dt-bindings: Changes for v6.5-rc1 Several new modules and devices are documented and fixes incorporated for the Tegra234 GPIO controller pin mappings as well as the possible Tegra XUDC PHY connections. * tag 'tegra-for-6.5-dt-bindings' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux: dt-bindings: tegra: Document Jetson Orin Nano Developer Kit dt-bindings: tegra: Document Jetson Orin Nano dt-bindings: gpio: Remove FSI domain ports on Tegra234 dt-bindings: usb: tegra-xudc: Remove extraneous PHYs dt-bindings: tegra: Add ICC IDs for dummy memory clients dt-bindings: tegra: Document compatible for IGX Link: https://lore.kernel.org/r/20230609193620.2275240-3-thierry.reding@gmail.com Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents b1062d1 + 5f02714 commit 79e4760

4 files changed

Lines changed: 28 additions & 18 deletions

File tree

Documentation/devicetree/bindings/arm/tegra.yaml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,11 @@ properties:
167167
- const: nvidia,p3737-0000+p3701-0000
168168
- const: nvidia,p3701-0000
169169
- const: nvidia,tegra234
170+
- description: NVIDIA IGX Orin Development Kit
171+
items:
172+
- const: nvidia,p3740-0002+p3701-0008
173+
- const: nvidia,p3701-0008
174+
- const: nvidia,tegra234
170175
- description: Jetson Orin NX
171176
items:
172177
- const: nvidia,p3767-0000
@@ -176,5 +181,14 @@ properties:
176181
- const: nvidia,p3768-0000+p3767-0000
177182
- const: nvidia,p3767-0000
178183
- const: nvidia,tegra234
184+
- description: Jetson Orin Nano
185+
items:
186+
- const: nvidia,p3767-0005
187+
- const: nvidia,tegra234
188+
- description: Jetson Orin Nano Developer Kit
189+
items:
190+
- const: nvidia,p3768-0000+p3767-0005
191+
- const: nvidia,p3767-0005
192+
- const: nvidia,tegra234
179193

180194
additionalProperties: true

Documentation/devicetree/bindings/usb/nvidia,tegra-xudc.yaml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ properties:
9191

9292
phys:
9393
minItems: 1
94+
maxItems: 2
9495
description:
9596
Must contain an entry for each entry in phy-names.
9697
See ../phy/phy-bindings.txt for details.
@@ -99,13 +100,7 @@ properties:
99100
minItems: 1
100101
items:
101102
- const: usb2-0
102-
- const: usb2-1
103-
- const: usb2-2
104-
- const: usb2-3
105103
- const: usb3-0
106-
- const: usb3-1
107-
- const: usb3-2
108-
- const: usb3-3
109104

110105
avddio-usb-supply:
111106
description: PCIe/USB3 analog logic power supply. Must supply 1.05 V.

include/dt-bindings/gpio/tegra234-gpio.h

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -33,18 +33,14 @@
3333
#define TEGRA234_MAIN_GPIO_PORT_P 14
3434
#define TEGRA234_MAIN_GPIO_PORT_Q 15
3535
#define TEGRA234_MAIN_GPIO_PORT_R 16
36-
#define TEGRA234_MAIN_GPIO_PORT_S 17
37-
#define TEGRA234_MAIN_GPIO_PORT_T 18
38-
#define TEGRA234_MAIN_GPIO_PORT_U 19
39-
#define TEGRA234_MAIN_GPIO_PORT_V 20
40-
#define TEGRA234_MAIN_GPIO_PORT_X 21
41-
#define TEGRA234_MAIN_GPIO_PORT_Y 22
42-
#define TEGRA234_MAIN_GPIO_PORT_Z 23
43-
#define TEGRA234_MAIN_GPIO_PORT_AC 24
44-
#define TEGRA234_MAIN_GPIO_PORT_AD 25
45-
#define TEGRA234_MAIN_GPIO_PORT_AE 26
46-
#define TEGRA234_MAIN_GPIO_PORT_AF 27
47-
#define TEGRA234_MAIN_GPIO_PORT_AG 28
36+
#define TEGRA234_MAIN_GPIO_PORT_X 17
37+
#define TEGRA234_MAIN_GPIO_PORT_Y 18
38+
#define TEGRA234_MAIN_GPIO_PORT_Z 19
39+
#define TEGRA234_MAIN_GPIO_PORT_AC 20
40+
#define TEGRA234_MAIN_GPIO_PORT_AD 21
41+
#define TEGRA234_MAIN_GPIO_PORT_AE 22
42+
#define TEGRA234_MAIN_GPIO_PORT_AF 23
43+
#define TEGRA234_MAIN_GPIO_PORT_AG 24
4844

4945
#define TEGRA234_MAIN_GPIO(port, offset) \
5046
((TEGRA234_MAIN_GPIO_PORT_##port * 8) + offset)

include/dt-bindings/memory/tegra234-mc.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -536,4 +536,9 @@
536536
#define TEGRA234_MEMORY_CLIENT_NVJPG1SRD 0x123
537537
#define TEGRA234_MEMORY_CLIENT_NVJPG1SWR 0x124
538538

539+
/* ICC ID's for dummy MC clients used to represent CPU Clusters */
540+
#define TEGRA_ICC_MC_CPU_CLUSTER0 1003
541+
#define TEGRA_ICC_MC_CPU_CLUSTER1 1004
542+
#define TEGRA_ICC_MC_CPU_CLUSTER2 1005
543+
539544
#endif

0 commit comments

Comments
 (0)