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 <[email protected]>
---
This patch depends on the v4 "arm64: dts: meson: add more GX soundcards" series [0]
being merged first.
[0] http://lists.infradead.org/pipermail/linux-amlogic/2020-December/009236.html
arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts | 3 +--
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>;
--
2.17.1
On 03/12/2020 07:16, Christian Hewitt wrote:
> 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 <[email protected]>
> ---
> This patch depends on the v4 "arm64: dts: meson: add more GX soundcards" series [0]
> being merged first.
>
> [0] http://lists.infradead.org/pipermail/linux-amlogic/2020-December/009236.html
>
> arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts | 3 +--
> 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>;
>
Reviewed-by: Neil Armstrong <[email protected]>
On Thu, 3 Dec 2020 06:16:05 +0000, Christian Hewitt wrote:
> 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.
Applied, thanks!
[1/1] arm64: dts: meson: minor fixups for Khadas VIM/VIM2 dts
commit: c993c4e84369acf5686a6f345ebb0efb0107f73e
Best regards,
--
Kevin Hilman <[email protected]>