aboutsummaryrefslogtreecommitdiff
path: root/Documentation/devicetree/bindings/pinctrl
diff options
context:
space:
mode:
authorArnd Bergmann2020-11-27 18:03:16 +0100
committerArnd Bergmann2020-11-27 18:03:16 +0100
commit3f02c6a8280bf04086cf74f51968f69a3979b757 (patch)
tree2cd15480c35c85c11b67d3f26b51ac25f1d76783 /Documentation/devicetree/bindings/pinctrl
parenteb149c927d58adc57e6aa9450378ca72c541a97d (diff)
parente36f9381420b28e1785d7900d4c1d9db6149cbcd (diff)
Merge tag 'tegra-for-5.11-dt-bindings' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into arm/dt
dt-bindings: Changes for v5.11-rc1 This contains a couple of conversions of bindings to json-schema, as well as symbolic names for the various memory clients on Tegra20, Tegra30 and Tegra124. There's also a couple of fixes for Tegra194 pinmux and ARM GIC bindings. Finally, a new vendor prefix is added for Ouya and the Ouya game console compatible string is defined. * tag 'tegra-for-5.11-dt-bindings' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux: dt-bindings: bus: Convert ACONNECT doc to json-schema dt-bindings: interrupt-controller: arm,gic: Update Tegra compatibles dt-bindings: dma: Convert ADMA doc to json-schema dt-bindings: Fix entry name for I/O High Voltage property dt-bindings: ARM: tegra: Add Ouya game console dt-bindings: Add vendor prefix for Ouya Inc. dt-bindings: memory: tegra124: Add memory client IDs dt-bindings: memory: tegra30: Add memory client IDs dt-bindings: memory: tegra20: Add memory client IDs Link: https://lore.kernel.org/r/20201127144329.124891-1-thierry.reding@gmail.com Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'Documentation/devicetree/bindings/pinctrl')
-rw-r--r--Documentation/devicetree/bindings/pinctrl/nvidia,tegra194-pinmux.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/pinctrl/nvidia,tegra194-pinmux.txt b/Documentation/devicetree/bindings/pinctrl/nvidia,tegra194-pinmux.txt
index 8763f448c376..90d38f710635 100644
--- a/Documentation/devicetree/bindings/pinctrl/nvidia,tegra194-pinmux.txt
+++ b/Documentation/devicetree/bindings/pinctrl/nvidia,tegra194-pinmux.txt
@@ -99,7 +99,7 @@ Example:
nvidia,schmitt = <TEGRA_PIN_DISABLE>;
nvidia,lpdr = <TEGRA_PIN_ENABLE>;
nvidia,enable-input = <TEGRA_PIN_DISABLE>;
- nvidia,io-high-voltage = <TEGRA_PIN_ENABLE>;
+ nvidia,io-hv = <TEGRA_PIN_ENABLE>;
nvidia,tristate = <TEGRA_PIN_DISABLE>;
nvidia,pull = <TEGRA_PIN_PULL_NONE>;
};