diff options
| author | Olof Johansson <olof@lixom.net> | 2020-09-26 10:01:05 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2020-09-26 10:01:07 -0700 |
| commit | 61d5d791cbf750f80eb3227d574c326b10e1755d (patch) | |
| tree | 26307522cc890b0fb7e7ed1ad9d90ccd2d707867 /Documentation/devicetree/bindings/arm | |
| parent | 2e6115aa2bedcd4852822e387baa8b5562526ffd (diff) | |
| parent | 2312c291f6ac340af88eee0867fdfdfa2299ffc3 (diff) | |
| download | linux-61d5d791cbf750f80eb3227d574c326b10e1755d.tar.bz2 | |
Merge tag 'tegra-for-5.10-dt-bindings' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into arm/dt
dt-bindings: Changes for v5.10-rc1
This set of changes adds compatible strings for Tegra234 to existing
device tree bindings.
* tag 'tegra-for-5.10-dt-bindings' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
dt-bindings: power: supply: Add device-tree binding for Summit SMB3xx
dt-bindings: tegra: pmc: Add Tegra234 support
dt-bindings: fuse: tegra: Add Tegra234 support
dt-bindings: tegra: Add Tegra234 VDK compatible
dt-bindings: misc: tegra186-misc: Add Tegra234 support
dt-bindings: misc: tegra186-misc: Add missing compatible string
dt-bindings: misc: tegra-apbmisc: Add missing compatible strings
Link: https://lore.kernel.org/r/20200918150303.3938852-1-thierry.reding@gmail.com
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'Documentation/devicetree/bindings/arm')
| -rw-r--r-- | Documentation/devicetree/bindings/arm/tegra.yaml | 4 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/arm/tegra/nvidia,tegra186-pmc.txt | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/arm/tegra.yaml b/Documentation/devicetree/bindings/arm/tegra.yaml index e0b3debaee9e..85006ca503a7 100644 --- a/Documentation/devicetree/bindings/arm/tegra.yaml +++ b/Documentation/devicetree/bindings/arm/tegra.yaml @@ -119,3 +119,7 @@ properties: items: - const: nvidia,p3509-0000+p3668-0000 - const: nvidia,tegra194 + - items: + - enum: + - nvidia,tegra234-vdk + - const: nvidia,tegra234 diff --git a/Documentation/devicetree/bindings/arm/tegra/nvidia,tegra186-pmc.txt b/Documentation/devicetree/bindings/arm/tegra/nvidia,tegra186-pmc.txt index 2d89cdc39eb0..576462fae27f 100644 --- a/Documentation/devicetree/bindings/arm/tegra/nvidia,tegra186-pmc.txt +++ b/Documentation/devicetree/bindings/arm/tegra/nvidia,tegra186-pmc.txt @@ -4,6 +4,7 @@ Required properties: - compatible: Should contain one of the following: - "nvidia,tegra186-pmc": for Tegra186 - "nvidia,tegra194-pmc": for Tegra194 + - "nvidia,tegra234-pmc": for Tegra234 - reg: Must contain an (offset, length) pair of the register set for each entry in reg-names. - reg-names: Must include the following entries: @@ -11,7 +12,7 @@ Required properties: - "wake" - "aotag" - "scratch" - - "misc" (Only for Tegra194) + - "misc" (Only for Tegra194 and later) Optional properties: - nvidia,invert-interrupt: If present, inverts the PMU interrupt signal. |