Commit fafdbdf7 authored by Neil Armstrong's avatar Neil Armstrong Committed by Kevin Hilman

ARM64: dts: meson-gx: Add Graphic Controller nodes

Add Video Processing Unit and CVBS Output nodes, and enable CVBS on selected
boards.
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarNeil Armstrong <narmstrong@baylibre.com>
Signed-off-by: default avatarKevin Hilman <khilman@baylibre.com>
parent 1cf3df8a
...@@ -356,5 +356,21 @@ sd_emmc_c: mmc@74000 { ...@@ -356,5 +356,21 @@ sd_emmc_c: mmc@74000 {
status = "disabled"; status = "disabled";
}; };
}; };
vpu: vpu@d0100000 {
compatible = "amlogic,meson-gx-vpu";
reg = <0x0 0xd0100000 0x0 0x100000>,
<0x0 0xc883c000 0x0 0x1000>,
<0x0 0xc8838000 0x0 0x1000>;
reg-names = "vpu", "hhi", "dmc";
interrupts = <GIC_SPI 3 IRQ_TYPE_EDGE_RISING>;
#address-cells = <1>;
#size-cells = <0>;
/* CVBS VDAC output port */
cvbs_vdac_port: port@0 {
reg = <0>;
};
};
}; };
}; };
...@@ -142,6 +142,16 @@ sdio_pwrseq: sdio-pwrseq { ...@@ -142,6 +142,16 @@ sdio_pwrseq: sdio-pwrseq {
clocks = <&wifi32k>; clocks = <&wifi32k>;
clock-names = "ext_clock"; clock-names = "ext_clock";
}; };
cvbs-connector {
compatible = "composite-video-connector";
port {
cvbs_connector_in: endpoint {
remote-endpoint = <&cvbs_vdac_out>;
};
};
};
}; };
&uart_AO { &uart_AO {
...@@ -229,3 +239,9 @@ &pwm_ef { ...@@ -229,3 +239,9 @@ &pwm_ef {
clocks = <&clkc CLKID_FCLK_DIV4>; clocks = <&clkc CLKID_FCLK_DIV4>;
clock-names = "clkin0"; clock-names = "clkin0";
}; };
&cvbs_vdac_port {
cvbs_vdac_out: endpoint {
remote-endpoint = <&cvbs_connector_in>;
};
};
...@@ -125,6 +125,16 @@ sdio_pwrseq: sdio-pwrseq { ...@@ -125,6 +125,16 @@ sdio_pwrseq: sdio-pwrseq {
clocks = <&wifi32k>; clocks = <&wifi32k>;
clock-names = "ext_clock"; clock-names = "ext_clock";
}; };
cvbs-connector {
compatible = "composite-video-connector";
port {
cvbs_connector_in: endpoint {
remote-endpoint = <&cvbs_vdac_out>;
};
};
};
}; };
/* This UART is brought out to the DB9 connector */ /* This UART is brought out to the DB9 connector */
...@@ -234,3 +244,9 @@ &pwm_ef { ...@@ -234,3 +244,9 @@ &pwm_ef {
clocks = <&clkc CLKID_FCLK_DIV4>; clocks = <&clkc CLKID_FCLK_DIV4>;
clock-names = "clkin0"; clock-names = "clkin0";
}; };
&cvbs_vdac_port {
cvbs_vdac_out: endpoint {
remote-endpoint = <&cvbs_connector_in>;
};
};
...@@ -506,3 +506,7 @@ &sd_emmc_c { ...@@ -506,3 +506,7 @@ &sd_emmc_c {
<&clkc CLKID_FCLK_DIV2>; <&clkc CLKID_FCLK_DIV2>;
clock-names = "core", "clkin0", "clkin1"; clock-names = "core", "clkin0", "clkin1";
}; };
&vpu {
compatible = "amlogic,meson-gxbb-vpu", "amlogic,meson-gx-vpu";
};
...@@ -117,6 +117,16 @@ sdio_pwrseq: sdio-pwrseq { ...@@ -117,6 +117,16 @@ sdio_pwrseq: sdio-pwrseq {
clocks = <&wifi32k>; clocks = <&wifi32k>;
clock-names = "ext_clock"; clock-names = "ext_clock";
}; };
cvbs-connector {
compatible = "composite-video-connector";
port {
cvbs_connector_in: endpoint {
remote-endpoint = <&cvbs_vdac_out>;
};
};
};
}; };
&uart_AO { &uart_AO {
...@@ -203,3 +213,9 @@ &pwm_ef { ...@@ -203,3 +213,9 @@ &pwm_ef {
clocks = <&clkc CLKID_FCLK_DIV4>; clocks = <&clkc CLKID_FCLK_DIV4>;
clock-names = "clkin0"; clock-names = "clkin0";
}; };
&cvbs_vdac_port {
cvbs_vdac_out: endpoint {
remote-endpoint = <&cvbs_connector_in>;
};
};
...@@ -299,3 +299,7 @@ &sd_emmc_c { ...@@ -299,3 +299,7 @@ &sd_emmc_c {
<&clkc CLKID_FCLK_DIV2>; <&clkc CLKID_FCLK_DIV2>;
clock-names = "core", "clkin0", "clkin1"; clock-names = "core", "clkin0", "clkin1";
}; };
&vpu {
compatible = "amlogic,meson-gxl-vpu", "amlogic,meson-gx-vpu";
};
...@@ -90,6 +90,16 @@ emmc_pwrseq: emmc-pwrseq { ...@@ -90,6 +90,16 @@ emmc_pwrseq: emmc-pwrseq {
compatible = "mmc-pwrseq-emmc"; compatible = "mmc-pwrseq-emmc";
reset-gpios = <&gpio BOOT_9 GPIO_ACTIVE_LOW>; reset-gpios = <&gpio BOOT_9 GPIO_ACTIVE_LOW>;
}; };
cvbs-connector {
compatible = "composite-video-connector";
port {
cvbs_connector_in: endpoint {
remote-endpoint = <&cvbs_vdac_out>;
};
};
};
}; };
/* This UART is brought out to the DB9 connector */ /* This UART is brought out to the DB9 connector */
...@@ -167,3 +177,9 @@ external_phy: ethernet-phy@0 { ...@@ -167,3 +177,9 @@ external_phy: ethernet-phy@0 {
max-speed = <1000>; max-speed = <1000>;
}; };
}; };
&cvbs_vdac_port {
cvbs_vdac_out: endpoint {
remote-endpoint = <&cvbs_connector_in>;
};
};
...@@ -112,3 +112,7 @@ cpu7: cpu@103 { ...@@ -112,3 +112,7 @@ cpu7: cpu@103 {
}; };
}; };
}; };
&vpu {
compatible = "amlogic,meson-gxm-vpu", "amlogic,meson-gx-vpu";
};
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment