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 /arch/arm/boot/dts/Makefile | |
| parent | fb5c84ce00d9321433b5709c205e32049201fa62 (diff) | |
| parent | ebea2a43fdafdbce918bd7e200b709d6c33b9f3b (diff) | |
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 'arch/arm/boot/dts/Makefile')
| -rw-r--r-- | arch/arm/boot/dts/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index dbf198b95377..626e73186685 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -1063,6 +1063,7 @@ dtb-$(CONFIG_ARCH_TANGO) += \ tango4-vantage-1172.dtb dtb-$(CONFIG_ARCH_TEGRA_2x_SOC) += \ tegra20-harmony.dtb \ + tegra20-colibri-eval-v3.dtb \ tegra20-colibri-iris.dtb \ tegra20-medcom-wide.dtb \ tegra20-paz00.dtb \ @@ -1073,6 +1074,7 @@ dtb-$(CONFIG_ARCH_TEGRA_2x_SOC) += \ tegra20-ventana.dtb dtb-$(CONFIG_ARCH_TEGRA_3x_SOC) += \ tegra30-apalis-eval.dtb \ + tegra30-apalis-v1.1-eval.dtb \ tegra30-beaver.dtb \ tegra30-cardhu-a02.dtb \ tegra30-cardhu-a04.dtb \ |