Skip to contentSkip to conversation

arm64: dts: meson: minor fixups for Khadas VIM/VIM2 dts

PATCH Applied Christian Hewitt 3 participants 3 messages Dec 3, 2020 – Dec 7, 2020

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
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(-)
arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts +1 -2
index 7aa08f74c49b..6fe589cd2ba2 100644
@@ -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>
 
 / {
arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts +1 -3
index 0250c98dbe9e..955a63aaa5ed 100644
@@ -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>;
Signature · 6 lines
2.17.1

_______________________________________________
linux-amlogic mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-amlogic
Reviewed-by on v1 1/1
#1 lore raw
Quoted 46 lines · Christian Hewitt

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.

---
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(-)
arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts +1 -2
index 7aa08f74c49b..6fe589cd2ba2 100644
@@ -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>
 
 / {
arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts +1 -2
index 0250c98dbe9e..955a63aaa5ed 100644
@@ -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>
 
 / {

arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts line 198

Quoted 7 lines
arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts +0 -1
@@ -194,7 +193,6 @@
 	hdmi-phandle = <&hdmi_tx>;
 };
 
-
 &cpu_cooling_maps {
 	map0 {
 		cooling-device = <&gpio_fan THERMAL_NO_LIMIT 1>;

_______________________________________________
linux-amlogic mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-amlogic

maintainer Applied
#2 lore raw
In reply to Christian Hewitt
Quoted 2 lines · Christian Hewitt

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,

Signature · 6 lines
Kevin Hilman <[email protected]>

_______________________________________________
linux-amlogic mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-amlogic