Commit 28ef26f6 authored by Arnd Bergmann's avatar Arnd Bergmann

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

Merge tag 'tegra-for-5.9-dt-bindings' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into arm/dt

dt-bindings: Changes for v5.9-rc1

This adds compatible strings for some new devices as well as updates and
fixes existing bindings.

* tag 'tegra-for-5.9-dt-bindings' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  dt-bindings: fuse: tegra: Add missing compatible strings
  dt-bindings: i2c: tegra: Document Tegra210 VI I2C clocks and power-domains
  dt-bindings: Add documentation for GV11B GPU
  dt-bindings: ARM: tegra: Add ASUS Google Nexus 7
  dt-bindings: ARM: tegra: Add Acer Iconia Tab A500
  dt-bindings: Add vendor prefix for Acer Inc.
  dt-bindings: tegra: Document Jetson Xavier NX (and devkit)

Link: https://lore.kernel.org/r/20200717161300.1661002-1-thierry.reding@gmail.comSigned-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 981053c0 9580a353
...@@ -34,6 +34,9 @@ properties: ...@@ -34,6 +34,9 @@ properties:
- toradex,colibri_t20-iris - toradex,colibri_t20-iris
- const: toradex,colibri_t20 - const: toradex,colibri_t20
- const: nvidia,tegra20 - const: nvidia,tegra20
- items:
- const: acer,picasso
- const: nvidia,tegra20
- items: - items:
- enum: - enum:
- nvidia,beaver - nvidia,beaver
...@@ -59,6 +62,13 @@ properties: ...@@ -59,6 +62,13 @@ properties:
- toradex,colibri_t30-eval-v3 - toradex,colibri_t30-eval-v3
- const: toradex,colibri_t30 - const: toradex,colibri_t30
- const: nvidia,tegra30 - const: nvidia,tegra30
- items:
- const: asus,grouper
- const: nvidia,tegra30
- items:
- const: asus,tilapia
- const: asus,grouper
- const: nvidia,tegra30
- items: - items:
- enum: - enum:
- nvidia,dalmore - nvidia,dalmore
...@@ -101,3 +111,11 @@ properties: ...@@ -101,3 +111,11 @@ properties:
- enum: - enum:
- nvidia,p2972-0000 - nvidia,p2972-0000
- const: nvidia,tegra194 - const: nvidia,tegra194
- description: Jetson Xavier NX
items:
- const: nvidia,p3668-0000
- const: nvidia,tegra194
- description: Jetson Xavier NX Developer Kit
items:
- const: nvidia,p3509-0000+p3668-0000
- const: nvidia,tegra194
...@@ -4,8 +4,9 @@ Required properties: ...@@ -4,8 +4,9 @@ Required properties:
- compatible : For Tegra20, must contain "nvidia,tegra20-efuse". For Tegra30, - compatible : For Tegra20, must contain "nvidia,tegra20-efuse". For Tegra30,
must contain "nvidia,tegra30-efuse". For Tegra114, must contain must contain "nvidia,tegra30-efuse". For Tegra114, must contain
"nvidia,tegra114-efuse". For Tegra124, must contain "nvidia,tegra124-efuse". "nvidia,tegra114-efuse". For Tegra124, must contain "nvidia,tegra124-efuse".
Otherwise, must contain "nvidia,<chip>-efuse", plus one of the above, where For Tegra132 must contain "nvidia,tegra132-efuse", "nvidia,tegra124-efuse".
<chip> is tegra132. For Tegra210 must contain "nvidia,tegra210-efuse". For Tegra186 must contain
"nvidia,tegra186-efuse". For Tegra194 must contain "nvidia,tegra194-efuse".
Details: Details:
nvidia,tegra20-efuse: Tegra20 requires using APB DMA to read the fuse data nvidia,tegra20-efuse: Tegra20 requires using APB DMA to read the fuse data
due to a hardware bug. Tegra20 also lacks certain information which is due to a hardware bug. Tegra20 also lacks certain information which is
......
...@@ -6,6 +6,7 @@ Required properties: ...@@ -6,6 +6,7 @@ Required properties:
- nvidia,gk20a - nvidia,gk20a
- nvidia,gm20b - nvidia,gm20b
- nvidia,gp10b - nvidia,gp10b
- nvidia,gv11b
- reg: Physical base address and length of the controller's registers. - reg: Physical base address and length of the controller's registers.
Must contain two entries: Must contain two entries:
- first entry for bar0 - first entry for bar0
...@@ -25,6 +26,9 @@ Required properties: ...@@ -25,6 +26,9 @@ Required properties:
If the compatible string is "nvidia,gm20b", then the following clock If the compatible string is "nvidia,gm20b", then the following clock
is also required: is also required:
- ref - ref
If the compatible string is "nvidia,gv11b", then the following clock is also
required:
- fuse
- resets: Must contain an entry for each entry in reset-names. - resets: Must contain an entry for each entry in reset-names.
See ../reset/reset.txt for details. See ../reset/reset.txt for details.
- reset-names: Must include the following entries: - reset-names: Must include the following entries:
...@@ -88,3 +92,24 @@ Example for GP10B: ...@@ -88,3 +92,24 @@ Example for GP10B:
power-domains = <&bpmp TEGRA186_POWER_DOMAIN_GPU>; power-domains = <&bpmp TEGRA186_POWER_DOMAIN_GPU>;
iommus = <&smmu TEGRA186_SID_GPU>; iommus = <&smmu TEGRA186_SID_GPU>;
}; };
Example for GV11B:
gpu@17000000 {
compatible = "nvidia,gv11b";
reg = <0x17000000 0x10000000>,
<0x18000000 0x10000000>;
interrupts = <GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 71 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "stall", "nonstall";
clocks = <&bpmp TEGRA194_CLK_GPCCLK>,
<&bpmp TEGRA194_CLK_GPU_PWR>,
<&bpmp TEGRA194_CLK_FUSE>;
clock-names = "gpu", "pwr", "fuse";
resets = <&bpmp TEGRA194_RESET_GPU>;
reset-names = "gpu";
dma-coherent;
power-domains = <&bpmp TEGRA194_POWER_DOMAIN_GPU>;
iommus = <&smmu TEGRA194_SID_GPU>;
};
...@@ -35,12 +35,12 @@ Required properties: ...@@ -35,12 +35,12 @@ Required properties:
Due to above changes, Tegra114 I2C driver makes incompatible with Due to above changes, Tegra114 I2C driver makes incompatible with
previous hardware driver. Hence, tegra114 I2C controller is compatible previous hardware driver. Hence, tegra114 I2C controller is compatible
with "nvidia,tegra114-i2c". with "nvidia,tegra114-i2c".
nvidia,tegra210-i2c-vi: Tegra210 has one I2C controller that is part of the nvidia,tegra210-i2c-vi: Tegra210 has one I2C controller that is on host1x bus
host1x domain and typically used for camera use-cases. This VI I2C and is part of VE power domain and typically used for camera use-cases.
controller is mostly compatible with the programming model of the This VI I2C controller is mostly compatible with the programming model
regular I2C controllers with a few exceptions. The I2C registers start of the regular I2C controllers with a few exceptions. The I2C registers
at an offset of 0xc00 (instead of 0), registers are 16 bytes apart start at an offset of 0xc00 (instead of 0), registers are 16 bytes
(rather than 4) and the controller does not support slave mode. apart (rather than 4) and the controller does not support slave mode.
- reg: Should contain I2C controller registers physical address and length. - reg: Should contain I2C controller registers physical address and length.
- interrupts: Should contain I2C controller interrupts. - interrupts: Should contain I2C controller interrupts.
- address-cells: Address cells for I2C device address. - address-cells: Address cells for I2C device address.
...@@ -53,10 +53,17 @@ Required properties: ...@@ -53,10 +53,17 @@ Required properties:
- fast-clk - fast-clk
Tegra114: Tegra114:
- div-clk - div-clk
Tegra210:
- div-clk
- slow (only for nvidia,tegra210-i2c-vi compatible node)
- resets: Must contain an entry for each entry in reset-names. - resets: Must contain an entry for each entry in reset-names.
See ../reset/reset.txt for details. See ../reset/reset.txt for details.
- reset-names: Must include the following entries: - reset-names: Must include the following entries:
- i2c - i2c
- power-domains: Only for nvidia,tegra210-i2c-vi compatible node and must
include venc powergate node as vi i2c is part of VE power domain.
tegra210-i2c-vi:
- pd_venc
- dmas: Must contain an entry for each entry in clock-names. - dmas: Must contain an entry for each entry in clock-names.
See ../dma/dma.txt for details. See ../dma/dma.txt for details.
- dma-names: Must include the following entries: - dma-names: Must include the following entries:
......
...@@ -27,6 +27,8 @@ patternProperties: ...@@ -27,6 +27,8 @@ patternProperties:
description: Abilis Systems description: Abilis Systems
"^abracon,.*": "^abracon,.*":
description: Abracon Corporation description: Abracon Corporation
"^acer,.*":
description: Acer Inc.
"^acme,.*": "^acme,.*":
description: Acme Systems srl description: Acme Systems srl
"^actions,.*": "^actions,.*":
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment