diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2018-09-28 17:32:55 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2018-09-28 17:39:58 +0200 |
| commit | d4db2b19eb0ce4f95f75ea64d1efbec0fbc908f0 (patch) | |
| tree | 1a0eac788dfe2d80571ec4c64e2d5b14d1dc82ee /Documentation | |
| parent | Merge tag 'tegra-for-4.20-dt-bindings' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/dt (diff) | |
| parent | ARM: dts: paz00: fix wakeup gpio keycode (diff) | |
| download | linux-dev-d4db2b19eb0ce4f95f75ea64d1efbec0fbc908f0.tar.xz linux-dev-d4db2b19eb0ce4f95f75ea64d1efbec0fbc908f0.zip | |
Merge tag 'tegra-for-4.20-arm-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/dt
ARM: tegra: Device tree changes for v4.20-rc1
This contains a massive amount of changes from Marcel Ziswiler for
various boards by Toradex.
* tag 'tegra-for-4.20-arm-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux: (129 commits)
ARM: dts: paz00: fix wakeup gpio keycode
ARM: tegra: tegra20: Fix mixed tabs-spaces indentation
ARM: tegra: colibri_t20: add eval board device tree
ARM: tegra: colibri_t20: rename ac97 label to tegra_ac97
ARM: tegra: colibri_t20: get rid of fake clocks simple bus
ARM: tegra: colibri_t20: rename tps6586x@34 and drop unused pmic label
ARM: tegra: colibri_t20: iris: drop unused i2c_ddc label
ARM: tegra: colibri_t20: rename i2c_ddc to hdmi_ddc
ARM: tegra: colibri_t20: drop module level model and compatible
ARM: tegra: colibri_t20: iris: add colibri ssp support
ARM: tegra: colibri_t20: iris: simplify model and compatible properties
ARM: tegra: colibri_t20: simplify model and compatible properties
ARM: tegra: colibri_t20: add compatibility comment
ARM: tegra: colibri_t20: annotate/move sd card detect
ARM: tegra: colibri_t20: add gpio hogs for gmi_wr_n buffers
ARM: tegra: colibri_t20: add gpio hog to unreset usb ethernet chip
ARM: tegra: colibri_t20: add i2c-thermtrip
ARM: tegra: colibri_t20: annotate/rename lm95245 temperature sensor
ARM: tegra: colibri_t20: iris: add dr_mode property
ARM: tegra: colibri_t20: iris: add gpio wakeup key
...
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/arm/tegra.txt | 9 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/vendor-prefixes.txt | 1 |
2 files changed, 8 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/arm/tegra.txt b/Documentation/devicetree/bindings/arm/tegra.txt index 32f62bb7006d..c59b15f64346 100644 --- a/Documentation/devicetree/bindings/arm/tegra.txt +++ b/Documentation/devicetree/bindings/arm/tegra.txt @@ -47,12 +47,17 @@ board-specific compatible values: nvidia,ventana toradex,apalis_t30 toradex,apalis_t30-eval + toradex,apalis_t30-v1.1 + toradex,apalis_t30-v1.1-eval toradex,apalis-tk1 toradex,apalis-tk1-eval - toradex,colibri_t20-512 + toradex,apalis-tk1-v1.2 + toradex,apalis-tk1-v1.2-eval + toradex,colibri_t20 + toradex,colibri_t20-eval-v3 + toradex,colibri_t20-iris toradex,colibri_t30 toradex,colibri_t30-eval-v3 - toradex,iris Trusted Foundations ------------------------------------------- diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt index 1c63d2c2d48f..b84a705c5c14 100644 --- a/Documentation/devicetree/bindings/vendor-prefixes.txt +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt @@ -298,6 +298,7 @@ pine64 Pine64 pixcir PIXCIR MICROELECTRONICS Co., Ltd plathome Plat'Home Co., Ltd. plda PLDA +plx Broadcom Corporation (formerly PLX Technology) portwell Portwell Inc. poslab Poslab Technology Co., Ltd. powervr PowerVR (deprecated, use img) |