Unverified Commit 79e47607 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'tegra-for-6.5-dt-bindings' of... 

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: default avatarArnd Bergmann <arnd@arndb.de>
parents b1062d19 5f027147

Documentation/devicetree/bindings/arm/tegra.yaml

+14 −0
Original line number Diff line number Diff line
@@ -167,6 +167,11 @@ properties: 
          - const: nvidia,p3737-0000+p3701-0000

          - const: nvidia,p3701-0000

          - const: nvidia,tegra234

      - description: NVIDIA IGX Orin Development Kit

        items:

          - const: nvidia,p3740-0002+p3701-0008

          - const: nvidia,p3701-0008

          - const: nvidia,tegra234

      - description: Jetson Orin NX

        items:

          - const: nvidia,p3767-0000
@@ -176,5 +181,14 @@ properties: 
          - const: nvidia,p3768-0000+p3767-0000

          - const: nvidia,p3767-0000

          - const: nvidia,tegra234

      - description: Jetson Orin Nano

        items:

          - const: nvidia,p3767-0005

          - const: nvidia,tegra234

      - description: Jetson Orin Nano Developer Kit

        items:

          - const: nvidia,p3768-0000+p3767-0005

          - const: nvidia,p3767-0005

          - const: nvidia,tegra234



additionalProperties: true

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

+1 −6
Original line number Diff line number Diff line
@@ -91,6 +91,7 @@ properties: 


  phys:

    minItems: 1

    maxItems: 2

    description:

      Must contain an entry for each entry in phy-names.

      See ../phy/phy-bindings.txt for details.
@@ -99,13 +100,7 @@ properties: 
    minItems: 1

    items:

      - const: usb2-0

      - const: usb2-1

      - const: usb2-2

      - const: usb2-3

      - const: usb3-0

      - const: usb3-1

      - const: usb3-2

      - const: usb3-3



  avddio-usb-supply:

    description: PCIe/USB3 analog logic power supply. Must supply 1.05 V.

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

+8 −12
Original line number Diff line number Diff line
@@ -33,18 +33,14 @@ 
#define TEGRA234_MAIN_GPIO_PORT_P  14

#define TEGRA234_MAIN_GPIO_PORT_Q  15

#define TEGRA234_MAIN_GPIO_PORT_R  16

#define TEGRA234_MAIN_GPIO_PORT_S  17

#define TEGRA234_MAIN_GPIO_PORT_T  18

#define TEGRA234_MAIN_GPIO_PORT_U  19

#define TEGRA234_MAIN_GPIO_PORT_V  20

#define TEGRA234_MAIN_GPIO_PORT_X  21

#define TEGRA234_MAIN_GPIO_PORT_Y  22

#define TEGRA234_MAIN_GPIO_PORT_Z  23

#define TEGRA234_MAIN_GPIO_PORT_AC 24

#define TEGRA234_MAIN_GPIO_PORT_AD 25

#define TEGRA234_MAIN_GPIO_PORT_AE 26

#define TEGRA234_MAIN_GPIO_PORT_AF 27

#define TEGRA234_MAIN_GPIO_PORT_AG 28

#define TEGRA234_MAIN_GPIO_PORT_X  17

#define TEGRA234_MAIN_GPIO_PORT_Y  18

#define TEGRA234_MAIN_GPIO_PORT_Z  19

#define TEGRA234_MAIN_GPIO_PORT_AC 20

#define TEGRA234_MAIN_GPIO_PORT_AD 21

#define TEGRA234_MAIN_GPIO_PORT_AE 22

#define TEGRA234_MAIN_GPIO_PORT_AF 23

#define TEGRA234_MAIN_GPIO_PORT_AG 24



#define TEGRA234_MAIN_GPIO(port, offset) \

	((TEGRA234_MAIN_GPIO_PORT_##port * 8) + offset)

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

+5 −0
Original line number Diff line number Diff line
@@ -536,4 +536,9 @@ 
#define TEGRA234_MEMORY_CLIENT_NVJPG1SRD 0x123

#define TEGRA234_MEMORY_CLIENT_NVJPG1SWR 0x124



/* ICC ID's for dummy MC clients used to represent CPU Clusters */

#define TEGRA_ICC_MC_CPU_CLUSTER0       1003

#define TEGRA_ICC_MC_CPU_CLUSTER1       1004

#define TEGRA_ICC_MC_CPU_CLUSTER2       1005



#endif