diff options
| author |   Christian Hewitt <christianshewitt@gmail.com> | 2020-12-03 06:16:05 +0000 |
|---|---|---|
| committer |   Kevin Hilman <khilman@baylibre.com> | 2020-12-07 11:06:33 -0800 |
| commit | c993c4e84369acf5686a6f345ebb0efb0107f73e (patch) | |
| tree | cf49d94f78d1dfded744dc3048fe2226ff92f76e | |
| parent | arm64: dts: meson: add audio playback to wetek-play2 (diff) | |
| download | wireguard-linux-c993c4e84369acf5686a6f345ebb0efb0107f73e.tar.xz wireguard-linux-c993c4e84369acf5686a6f345ebb0efb0107f73e.zip | |
arm64: dts: meson: minor fixups for Khadas VIM/VIM2 dts
Reorder the VIM/VIM2 includes/bindings to follow the format of other dts
in the Amlogic tree and remove a stray empty line in the VIM2 dts.
Signed-off-by: Christian Hewitt <christianshewitt@gmail.com>
Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>
Signed-off-by: Kevin Hilman <khilman@baylibre.com>
Link: https://lore.kernel.org/r/20201203061605.9603-1-christianshewitt@gmail.com
| -rw-r--r-- | arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts | 3 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts index 7aa08f74c49b..6fe589cd2ba2 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts @@ -5,9 +5,8 @@ /dts-v1/; -#include <dt-bindings/input/input.h> - #include "meson-gxl-s905x-p212.dtsi" +#include <dt-bindings/input/input.h> #include <dt-bindings/sound/meson-aiu.h> / { diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts index 0250c98dbe9e..955a63aaa5ed 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts @@ -7,9 +7,8 @@ /dts-v1/; -#include <dt-bindings/input/input.h> - #include "meson-gxm.dtsi" +#include <dt-bindings/input/input.h> #include <dt-bindings/sound/meson-aiu.h> / { @@ -194,7 +193,6 @@ hdmi-phandle = <&hdmi_tx>; }; - &cpu_cooling_maps { map0 { cooling-device = <&gpio_fan THERMAL_NO_LIMIT 1>; |