Skip to content

Commit 6f1c2a1

Browse files
committed
arm64: meson: g12-common: add the MIPI DSI nodes
Add the MIPI DSI Analog & Digital PHY nodes and the DSI control nodes with proper port endpoint to the VPU. Link: https://lore.kernel.org/r/20240403-amlogic-v6-4-upstream-dsi-ccf-vim3-v12-5-99ecdfdc87fc@linaro.org Signed-off-by: Neil Armstrong <[email protected]>
1 parent ef5a84d commit 6f1c2a1

File tree

1 file changed

+70
-0
lines changed

1 file changed

+70
-0
lines changed

arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1663,9 +1663,28 @@
16631663
<250000000>,
16641664
<0>; /* Do Nothing */
16651665
};
1666+
1667+
mipi_analog_dphy: phy {
1668+
compatible = "amlogic,g12a-mipi-dphy-analog";
1669+
#phy-cells = <0>;
1670+
status = "disabled";
1671+
};
16661672
};
16671673
};
16681674

1675+
mipi_dphy: phy@44000 {
1676+
compatible = "amlogic,axg-mipi-dphy";
1677+
reg = <0x0 0x44000 0x0 0x2000>;
1678+
clocks = <&clkc CLKID_MIPI_DSI_PHY>;
1679+
clock-names = "pclk";
1680+
resets = <&reset RESET_MIPI_DSI_PHY>;
1681+
reset-names = "phy";
1682+
phys = <&mipi_analog_dphy>;
1683+
phy-names = "analog";
1684+
#phy-cells = <0>;
1685+
status = "disabled";
1686+
};
1687+
16691688
usb3_pcie_phy: phy@46000 {
16701689
compatible = "amlogic,g12a-usb3-pcie-phy";
16711690
reg = <0x0 0x46000 0x0 0x2000>;
@@ -2152,6 +2171,15 @@
21522171
remote-endpoint = <&hdmi_tx_in>;
21532172
};
21542173
};
2174+
2175+
/* DPI output port */
2176+
dpi_port: port@2 {
2177+
reg = <2>;
2178+
2179+
dpi_out: endpoint {
2180+
remote-endpoint = <&mipi_dsi_in>;
2181+
};
2182+
};
21552183
};
21562184

21572185
gic: interrupt-controller@ffc01000 {
@@ -2189,6 +2217,48 @@
21892217
amlogic,channel-interrupts = <64 65 66 67 68 69 70 71>;
21902218
};
21912219

2220+
mipi_dsi: dsi@7000 {
2221+
compatible = "amlogic,meson-g12a-dw-mipi-dsi";
2222+
reg = <0x0 0x7000 0x0 0x1000>;
2223+
resets = <&reset RESET_MIPI_DSI_HOST>;
2224+
reset-names = "top";
2225+
clocks = <&clkc CLKID_MIPI_DSI_HOST>,
2226+
<&clkc CLKID_MIPI_DSI_PXCLK>,
2227+
<&clkc CLKID_CTS_ENCL>;
2228+
clock-names = "pclk", "bit", "px";
2229+
phys = <&mipi_dphy>;
2230+
phy-names = "dphy";
2231+
#address-cells = <1>;
2232+
#size-cells = <0>;
2233+
status = "disabled";
2234+
2235+
assigned-clocks = <&clkc CLKID_MIPI_DSI_PXCLK_SEL>,
2236+
<&clkc CLKID_CTS_ENCL_SEL>,
2237+
<&clkc CLKID_VCLK2_SEL>;
2238+
assigned-clock-parents = <&clkc CLKID_GP0_PLL>,
2239+
<&clkc CLKID_VCLK2_DIV1>,
2240+
<&clkc CLKID_GP0_PLL>;
2241+
2242+
ports {
2243+
#address-cells = <1>;
2244+
#size-cells = <0>;
2245+
2246+
/* VPU VENC Input */
2247+
mipi_dsi_venc_port: port@0 {
2248+
reg = <0>;
2249+
2250+
mipi_dsi_in: endpoint {
2251+
remote-endpoint = <&dpi_out>;
2252+
};
2253+
};
2254+
2255+
/* DSI Output */
2256+
mipi_dsi_panel_port: port@1 {
2257+
reg = <1>;
2258+
};
2259+
};
2260+
};
2261+
21922262
watchdog: watchdog@f0d0 {
21932263
compatible = "amlogic,meson-gxbb-wdt";
21942264
reg = <0x0 0xf0d0 0x0 0x10>;

0 commit comments

Comments
 (0)