@@ -292,19 +292,6 @@ syscfg_lpm: lpm-syscfg@94b5100 {
reg = <0x94b5100 0x1000>;
};
- /* Display */
- vtg_main: sti-vtg-main@8d02800 {
- compatible = "st,vtg";
- reg = <0x8d02800 0x200>;
- interrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
- };
-
- vtg_aux: sti-vtg-aux@8d00200 {
- compatible = "st,vtg";
- reg = <0x8d00200 0x100>;
- interrupts = <GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>;
- };
-
serial@9830000 {
compatible = "st,asc";
reg = <0x9830000 0x2c>;
@@ -8,6 +8,18 @@
#include <dt-bindings/gpio/gpio.h>
/ {
soc {
+ vtg_main: sti-vtg-main@8d02800 {
+ compatible = "st,vtg";
+ reg = <0x8d02800 0x200>;
+ interrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
+ };
+
+ vtg_aux: sti-vtg-aux@8d00200 {
+ compatible = "st,vtg";
+ reg = <0x8d00200 0x100>;
+ interrupts = <GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>;
+ };
+
sti-display-subsystem@0 {
compatible = "st,sti-display-subsystem";
#address-cells = <1>;
@@ -99,6 +99,18 @@ ehci1: usb@9a83e00 {
status = "disabled";
};
+ vtg_main: sti-vtg-main@8d02800 {
+ compatible = "st,vtg";
+ reg = <0x8d02800 0x200>;
+ interrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
+ };
+
+ vtg_aux: sti-vtg-aux@8d00200 {
+ compatible = "st,vtg";
+ reg = <0x8d00200 0x100>;
+ interrupts = <GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>;
+ };
+
sti-display-subsystem@0 {
compatible = "st,sti-display-subsystem";
#address-cells = <1>;
In preparation of introduction of display support in stih418, move the vtg nodes into stih407.dtsi and stih410.dtsi since vtg nodes will differ in case of the stih418 and thus cannot be kept as part of the stih407-family.dtsi. Signed-off-by: Alain Volmat <avolmat@me.com> --- arch/arm/boot/dts/st/stih407-family.dtsi | 13 ------------- arch/arm/boot/dts/st/stih407.dtsi | 12 ++++++++++++ arch/arm/boot/dts/st/stih410.dtsi | 12 ++++++++++++ 3 files changed, 24 insertions(+), 13 deletions(-)