hc
2024-05-10 23fa18eaa71266feff7ba8d83022d9e1cc83c65a
kernel/arch/arm/boot/dts/meson8m2.dtsi
....@@ -14,14 +14,25 @@
1414 compatible = "amlogic,meson8m2-clkc", "amlogic,meson8-clkc";
1515 };
1616
17
+&dmcbus {
18
+ /* the offset of the canvas registers has changed compared to Meson8 */
19
+ /delete-node/ video-lut@20;
20
+
21
+ canvas: video-lut@48 {
22
+ compatible = "amlogic,meson8m2-canvas", "amlogic,canvas";
23
+ reg = <0x48 0x14>;
24
+ };
25
+};
26
+
1727 &ethmac {
1828 compatible = "amlogic,meson8m2-dwmac", "snps,dwmac";
1929 reg = <0xc9410000 0x10000
2030 0xc1108140 0x8>;
2131 clocks = <&clkc CLKID_ETH>,
2232 <&clkc CLKID_MPLL2>,
23
- <&clkc CLKID_MPLL2>;
24
- clock-names = "stmmaceth", "clkin0", "clkin1";
33
+ <&clkc CLKID_MPLL2>,
34
+ <&clkc CLKID_FCLK_DIV2>;
35
+ clock-names = "stmmaceth", "clkin0", "clkin1", "timing-adjustment";
2536 resets = <&reset RESET_ETHERNET>;
2637 reset-names = "stmmaceth";
2738 };
....@@ -45,10 +56,46 @@
4556 "eth_rxd1", "eth_rxd0",
4657 "eth_mdio", "eth_mdc";
4758 function = "ethernet";
59
+ bias-disable;
4860 };
4961 };
5062 };
5163
64
+&pwrc {
65
+ compatible = "amlogic,meson8m2-pwrc";
66
+ resets = <&reset RESET_DBLK>,
67
+ <&reset RESET_PIC_DC>,
68
+ <&reset RESET_HDMI_APB>,
69
+ <&reset RESET_HDMI_SYSTEM_RESET>,
70
+ <&reset RESET_VENCI>,
71
+ <&reset RESET_VENCP>,
72
+ <&reset RESET_VDAC_4>,
73
+ <&reset RESET_VENCL>,
74
+ <&reset RESET_VIU>,
75
+ <&reset RESET_VENC>,
76
+ <&reset RESET_RDMA>;
77
+ reset-names = "dblk", "pic_dc", "hdmi_apb", "hdmi_system", "venci",
78
+ "vencp", "vdac", "vencl", "viu", "venc", "rdma";
79
+ assigned-clocks = <&clkc CLKID_VPU>;
80
+ assigned-clock-rates = <364000000>;
81
+};
82
+
83
+&saradc {
84
+ compatible = "amlogic,meson8m2-saradc", "amlogic,meson-saradc";
85
+};
86
+
87
+&sdhc {
88
+ compatible = "amlogic,meson8m2-sdhc", "amlogic,meson-mx-sdhc";
89
+};
90
+
91
+&usb0_phy {
92
+ compatible = "amlogic,meson8m2-usb2-phy", "amlogic,meson-mx-usb2-phy";
93
+};
94
+
95
+&usb1_phy {
96
+ compatible = "amlogic,meson8m2-usb2-phy", "amlogic,meson-mx-usb2-phy";
97
+};
98
+
5299 &wdt {
53100 compatible = "amlogic,meson8m2-wdt", "amlogic,meson8b-wdt";
54101 };