UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

- fix dtbs_check warnings 

- enable SMP for mt6589
 -----BEGIN PGP SIGNATURE-----
 
 iQJLBAABCAA1FiEEUdvKHhzqrUYPB/u8L21+TfbCqH4FAmBlnrYXHG1hdHRoaWFz
 LmJnZ0BnbWFpbC5jb20ACgkQL21+TfbCqH6DMRAAjp844U17ZqSLVa1nqcOmvbBz
 bp7bXh+6MjifFR4+uUGYSr7kQeANxbj8+IbQORCitH67vfiNUFwr7dIKdorQAr83
 zlTxUay+FolWUMpB/Fe0wL2xiIM9AU0aQSA+Z2xD7DNbDDrjaPqB0KbV5+9UrCK6
 kdI+DHVkHBLOYCgdW203bVNK+1Rmh177DGjLLEP5pKATHndy8DABeHqry3qicuu7
 PpNCvfYRVIhd8t5wfDMnZAUkl5CWF/cfMFWQkZ102dJffleNSCys39lbm2uYqD7s
 VZl5zgJsoiG0l24n9MxRK1lWhjDVW/pqRPPYln8m7j6iHkbtWrqIdKMFUnEdRckO
 0PeYcfEiVAGHDwmhydmqmrwQtrMPx7o08spVUOiNAscOaj2hE4rmBhnE54K65WKU
 kHyYzLDUN6JxY+GUK6e+T4u2R4LPcSUqyVoRE5NKhLm3/8P7xH+ugGtPVDWDEsHc
 RWNOz6MbTImX33pDbGShNWdyZhsPAVKpyymavYDEPCTwyZUOHLwJKwVxkuF96in1
 jKRYaM1RxbICVeH2J5lLERXChAxcxkbmtqywxNT6MG35Q2ChzxhFNKWoXEixlquR
 vnu56IOWahHpSPSHEvKwy0pKho9C2ZH7edCDPg3XtKS4UAGAUuRcBeXs1jRBg/3D
 D+ujjKnujBI6MtPlYP4=
 =PMBP
 -----END PGP SIGNATURE-----

Merge tag 'v5.12-next-dts32' of git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux into arm/dt

- fix dtbs_check warnings
- enable SMP for mt6589

* tag 'v5.12-next-dts32' of git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux:
  arm: mediatek: dts: activate SMP for mt6589
  arm: dts: mt2701: harmonize node names and compatibles
  arm: dts: mt7623: harmonize node names and compatibles
  arm: dts: mt7629: harmonize node names and compatibles

Link: https://lore.kernel.org/r/be262120-6cd9-87a7-ccc3-f5c403cff66b@gmail.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2021-04-01 22:04:55 +02:00
parent 520f30feb8 562f818dea
commit 8028548ba1
5 changed files with 35 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
arch/arm/boot/dts/mt2701.dtsi
View File

