Commit 8028548b authored by Arnd Bergmann's avatar Arnd Bergmann

Merge tag 'v5.12-next-dts32' of...

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.comSigned-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 520f30fe 562f818d
...@@ -607,7 +607,7 @@ hifsys: syscon@1a000000 { ...@@ -607,7 +607,7 @@ hifsys: syscon@1a000000 {
}; };
usb0: usb@1a1c0000 { usb0: usb@1a1c0000 {
compatible = "mediatek,mt8173-xhci"; compatible = "mediatek,mt2701-xhci", "mediatek,mtk-xhci";
reg = <0 0x1a1c0000 0 0x1000>, reg = <0 0x1a1c0000 0 0x1000>,
<0 0x1a1c4700 0 0x0100>; <0 0x1a1c4700 0 0x0100>;
reg-names = "mac", "ippc"; reg-names = "mac", "ippc";
...@@ -620,8 +620,9 @@ usb0: usb@1a1c0000 { ...@@ -620,8 +620,9 @@ usb0: usb@1a1c0000 {
status = "disabled"; status = "disabled";
}; };
u3phy0: usb-phy@1a1c4000 { u3phy0: t-phy@1a1c4000 {
compatible = "mediatek,mt2701-u3phy"; compatible = "mediatek,mt2701-tphy",
"mediatek,generic-tphy-v1";
reg = <0 0x1a1c4000 0 0x0700>; reg = <0 0x1a1c4000 0 0x0700>;
#address-cells = <2>; #address-cells = <2>;
#size-cells = <2>; #size-cells = <2>;
...@@ -646,7 +647,7 @@ u3port0: usb-phy@1a1c4900 { ...@@ -646,7 +647,7 @@ u3port0: usb-phy@1a1c4900 {
}; };
usb1: usb@1a240000 { usb1: usb@1a240000 {
compatible = "mediatek,mt8173-xhci"; compatible = "mediatek,mt2701-xhci", "mediatek,mtk-xhci";
reg = <0 0x1a240000 0 0x1000>, reg = <0 0x1a240000 0 0x1000>,
<0 0x1a244700 0 0x0100>; <0 0x1a244700 0 0x0100>;
reg-names = "mac", "ippc"; reg-names = "mac", "ippc";
...@@ -659,8 +660,9 @@ usb1: usb@1a240000 { ...@@ -659,8 +660,9 @@ usb1: usb@1a240000 {
status = "disabled"; status = "disabled";
}; };
u3phy1: usb-phy@1a244000 { u3phy1: t-phy@1a244000 {
compatible = "mediatek,mt2701-u3phy"; compatible = "mediatek,mt2701-tphy",
"mediatek,generic-tphy-v1";
reg = <0 0x1a244000 0 0x0700>; reg = <0 0x1a244000 0 0x0700>;
#address-cells = <2>; #address-cells = <2>;
#size-cells = <2>; #size-cells = <2>;
...@@ -700,8 +702,9 @@ usb2: usb@11200000 { ...@@ -700,8 +702,9 @@ usb2: usb@11200000 {
status = "disabled"; status = "disabled";
}; };
u2phy0: usb-phy@11210000 { u2phy0: t-phy@11210000 {
compatible = "mediatek,generic-tphy-v1"; compatible = "mediatek,mt2701-tphy",
"mediatek,generic-tphy-v1";
reg = <0 0x11210000 0 0x0800>; reg = <0 0x11210000 0 0x0800>;
#address-cells = <2>; #address-cells = <2>;
#size-cells = <2>; #size-cells = <2>;
......
...@@ -17,6 +17,7 @@ / { ...@@ -17,6 +17,7 @@ / {
cpus { cpus {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
enable-method = "mediatek,mt6589-smp";
cpu@0 { cpu@0 {
device_type = "cpu"; device_type = "cpu";
......
...@@ -787,8 +787,9 @@ pcie@2,0 { ...@@ -787,8 +787,9 @@ pcie@2,0 {
}; };
}; };
pcie0_phy: pcie-phy@1a149000 { pcie0_phy: t-phy@1a149000 {
compatible = "mediatek,generic-tphy-v1"; compatible = "mediatek,mt7623-tphy",
"mediatek,generic-tphy-v1";
reg = <0 0x1a149000 0 0x0700>; reg = <0 0x1a149000 0 0x0700>;
#address-cells = <2>; #address-cells = <2>;
#size-cells = <2>; #size-cells = <2>;
...@@ -804,8 +805,9 @@ pcie0_port: pcie-phy@1a149900 { ...@@ -804,8 +805,9 @@ pcie0_port: pcie-phy@1a149900 {
}; };
}; };
pcie1_phy: pcie-phy@1a14a000 { pcie1_phy: t-phy@1a14a000 {
compatible = "mediatek,generic-tphy-v1"; compatible = "mediatek,mt7623-tphy",
"mediatek,generic-tphy-v1";
reg = <0 0x1a14a000 0 0x0700>; reg = <0 0x1a14a000 0 0x0700>;
#address-cells = <2>; #address-cells = <2>;
#size-cells = <2>; #size-cells = <2>;
...@@ -823,7 +825,7 @@ pcie1_port: pcie-phy@1a14a900 { ...@@ -823,7 +825,7 @@ pcie1_port: pcie-phy@1a14a900 {
usb1: usb@1a1c0000 { usb1: usb@1a1c0000 {
compatible = "mediatek,mt7623-xhci", compatible = "mediatek,mt7623-xhci",
"mediatek,mt8173-xhci"; "mediatek,mtk-xhci";
reg = <0 0x1a1c0000 0 0x1000>, reg = <0 0x1a1c0000 0 0x1000>,
<0 0x1a1c4700 0 0x0100>; <0 0x1a1c4700 0 0x0100>;
reg-names = "mac", "ippc"; reg-names = "mac", "ippc";
...@@ -836,9 +838,9 @@ usb1: usb@1a1c0000 { ...@@ -836,9 +838,9 @@ usb1: usb@1a1c0000 {
status = "disabled"; status = "disabled";
}; };
u3phy1: usb-phy@1a1c4000 { u3phy1: t-phy@1a1c4000 {
compatible = "mediatek,mt7623-u3phy", compatible = "mediatek,mt7623-tphy",
"mediatek,mt2701-u3phy"; "mediatek,generic-tphy-v1";
reg = <0 0x1a1c4000 0 0x0700>; reg = <0 0x1a1c4000 0 0x0700>;
#address-cells = <2>; #address-cells = <2>;
#size-cells = <2>; #size-cells = <2>;
...@@ -864,7 +866,7 @@ u3port0: usb-phy@1a1c4900 { ...@@ -864,7 +866,7 @@ u3port0: usb-phy@1a1c4900 {
usb2: usb@1a240000 { usb2: usb@1a240000 {
compatible = "mediatek,mt7623-xhci", compatible = "mediatek,mt7623-xhci",
"mediatek,mt8173-xhci"; "mediatek,mtk-xhci";
reg = <0 0x1a240000 0 0x1000>, reg = <0 0x1a240000 0 0x1000>,
<0 0x1a244700 0 0x0100>; <0 0x1a244700 0 0x0100>;
reg-names = "mac", "ippc"; reg-names = "mac", "ippc";
...@@ -877,9 +879,9 @@ usb2: usb@1a240000 { ...@@ -877,9 +879,9 @@ usb2: usb@1a240000 {
status = "disabled"; status = "disabled";
}; };
u3phy2: usb-phy@1a244000 { u3phy2: t-phy@1a244000 {
compatible = "mediatek,mt7623-u3phy", compatible = "mediatek,mt7623-tphy",
"mediatek,mt2701-u3phy"; "mediatek,generic-tphy-v1";
reg = <0 0x1a244000 0 0x0700>; reg = <0 0x1a244000 0 0x0700>;
#address-cells = <2>; #address-cells = <2>;
#size-cells = <2>; #size-cells = <2>;
......
...@@ -246,7 +246,7 @@ hdmi0: hdmi@14015000 { ...@@ -246,7 +246,7 @@ hdmi0: hdmi@14015000 {
status = "disabled"; status = "disabled";
}; };
mipi_tx0: mipi-dphy@10010000 { mipi_tx0: dsi-phy@10010000 {
compatible = "mediatek,mt7623-mipi-tx", compatible = "mediatek,mt7623-mipi-tx",
"mediatek,mt2701-mipi-tx"; "mediatek,mt2701-mipi-tx";
reg = <0 0x10010000 0 0x90>; reg = <0 0x10010000 0 0x90>;
...@@ -265,7 +265,7 @@ cec: cec@10012000 { ...@@ -265,7 +265,7 @@ cec: cec@10012000 {
status = "disabled"; status = "disabled";
}; };
hdmi_phy: phy@10209100 { hdmi_phy: hdmi-phy@10209100 {
compatible = "mediatek,mt7623-hdmi-phy", compatible = "mediatek,mt7623-hdmi-phy",
"mediatek,mt2701-hdmi-phy"; "mediatek,mt2701-hdmi-phy";
reg = <0 0x10209100 0 0x24>; reg = <0 0x10209100 0 0x24>;
......
...@@ -329,8 +329,9 @@ ssusb: usb@1a0c0000 { ...@@ -329,8 +329,9 @@ ssusb: usb@1a0c0000 {
status = "disabled"; status = "disabled";
}; };
u3phy0: usb-phy@1a0c4000 { u3phy0: t-phy@1a0c4000 {
compatible = "mediatek,generic-tphy-v2"; compatible = "mediatek,mt7629-tphy",
"mediatek,generic-tphy-v2";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
ranges = <0 0x1a0c4000 0xe00>; ranges = <0 0x1a0c4000 0xe00>;
...@@ -413,14 +414,15 @@ pcie_intc1: interrupt-controller { ...@@ -413,14 +414,15 @@ pcie_intc1: interrupt-controller {
}; };
}; };
pciephy1: pcie-phy@1a14a000 { pciephy1: t-phy@1a14a000 {
compatible = "mediatek,generic-tphy-v2"; compatible = "mediatek,mt7629-tphy",
"mediatek,generic-tphy-v2";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
ranges = <0 0x1a14a000 0x1000>; ranges = <0 0x1a14a000 0x1000>;
status = "disabled"; status = "disabled";
pcieport1: port1phy@0 { pcieport1: pcie-phy@0 {
reg = <0 0x1000>; reg = <0 0x1000>;
clocks = <&clk20m>; clocks = <&clk20m>;
clock-names = "ref"; clock-names = "ref";
......
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