[PATCH next v2 01/17] dt-bindings: usb: fix yamllint check warning
Subsystems:
open firmware and flattened device tree bindings , the rest , usb subsystem
2013d
22 messages,
2 authors,
2021-01-25
· open the first message on its own page
Fix warning: "missing starting space in comment"
Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com>
---
v2: no changes
---
Documentation/devicetree/bindings/usb/usb-device.yaml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/Documentation/devicetree/bindings/usb/usb-device.yaml b/Documentation/devicetree/bindings/usb/usb-device.yaml
index 7bb25a45427d..23e76cfb2066 100644
--- a/Documentation/devicetree/bindings/usb/usb-device.yaml
+++ b/Documentation/devicetree/bindings/usb/usb-device.yaml @@ -82,9 +82,9 @@ required:
additionalProperties : true
examples :
- #hub connected to port 1 - #device connected to port 2 - #device connected to port 3 + # hub connected to port 1 + # device connected to port 2 + # device connected to port 3 # interface 0 of configuration 1
# interface 0 of configuration 2
- | --
2.18.0
Add an optional "clock-names" property, it's not used to get the clock,
but some DTS files (e.g. mt8183) provide it.
Cc: Chun-Kuang Hu <chunkuang.hu@kernel.org>
Cc: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com>
---
v2: new patch separated from [3/15] suggested by CK
---
Documentation/devicetree/bindings/phy/mediatek,dsi-phy.yaml | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/Documentation/devicetree/bindings/phy/mediatek,dsi-phy.yaml b/Documentation/devicetree/bindings/phy/mediatek,dsi-phy.yaml
index 6e4d795f9b02..af6e554c5b69 100644
--- a/Documentation/devicetree/bindings/phy/mediatek,dsi-phy.yaml
+++ b/Documentation/devicetree/bindings/phy/mediatek,dsi-phy.yaml @@ -35,6 +35,10 @@ properties:
items :
- description : PLL reference clock
+ clock-names : + items : + - const : ref + clock-output-names :
maxItems : 1
--
2.18.0
Hi, Chunfeng:
Chunfeng Yun [off-list ref] 於 2021年1月22日 週五 下午8:04寫道：
Add an optional "clock-names" property, it's not used to get the clock,
but some DTS files (e.g. mt8183) provide it.
I think the logic is that we define property in binding document
first, and then write it in device tree. If a property does not exist
in binding document, we should not write it in device tree. So let's
drop this patch and remove clock-names in mt8183.dtsi.
Regards,
Chun-Kuang.
quoted hunk
Cc: Chun-Kuang Hu <chunkuang.hu@kernel.org>
Cc: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com>
---
v2: new patch separated from [3/15] suggested by CK
---
Documentation/devicetree/bindings/phy/mediatek,dsi-phy.yaml | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/Documentation/devicetree/bindings/phy/mediatek,dsi-phy.yaml b/Documentation/devicetree/bindings/phy/mediatek,dsi-phy.yaml
index 6e4d795f9b02..af6e554c5b69 100644
--- a/Documentation/devicetree/bindings/phy/mediatek,dsi-phy.yaml
+++ b/Documentation/devicetree/bindings/phy/mediatek,dsi-phy.yaml @@ -35,6 +35,10 @@ properties:
items :
- description : PLL reference clock
+ clock-names : + items : + - const : ref + clock-output-names :
maxItems : 1
- - 2.18.0
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
On Sat, 2021-01-23 at 08:18 +0800, Chun-Kuang Hu wrote: Hi, Chunfeng:
Chunfeng Yun [off-list ref] 於 2021年1月22日 週五 下午8:04寫道： quoted
Add an optional "clock-names" property, it's not used to get the clock,
but some DTS files (e.g. mt8183) provide it.
I think the logic is that we define property in binding document
first, and then write it in device tree. If a property does not exist
in binding document, we should not write it in device tree. So let's
drop this patch and remove clock-names in mt8183.dtsi. Ok, It's better to remove unnecessary property.
Regards,
Chun-Kuang.
quoted
Cc: Chun-Kuang Hu <chunkuang.hu@kernel.org>
Cc: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com>
---
v2: new patch separated from [3/15] suggested by CK
---
Documentation/devicetree/bindings/phy/mediatek,dsi-phy.yaml | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/Documentation/devicetree/bindings/phy/mediatek,dsi-phy.yaml b/Documentation/devicetree/bindings/phy/mediatek,dsi-phy.yaml
index 6e4d795f9b02..af6e554c5b69 100644
--- a/Documentation/devicetree/bindings/phy/mediatek,dsi-phy.yaml
+++ b/Documentation/devicetree/bindings/phy/mediatek,dsi-phy.yaml @@ -35,6 +35,10 @@ properties:
items :
- description : PLL reference clock
+ clock-names : + items : + - const : ref + clock-output-names :
maxItems : 1
- - 2.18.0
_______________________________________________
Linux-mediatek mailing list
Linux-mediatek@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-mediatek
This is used to fix dtbs_check warning
Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com>
---
v2: no changes
---
arch/arm/boot/dts/mt2701.dtsi | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
diff --git a/arch/arm/boot/dts/mt2701.dtsi b/arch/arm/boot/dts/mt2701.dtsi
index fade14284017..4776f85d6d5b 100644
--- a/arch/arm/boot/dts/mt2701.dtsi
+++ b/arch/arm/boot/dts/mt2701.dtsi @@ -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 > ; --
2.18.0
The compatilbe "mediatek,mt7623-hdmi-tx" is not supported in driver,
and in fact uses "mediatek,mt2701-hdmi-tx" instead on MT7623, so changes
the compatible items to make dependence clear.
Cc: Chun-Kuang Hu <chunkuang.hu@kernel.org>
Cc: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com>
---
v2: no changes
---
.../devicetree/bindings/phy/mediatek,hdmi-phy.yaml | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/Documentation/devicetree/bindings/phy/mediatek,hdmi-phy.yaml b/Documentation/devicetree/bindings/phy/mediatek,hdmi-phy.yaml
index 4752517a1446..0d94950b84ca 100644
--- a/Documentation/devicetree/bindings/phy/mediatek,hdmi-phy.yaml
+++ b/Documentation/devicetree/bindings/phy/mediatek,hdmi-phy.yaml @@ -21,10 +21,13 @@ properties:
pattern : "^hdmi-phy@[0-9a-f]+$"
compatible :
- enum : - - mediatek,mt2701-hdmi-phy - - mediatek,mt7623-hdmi-phy - - mediatek,mt8173-hdmi-phy + oneOf : + - items : + - enum : + - mediatek,mt7623-hdmi-phy + - const : mediatek,mt2701-hdmi-phy + - const : mediatek,mt2701-hdmi-phy + - const : mediatek,mt8173-hdmi-phy
reg :
maxItems : 1 --
2.18.0
Harmonize node names, compatibles and properties.
Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com>
---
v2: no changes
---
arch/arm64/boot/dts/mediatek/mt8183.dtsi | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/arch/arm64/boot/dts/mediatek/mt8183.dtsi b/arch/arm64/boot/dts/mediatek/mt8183.dtsi
index 5b782a4769e7..a69a033a68ac 100644
--- a/arch/arm64/boot/dts/mediatek/mt8183.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt8183.dtsi @@ -865,7 +865,7 @@
ranges ;
status = "disabled" ;
- usb_host : xhci @ 11200000 { + usb_host : usb @ 11200000 { compatible = "mediatek,mt8183-xhci" ,
"mediatek,mtk-xhci" ;
reg = < 0 0x11200000 0 0x1000 > ; @@ -908,11 +908,11 @@
status = "disabled" ;
};
- mipi_tx0 : mipi-dphy @ 11e50000 { + mipi_tx0 : dsi-phy @ 11e50000 { compatible = "mediatek,mt8183-mipi-tx" ;
reg = < 0 0x11e50000 0 0x1000 > ;
clocks = <& apmixedsys CLK_APMIXED_MIPID0_26M > ;
- clock-names = "ref_clk" ; + clock-names = "ref" ; # clock-cells = < 0 > ;
# phy-cells = < 0 > ;
clock-output-names = "mipi_tx0_pll" ; @@ -931,11 +931,10 @@
};
};
- u3phy : usb-phy @ 11f40000 { + u3phy : t-phy @ 11f40000 { compatible = "mediatek,mt8183-tphy" ,
"mediatek,generic-tphy-v2" ;
#address-cells = < 1 > ;
- # phy-cells = < 1 > ; #size-cells = < 1 > ;
ranges = < 0 0 0x11f40000 0x1000 > ;
status = "okay" ; --
2.18.0
This is used to fix dtbs_check warning
Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com>
---
v2: no changes
---
arch/arm/boot/dts/mt7623.dtsi | 26 ++++++++++++++------------
arch/arm/boot/dts/mt7623n.dtsi | 4 ++--
2 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/arch/arm/boot/dts/mt7623.dtsi b/arch/arm/boot/dts/mt7623.dtsi
index aea6809500d7..3c11f7cfcc40 100644
--- a/arch/arm/boot/dts/mt7623.dtsi
+++ b/arch/arm/boot/dts/mt7623.dtsi @@ -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 > ; diff --git a/arch/arm/boot/dts/mt7623n.dtsi b/arch/arm/boot/dts/mt7623n.dtsi
index 1880ac9e32cf..bcb0846e29fd 100644
--- a/arch/arm/boot/dts/mt7623n.dtsi
+++ b/arch/arm/boot/dts/mt7623n.dtsi @@ -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 > ; --
2.18.0
This is used to fix dtbs_check warning
Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com>
---
v2: no changes
---
arch/arm/boot/dts/mt7629.dtsi | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/arch/arm/boot/dts/mt7629.dtsi b/arch/arm/boot/dts/mt7629.dtsi
index 5cbb3d244c75..874043f0490d 100644
--- a/arch/arm/boot/dts/mt7629.dtsi
+++ b/arch/arm/boot/dts/mt7629.dtsi @@ -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" ; --
2.18.0
Add optional property "assigned-clock" and "assigned-clock-parents"
used by mt7629.
Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com>
---
v2: separate compatible out of the patch
---
.../devicetree/bindings/usb/mediatek,mtk-xhci.yaml | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/Documentation/devicetree/bindings/usb/mediatek,mtk-xhci.yaml b/Documentation/devicetree/bindings/usb/mediatek,mtk-xhci.yaml
index a3817f3af59d..5eb8d7cd8155 100644
--- a/Documentation/devicetree/bindings/usb/mediatek,mtk-xhci.yaml
+++ b/Documentation/devicetree/bindings/usb/mediatek,mtk-xhci.yaml @@ -67,6 +67,14 @@ properties:
- const : dma_ck
- const : xhci_ck
+ assigned-clocks : + minItems : 1 + maxItems : 5 + + assigned-clock-parents : + minItems : 1 + maxItems : 5 + phys :
description :
List of all PHYs used on this HCD, it's better to keep PHYs in order --
2.18.0
This is used to fix dtbs_check warning:
harmonize node names and compatibles;
add property "usb-role-switch" for connector dependence.
Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com>
---
v2: no changes
---
arch/arm64/boot/dts/mediatek/mt8516.dtsi | 9 +++++----
arch/arm64/boot/dts/mediatek/pumpkin-common.dtsi | 1 +
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/arch/arm64/boot/dts/mediatek/mt8516.dtsi b/arch/arm64/boot/dts/mediatek/mt8516.dtsi
index e6e4d9d60094..70c9c7423bd4 100644
--- a/arch/arm64/boot/dts/mediatek/mt8516.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt8516.dtsi @@ -450,7 +450,7 @@
};
usb0 : usb @ 11100000 {
- compatible = "mediatek,mtk-musb" ; + compatible = "mediatek,mt8516-musb" , "mediatek,mtk-musb" ; reg = < 0 0x11100000 0 0x1000 > ;
interrupts = < GIC_SPI 72 IRQ_TYPE_LEVEL_LOW > ;
interrupt-names = "mc" ; @@ -463,7 +463,7 @@
};
usb1 : usb @ 11190000 {
- compatible = "mediatek,mtk-musb" ; + compatible = "mediatek,mt8516-musb" , "mediatek,mtk-musb" ; reg = < 0 0x11190000 0 0x1000 > ;
interrupts = < GIC_SPI 210 IRQ_TYPE_LEVEL_LOW > ;
interrupt-names = "mc" ; @@ -476,8 +476,9 @@
status = "disabled" ;
};
- usb_phy : usb @ 11110000 { - compatible = "mediatek,generic-tphy-v1" ; + usb_phy : t-phy @ 11110000 { + compatible = "mediatek,mt8516-tphy" , + "mediatek,generic-tphy-v1" ; reg = < 0 0x11110000 0 0x800 > ;
#address-cells = < 2 > ;
#size-cells = < 2 > ; diff --git a/arch/arm64/boot/dts/mediatek/pumpkin-common.dtsi b/arch/arm64/boot/dts/mediatek/pumpkin-common.dtsi
index 63fd70086bb8..7d738f01cf8d 100644
--- a/arch/arm64/boot/dts/mediatek/pumpkin-common.dtsi
+++ b/arch/arm64/boot/dts/mediatek/pumpkin-common.dtsi @@ -188,6 +188,7 @@
& usb0 {
status = "okay" ;
dr_mode = "peripheral" ;
+ usb-role-switch ;
usb_con : connector {
compatible = "usb-c-connector" ; --
2.18.0
This is used to fix dtbs_check warning.
Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com>
---
v2: no changes
---
arch/arm64/boot/dts/mediatek/mt2712e.dtsi | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm64/boot/dts/mediatek/mt2712e.dtsi b/arch/arm64/boot/dts/mediatek/mt2712e.dtsi
index db17d0a4ed57..a9cca9c146fd 100644
--- a/arch/arm64/boot/dts/mediatek/mt2712e.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt2712e.dtsi @@ -805,7 +805,7 @@
ranges ;
status = "disabled" ;
- usb_host0 : xhci @ 11270000 { + usb_host0 : usb @ 11270000 { compatible = "mediatek,mt2712-xhci" ,
"mediatek,mtk-xhci" ;
reg = < 0 0x11270000 0 0x1000 > ; @@ -818,7 +818,7 @@
};
};
- u3phy0 : usb-phy @ 11290000 { + u3phy0 : t-phy @ 11290000 { compatible = "mediatek,mt2712-tphy" ,
"mediatek,generic-tphy-v2" ;
#address-cells = < 1 > ; @@ -869,7 +869,7 @@
ranges ;
status = "disabled" ;
- usb_host1 : xhci @ 112c0000 { + usb_host1 : usb @ 112c0000 { compatible = "mediatek,mt2712-xhci" ,
"mediatek,mtk-xhci" ;
reg = < 0 0x112c0000 0 0x1000 > ; @@ -882,7 +882,7 @@
};
};
- u3phy1 : usb-phy @ 112e0000 { + u3phy1 : t-phy @ 112e0000 { compatible = "mediatek,mt2712-tphy" ,
"mediatek,generic-tphy-v2" ;
#address-cells = < 1 > ; --
2.18.0
Add two compatible for mt2701 and mt7623;
Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com>
---
v2: new patch separated from [6/15]
---
Documentation/devicetree/bindings/usb/mediatek,mtk-xhci.yaml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/Documentation/devicetree/bindings/usb/mediatek,mtk-xhci.yaml b/Documentation/devicetree/bindings/usb/mediatek,mtk-xhci.yaml
index 5eb8d7cd8155..46fe3a189359 100644
--- a/Documentation/devicetree/bindings/usb/mediatek,mtk-xhci.yaml
+++ b/Documentation/devicetree/bindings/usb/mediatek,mtk-xhci.yaml @@ -23,8 +23,10 @@ properties:
compatible :
items :
- enum :
+ - mediatek,mt2701-xhci - mediatek,mt2712-xhci
- mediatek,mt7622-xhci
+ - mediatek,mt7623-xhci - mediatek,mt7629-xhci
- mediatek,mt8173-xhci
- mediatek,mt8183-xhci --
2.18.0
The phy may be named as pcie-phy when the T-PHY only supports
PCIe mode, it's also the similar case for SATA, named as
sata-phy.
Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com>
---
v2: no changes
---
Documentation/devicetree/bindings/phy/mediatek,tphy.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/devicetree/bindings/phy/mediatek,tphy.yaml b/Documentation/devicetree/bindings/phy/mediatek,tphy.yaml
index 602e6ff45785..4f1733fd9a55 100644
--- a/Documentation/devicetree/bindings/phy/mediatek,tphy.yaml
+++ b/Documentation/devicetree/bindings/phy/mediatek,tphy.yaml @@ -117,7 +117,7 @@ properties:
# Required child node:
patternProperties :
- "^usb-phy@[0-9a-f]+$" : + "^(usb|pcie|sata)-phy@[0-9a-f]+$" : type : object
description :
A sub-node is required for each port the controller provides. --
2.18.0
Harmonize nodes names, compatibles and remove unused property.
Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com>
---
v2: no changes
---
arch/arm64/boot/dts/mediatek/mt8173-evb.dts | 4 +---
arch/arm64/boot/dts/mediatek/mt8173.dtsi | 13 +++++++------
2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/arch/arm64/boot/dts/mediatek/mt8173-evb.dts b/arch/arm64/boot/dts/mediatek/mt8173-evb.dts
index 6dffada2e66b..0ce81c4fe81e 100644
--- a/arch/arm64/boot/dts/mediatek/mt8173-evb.dts
+++ b/arch/arm64/boot/dts/mediatek/mt8173-evb.dts @@ -516,10 +516,8 @@
extcon = <& extcon_usb > ;
dr_mode = "otg" ;
wakeup-source ;
- pinctrl-names = "default" , "id_float" , "id_ground" ; + pinctrl-names = "default" ; pinctrl-0 = <& usb_id_pins_float > ;
- pinctrl-1 = <& usb_id_pins_float > ; - pinctrl-2 = <& usb_id_pins_ground > ; status = "okay" ;
};
diff --git a/arch/arm64/boot/dts/mediatek/mt8173.dtsi b/arch/arm64/boot/dts/mediatek/mt8173.dtsi
index 7fa870e4386a..75040a820f0d 100644
--- a/arch/arm64/boot/dts/mediatek/mt8173.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt8173.dtsi @@ -631,7 +631,7 @@
# mbox-cells = < 2 > ;
};
- mipi_tx0 : mipi-dphy @ 10215000 { + mipi_tx0 : dsi-phy @ 10215000 { compatible = "mediatek,mt8173-mipi-tx" ;
reg = < 0 0x10215000 0 0x1000 > ;
clocks = <& clk26m > ; @@ -641,7 +641,7 @@
status = "disabled" ;
};
- mipi_tx1 : mipi-dphy @ 10216000 { + mipi_tx1 : dsi-phy @ 10216000 { compatible = "mediatek,mt8173-mipi-tx" ;
reg = < 0 0x10216000 0 0x1000 > ;
clocks = <& clk26m > ; @@ -926,7 +926,7 @@
};
ssusb : usb @ 11271000 {
- compatible = "mediatek,mt8173-mtu3" ; + compatible = "mediatek,mt8173-mtu3" , "mediatek,mtu3" ; reg = < 0 0x11271000 0 0x3000 > ,
< 0 0x11280700 0 0x0100 > ;
reg - names = "mac" , "ippc" ; @@ -943,8 +943,9 @@
ranges ;
status = "disabled" ;
- usb_host : xhci @ 11270000 { - compatible = "mediatek,mt8173-xhci" ; + usb_host : usb @ 11270000 { + compatible = "mediatek,mt8173-xhci" , + "mediatek,mtk-xhci" ; reg = < 0 0x11270000 0 0x1000 > ;
reg - names = "mac" ;
interrupts = < GIC_SPI 115 IRQ_TYPE_LEVEL_LOW > ; @@ -955,7 +956,7 @@
};
};
- u3phy : usb-phy @ 11290000 { + u3phy : t-phy @ 11290000 { compatible = "mediatek,mt8173-u3phy" ;
reg = < 0 0x11290000 0 0x800 > ;
#address-cells = < 2 > ; --
2.18.0
The compatilbe "mediatek,mt7623-mipi-tx" is not supported in driver,
and in fact uses "mediatek,mt2701-mipi-tx" instead on MT7623, so changes
the compatible items to make dependence clear.
Cc: Chun-Kuang Hu <chunkuang.hu@kernel.org>
Cc: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com>
---
v2: separate two patches suggested by CK
---
.../devicetree/bindings/phy/mediatek,dsi-phy.yaml | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/Documentation/devicetree/bindings/phy/mediatek,dsi-phy.yaml b/Documentation/devicetree/bindings/phy/mediatek,dsi-phy.yaml
index 71d4acea1f66..6e4d795f9b02 100644
--- a/Documentation/devicetree/bindings/phy/mediatek,dsi-phy.yaml
+++ b/Documentation/devicetree/bindings/phy/mediatek,dsi-phy.yaml @@ -19,11 +19,14 @@ properties:
pattern : "^dsi-phy@[0-9a-f]+$"
compatible :
- enum : - - mediatek,mt2701-mipi-tx - - mediatek,mt7623-mipi-tx - - mediatek,mt8173-mipi-tx - - mediatek,mt8183-mipi-tx + oneOf : + - items : + - enum : + - mediatek,mt7623-mipi-tx + - const : mediatek,mt2701-mipi-tx + - const : mediatek,mt2701-mipi-tx + - const : mediatek,mt8173-mipi-tx + - const : mediatek,mt8183-mipi-tx
reg :
maxItems : 1 --
2.18.0
Hi, Chunfeng:
Chunfeng Yun [off-list ref] 於 2021年1月22日 週五 下午8:04寫道：
The compatilbe "mediatek,mt7623-mipi-tx" is not supported in driver,
and in fact uses "mediatek,mt2701-mipi-tx" instead on MT7623, so changes
the compatible items to make dependence clear.
Reviewed-by: Chun-Kuang Hu <chunkuang.hu@kernel.org>
quoted hunk
Cc: Chun-Kuang Hu <chunkuang.hu@kernel.org>
Cc: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com>
---
v2: separate two patches suggested by CK
---
.../devicetree/bindings/phy/mediatek,dsi-phy.yaml | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/Documentation/devicetree/bindings/phy/mediatek,dsi-phy.yaml b/Documentation/devicetree/bindings/phy/mediatek,dsi-phy.yaml
index 71d4acea1f66..6e4d795f9b02 100644
--- a/Documentation/devicetree/bindings/phy/mediatek,dsi-phy.yaml
+++ b/Documentation/devicetree/bindings/phy/mediatek,dsi-phy.yaml @@ -19,11 +19,14 @@ properties:
pattern : "^dsi-phy@[0-9a-f]+$"
compatible :
- enum : - - mediatek,mt2701-mipi-tx - - mediatek,mt7623-mipi-tx - - mediatek,mt8173-mipi-tx - - mediatek,mt8183-mipi-tx + oneOf : + - items : + - enum : + - mediatek,mt7623-mipi-tx + - const : mediatek,mt2701-mipi-tx + - const : mediatek,mt2701-mipi-tx + - const : mediatek,mt8173-mipi-tx + - const : mediatek,mt8183-mipi-tx reg :
maxItems : 1
- - 2.18.0
Hi, Chunfeng:
Chun-Kuang Hu [off-list ref] 於 2021年1月24日 週日 下午12:47寫道：
Hi, Chunfeng:
Chunfeng Yun [off-list ref] 於 2021年1月22日 週五 下午8:04寫道： quoted
The compatilbe "mediatek,mt7623-mipi-tx" is not supported in driver,
and in fact uses "mediatek,mt2701-mipi-tx" instead on MT7623, so changes
the compatible items to make dependence clear.
Reviewed-by: Chun-Kuang Hu <chunkuang.hu@kernel.org>
Sorry, please remove my reviewed-by tag. We should not define the
binding document according to the implementation of driver. We define
the binding document according to the hardware. So the description
should be like "mt7623-mipi-tx is compatible to mt2701-mipi-tx".
Regards,
Chun-Kuang.
quoted
Cc: Chun-Kuang Hu <chunkuang.hu@kernel.org>
Cc: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com>
---
v2: separate two patches suggested by CK
---
.../devicetree/bindings/phy/mediatek,dsi-phy.yaml | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/Documentation/devicetree/bindings/phy/mediatek,dsi-phy.yaml b/Documentation/devicetree/bindings/phy/mediatek,dsi-phy.yaml
index 71d4acea1f66..6e4d795f9b02 100644
--- a/Documentation/devicetree/bindings/phy/mediatek,dsi-phy.yaml
+++ b/Documentation/devicetree/bindings/phy/mediatek,dsi-phy.yaml @@ -19,11 +19,14 @@ properties:
pattern : "^dsi-phy@[0-9a-f]+$"
compatible :
- enum : - - mediatek,mt2701-mipi-tx - - mediatek,mt7623-mipi-tx - - mediatek,mt8173-mipi-tx - - mediatek,mt8183-mipi-tx + oneOf : + - items : + - enum : + - mediatek,mt7623-mipi-tx + - const : mediatek,mt2701-mipi-tx + - const : mediatek,mt2701-mipi-tx + - const : mediatek,mt8173-mipi-tx + - const : mediatek,mt8183-mipi-tx reg :
maxItems : 1
- - 2.18.0
On Sun, 2021-01-24 at 12:56 +0800, Chun-Kuang Hu wrote: Hi, Chunfeng:
Chun-Kuang Hu [off-list ref] 於 2021年1月24日 週日 下午12:47寫道： quoted
Hi, Chunfeng:
Chunfeng Yun [off-list ref] 於 2021年1月22日 週五 下午8:04寫道： quoted
The compatilbe "mediatek,mt7623-mipi-tx" is not supported in driver,
and in fact uses "mediatek,mt2701-mipi-tx" instead on MT7623, so changes
the compatible items to make dependence clear.
Reviewed-by: Chun-Kuang Hu <chunkuang.hu@kernel.org>
Sorry, please remove my reviewed-by tag. We should not define the
binding document according to the implementation of driver. We define
the binding document according to the hardware. So the description
should be like "mt7623-mipi-tx is compatible to mt2701-mipi-tx". Ok, will make the description clearer
Regards,
Chun-Kuang.
quoted quoted
Cc: Chun-Kuang Hu <chunkuang.hu@kernel.org>
Cc: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com>
---
v2: separate two patches suggested by CK
---
.../devicetree/bindings/phy/mediatek,dsi-phy.yaml | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/Documentation/devicetree/bindings/phy/mediatek,dsi-phy.yaml b/Documentation/devicetree/bindings/phy/mediatek,dsi-phy.yaml
index 71d4acea1f66..6e4d795f9b02 100644
--- a/Documentation/devicetree/bindings/phy/mediatek,dsi-phy.yaml
+++ b/Documentation/devicetree/bindings/phy/mediatek,dsi-phy.yaml @@ -19,11 +19,14 @@ properties:
pattern : "^dsi-phy@[0-9a-f]+$"
compatible :
- enum : - - mediatek,mt2701-mipi-tx - - mediatek,mt7623-mipi-tx - - mediatek,mt8173-mipi-tx - - mediatek,mt8183-mipi-tx + oneOf : + - items : + - enum : + - mediatek,mt7623-mipi-tx + - const : mediatek,mt2701-mipi-tx + - const : mediatek,mt2701-mipi-tx + - const : mediatek,mt8173-mipi-tx + - const : mediatek,mt8183-mipi-tx reg :
maxItems : 1
- - 2.18.0
This is used to fix dtbs_check warning
Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com>
---
v2: no changes
---
arch/arm64/boot/dts/mediatek/mt7622.dtsi | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/arch/arm64/boot/dts/mediatek/mt7622.dtsi b/arch/arm64/boot/dts/mediatek/mt7622.dtsi
index 5b9ec032ce8d..4cfa09b0ca3c 100644
--- a/arch/arm64/boot/dts/mediatek/mt7622.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt7622.dtsi @@ -740,8 +740,8 @@
status = "disabled" ;
};
- u3phy : usb-phy @ 1a0c4000 { - compatible = "mediatek,mt7622-u3phy" , + u3phy : t-phy @ 1a0c4000 { + compatible = "mediatek,mt7622-tphy" , "mediatek,generic-tphy-v1" ;
reg = < 0 0x1a0c4000 0 0x700 > ;
#address-cells = < 2 > ; @@ -875,8 +875,9 @@
status = "disabled" ;
};
- sata_phy : sata-phy @ 1a243000 { - compatible = "mediatek,generic-tphy-v1" ; + sata_phy : t-phy @ 1a243000 { + compatible = "mediatek,mt7622-tphy" , + "mediatek,generic-tphy-v1" ; #address-cells = < 2 > ;
#size-cells = < 2 > ;
ranges ; --
2.18.0
Fix warning: "too many spaces inside brackets"
Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com>
---
v2: no changes
---
.../devicetree/bindings/usb/mediatek,mtk-xhci.yaml | 2 +-
Documentation/devicetree/bindings/usb/mediatek,mtu3.yaml | 6 +++---
Documentation/devicetree/bindings/usb/mediatek,musb.yaml | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Documentation/devicetree/bindings/usb/mediatek,mtk-xhci.yaml b/Documentation/devicetree/bindings/usb/mediatek,mtk-xhci.yaml
index 38b1fe18aa79..a3817f3af59d 100644
--- a/Documentation/devicetree/bindings/usb/mediatek,mtk-xhci.yaml
+++ b/Documentation/devicetree/bindings/usb/mediatek,mtk-xhci.yaml @@ -139,7 +139,7 @@ patternProperties:
description : The hard wired USB devices.
dependencies :
- wakeup-source : [ 'mediatek,syscon-wakeup' ] + wakeup-source : [ 'mediatek,syscon-wakeup' ]
required :
- compatible diff --git a/Documentation/devicetree/bindings/usb/mediatek,mtu3.yaml b/Documentation/devicetree/bindings/usb/mediatek,mtu3.yaml
index f5c04b9d2de9..66d78f534722 100644
--- a/Documentation/devicetree/bindings/usb/mediatek,mtu3.yaml
+++ b/Documentation/devicetree/bindings/usb/mediatek,mtu3.yaml @@ -172,9 +172,9 @@ patternProperties:
example if the host mode is enabled.
dependencies :
- connector : [ 'usb-role-switch' ] - port : [ 'usb-role-switch' ] - wakeup-source : [ 'mediatek,syscon-wakeup' ] + connector : [ 'usb-role-switch' ] + port : [ 'usb-role-switch' ] + wakeup-source : [ 'mediatek,syscon-wakeup' ]
required :
- compatible diff --git a/Documentation/devicetree/bindings/usb/mediatek,musb.yaml b/Documentation/devicetree/bindings/usb/mediatek,musb.yaml
index 790efe8b6274..a515c9f30b96 100644
--- a/Documentation/devicetree/bindings/usb/mediatek,musb.yaml
+++ b/Documentation/devicetree/bindings/usb/mediatek,musb.yaml @@ -66,8 +66,8 @@ properties:
type : object
dependencies :
- usb-role-switch : [ 'connector' ] - connector : [ 'usb-role-switch' ] + usb-role-switch : [ 'connector' ] + connector : [ 'usb-role-switch' ]
required :
- compatible --
2.18.0
Add support mt8516 compatbile
Signed-off-by: Chunfeng Yun <chunfeng.yun@mediatek.com>
---
v2: no changes
---
Documentation/devicetree/bindings/usb/mediatek,musb.yaml | 1 +
1 file changed, 1 insertion(+)
diff --git a/Documentation/devicetree/bindings/usb/mediatek,musb.yaml b/Documentation/devicetree/bindings/usb/mediatek,musb.yaml
index a515c9f30b96..e02d8f5d53dc 100644
--- a/Documentation/devicetree/bindings/usb/mediatek,musb.yaml
+++ b/Documentation/devicetree/bindings/usb/mediatek,musb.yaml @@ -17,6 +17,7 @@ properties:
compatible :
items :
- enum :
+ - mediatek,mt8516-musb - mediatek,mt2701-musb
- const : mediatek,mtk-musb
--
2.18.0