@ -607,7 +607,7 @@
};
usb0: usb@1a1c0000 {
compatible = "mediatek,mt8173-xhci";
compatible = "mediatek,mt2701-xhci", "mediatek,mtk-xhci";
reg = <0 0x1a1c0000 0 0x1000>,
<0 0x1a1c4700 0 0x0100>;
reg-names = "mac", "ippc";
@ -620,8 +620,9 @@
status = "disabled";
};
u3phy0: usb-phy@1a1c4000 {
compatible = "mediatek,mt2701-u3phy";
u3phy0: t-phy@1a1c4000 {
compatible = "mediatek,mt2701-tphy",
"mediatek,generic-tphy-v1";
reg = <0 0x1a1c4000 0 0x0700>;
#address-cells = <2>;
#size-cells = <2>;
@ -646,7 +647,7 @@
};
usb1: usb@1a240000 {
compatible = "mediatek,mt8173-xhci";
compatible = "mediatek,mt2701-xhci", "mediatek,mtk-xhci";
reg = <0 0x1a240000 0 0x1000>,
<0 0x1a244700 0 0x0100>;
reg-names = "mac", "ippc";
@ -659,8 +660,9 @@
status = "disabled";
};
u3phy1: usb-phy@1a244000 {
compatible = "mediatek,mt2701-u3phy";
u3phy1: t-phy@1a244000 {
compatible = "mediatek,mt2701-tphy",
"mediatek,generic-tphy-v1";
reg = <0 0x1a244000 0 0x0700>;
#address-cells = <2>;
#size-cells = <2>;
@ -700,8 +702,9 @@
status = "disabled";
};
u2phy0: usb-phy@11210000 {
compatible = "mediatek,generic-tphy-v1";
u2phy0: t-phy@11210000 {
compatible = "mediatek,mt2701-tphy",
"mediatek,generic-tphy-v1";
reg = <0 0x11210000 0 0x0800>;
#address-cells = <2>;
#size-cells = <2>;

1
arch/arm/boot/dts/mt6589.dtsi
View File

@ -17,6 +17,7 @@
cpus {
#address-cells = <1>;
#size-cells = <0>;
enable-method = "mediatek,mt6589-smp";
cpu@0 {
device_type = "cpu";

26
arch/arm/boot/dts/mt7623.dtsi
View File

@ -787,8 +787,9 @@
};
};
pcie0_phy: pcie-phy@1a149000 {
compatible = "mediatek,generic-tphy-v1";
pcie0_phy: t-phy@1a149000 {
compatible = "mediatek,mt7623-tphy",
"mediatek,generic-tphy-v1";
reg = <0 0x1a149000 0 0x0700>;
#address-cells = <2>;
#size-cells = <2>;
@ -804,8 +805,9 @@
};
};
pcie1_phy: pcie-phy@1a14a000 {
compatible = "mediatek,generic-tphy-v1";
pcie1_phy: t-phy@1a14a000 {
compatible = "mediatek,mt7623-tphy",
"mediatek,generic-tphy-v1";
reg = <0 0x1a14a000 0 0x0700>;
#address-cells = <2>;
#size-cells = <2>;
@ -823,7 +825,7 @@
usb1: usb@1a1c0000 {
compatible = "mediatek,mt7623-xhci",
"mediatek,mt8173-xhci";
"mediatek,mtk-xhci";
reg = <0 0x1a1c0000 0 0x1000>,
<0 0x1a1c4700 0 0x0100>;
reg-names = "mac", "ippc";
@ -836,9 +838,9 @@
status = "disabled";
};
u3phy1: usb-phy@1a1c4000 {
compatible = "mediatek,mt7623-u3phy",
"mediatek,mt2701-u3phy";
u3phy1: t-phy@1a1c4000 {
compatible = "mediatek,mt7623-tphy",
"mediatek,generic-tphy-v1";
reg = <0 0x1a1c4000 0 0x0700>;
#address-cells = <2>;
#size-cells = <2>;
@ -864,7 +866,7 @@
usb2: usb@1a240000 {
compatible = "mediatek,mt7623-xhci",
"mediatek,mt8173-xhci";
"mediatek,mtk-xhci";
reg = <0 0x1a240000 0 0x1000>,
<0 0x1a244700 0 0x0100>;
reg-names = "mac", "ippc";
@ -877,9 +879,9 @@
status = "disabled";
};
u3phy2: usb-phy@1a244000 {
compatible = "mediatek,mt7623-u3phy",
"mediatek,mt2701-u3phy";
u3phy2: t-phy@1a244000 {
compatible = "mediatek,mt7623-tphy",
"mediatek,generic-tphy-v1";
reg = <0 0x1a244000 0 0x0700>;
#address-cells = <2>;
#size-cells = <2>;

4
arch/arm/boot/dts/mt7623n.dtsi
View File

@ -246,7 +246,7 @@
status = "disabled";
};
mipi_tx0: mipi-dphy@10010000 {
mipi_tx0: dsi-phy@10010000 {
compatible = "mediatek,mt7623-mipi-tx",
"mediatek,mt2701-mipi-tx";
reg = <0 0x10010000 0 0x90>;
@ -265,7 +265,7 @@
status = "disabled";
};
hdmi_phy: phy@10209100 {
hdmi_phy: hdmi-phy@10209100 {
compatible = "mediatek,mt7623-hdmi-phy",
"mediatek,mt2701-hdmi-phy";
reg = <0 0x10209100 0 0x24>;

12
arch/arm/boot/dts/mt7629.dtsi
View File

@ -329,8 +329,9 @@
status = "disabled";
};
u3phy0: usb-phy@1a0c4000 {
compatible = "mediatek,generic-tphy-v2";
u3phy0: t-phy@1a0c4000 {
compatible = "mediatek,mt7629-tphy",
"mediatek,generic-tphy-v2";
#address-cells = <1>;
#size-cells = <1>;
ranges = <0 0x1a0c4000 0xe00>;
@ -413,14 +414,15 @@
};
};
pciephy1: pcie-phy@1a14a000 {
compatible = "mediatek,generic-tphy-v2";
pciephy1: t-phy@1a14a000 {
compatible = "mediatek,mt7629-tphy",
"mediatek,generic-tphy-v2";
#address-cells = <1>;
#size-cells = <1>;
ranges = <0 0x1a14a000 0x1000>;
status = "disabled";
pcieport1: port1phy@0 {
pcieport1: pcie-phy@0 {
reg = <0 0x1000>;
clocks = <&clk20m>;
clock-names = "ref";