dt-bindings: phy-mtk-tphy: add the property about force_vbus
PATCH 1/2 dt-bindings: phy-mtk-tphy: add the property about force_vbus
For some platforms, they don't have vbus pin connection between usb's phy and mac. Hence we need to control force_vbus related registers to keep hardware works normal.
This patch add the required bool property force_vbus.
--- Documentation/devicetree/bindings/phy/phy-mtk-tphy.txt | 3 +++ 1 file changed, 3 insertions(+)
Documentation/devicetree/bindings/phy/phy-mtk-tphy.txt +3 -0
@@ -37,6 +37,9 @@ Optional properties (controller (parent) node): calibrate - mediatek,src-coef : coefficient for slew rate calibrate, depends on SoC process + - force_vbus : if the platform has no vbus connection between phy and mac, + (force_vbus mode), then this property should be exist. + Otherwise not to add this property. Required properties (port (child) node): - reg : address and length of the register set for the port.
Signature · 1 line
2.18.0
PATCH 2/2 phy: phy-mtk-tphy: introduce force_vbus for u2 phy
For some platforms, they don't have vbus pin connection between usb phy and mac. Hence we need to control force_vbus related registers to keep hardware works normal.
This patch add corresponding behavior of force vbus in u2 phy related functions.
--- drivers/phy/mediatek/phy-mtk-tphy.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-)
drivers/phy/mediatek/phy-mtk-tphy.c +15 -1
@@ -99,6 +99,7 @@#define U3P_U2PHYDTM1 0x06C#define P2C_RG_UART_EN BIT(16) +#define P2C_FORCE_VBUSVALID BIT(13)#define P2C_FORCE_IDDIG BIT(9)#define P2C_RG_VBUSVALID BIT(5)#define P2C_RG_SESSEND BIT(4)
@@ -318,6 +319,7 @@ struct mtk_tphy {int nphys;int src_ref_clk;/* MHZ, reference clock for slew rate calibrate */ int src_coef;/* coefficient for slew rate calibrate */ +bool force_vbus; }; static void hs_slew_rate_calibrate(struct mtk_tphy *tphy,
@@ -611,13 +613,20 @@ static void u2_phy_instance_set_mode(struct mtk_tphy *tphy,switch (mode) {case PHY_MODE_USB_DEVICE : tmp |=P2C_FORCE_IDDIG |P2C_RG_IDDIG ; +if (tphy->force_vbus) + tmp |=P2C_RG_VBUSVALID |P2C_FORCE_VBUSVALID ;break ;case PHY_MODE_USB_HOST : tmp |=P2C_FORCE_IDDIG ; - tmp &= ~P2C_RG_IDDIG ; +if (tphy->force_vbus) + tmp &= ~(P2C_RG_VBUSVALID |P2C_FORCE_VBUSVALID ); +else + tmp &= ~P2C_RG_IDDIG ;break ;case PHY_MODE_USB_OTG : tmp &= ~(P2C_FORCE_IDDIG |P2C_RG_IDDIG ); +if (tphy->force_vbus) + tmp &= ~(P2C_RG_VBUSVALID |P2C_FORCE_VBUSVALID );break ;default :return ;
@@ -1187,6 +1196,11 @@ static int mtk_tphy_probe(struct platform_device *pdev) retval =PTR_ERR (instance->da_ref_clk); goto put_child; } + +/* +* On some platform, vbus is dis-connected between PHY and MAC. +*/ + tphy->force_vbus =device_property_read_bool (dev,"force_vbus" ); } provider =devm_of_phy_provider_register (dev, mtk_phy_xlate);
Signature · 1 line
2.18.0
Re: [PATCH 2/2] phy: phy-mtk-tphy: introduce force_vbus for u2 phy
Hi Macpaul,
Quoted 7 lines · Macpaul Lin
For some platforms, they don't have vbus pin connection between usb phy and mac. Hence we need to control
force_vbusrelated registers to keep hardware works normal.
This patch add corresponding behavior of force vbus in u2 phy related functions.Signed-off-by Macpaul Lin <[email protected]>
NACK, I tried to support it early, but found this will cause some issue for SS/SSP device only mode, so please abandon this patch, thanks
Quoted 58 lines
--- drivers/phy/mediatek/phy-mtk-tphy.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-)drivers/phy/mediatek/phy-mtk-tphy.c +15
-1@@ -99,6 +99,7 @@#define U3P_U2PHYDTM1 0x06C#define P2C_RG_UART_EN BIT(16) +#define P2C_FORCE_VBUSVALID BIT(13)#define P2C_FORCE_IDDIG BIT(9)#define P2C_RG_VBUSVALID BIT(5)#define P2C_RG_SESSEND BIT(4)@@ -318,6 +319,7 @@ struct mtk_tphy {int nphys;int src_ref_clk;/* MHZ, reference clock for slew rate calibrate */ int src_coef;/* coefficient for slew rate calibrate */ +bool force_vbus; }; static void hs_slew_rate_calibrate(struct mtk_tphy *tphy,@@ -611,13 +613,20 @@ static void u2_phy_instance_set_mode(struct mtk_tphy *tphy,switch (mode) {case PHY_MODE_USB_DEVICE : tmp |=P2C_FORCE_IDDIG |P2C_RG_IDDIG ; +if (tphy->force_vbus) + tmp |=P2C_RG_VBUSVALID |P2C_FORCE_VBUSVALID ;break ;case PHY_MODE_USB_HOST : tmp |=P2C_FORCE_IDDIG ; - tmp &= ~P2C_RG_IDDIG ; +if (tphy->force_vbus) + tmp &= ~(P2C_RG_VBUSVALID |P2C_FORCE_VBUSVALID ); +else + tmp &= ~P2C_RG_IDDIG ;break ;case PHY_MODE_USB_OTG : tmp &= ~(P2C_FORCE_IDDIG |P2C_RG_IDDIG ); +if (tphy->force_vbus) + tmp &= ~(P2C_RG_VBUSVALID |P2C_FORCE_VBUSVALID );break ;default :return ;@@ -1187,6 +1196,11 @@ static int mtk_tphy_probe(struct platform_device *pdev) retval =PTR_ERR (instance->da_ref_clk); goto put_child; } + +/* +* On some platform, vbus is dis-connected between PHY and MAC. +*/ + tphy->force_vbus =device_property_read_bool (dev,"force_vbus" ); } provider =devm_of_phy_provider_register (dev, mtk_phy_xlate);
Rob Herring
maintainerQuoted 15 lines · Macpaul Lin
For some platforms, they don't have vbus pin connection between usb's phy and mac. Hence we need to control
force_vbusrelated registers to keep hardware works normal.
This patch add the required bool propertyforce_vbus.Signed-off-by Macpaul Lin <[email protected]>--- Documentation/devicetree/bindings/phy/phy-mtk-tphy.txt | 3 +++ 1 file changed, 3 insertions(+)Documentation/devicetree/bindings/phy/phy-mtk-tphy.txt +0
-0
Documentation/devicetree/bindings/phy/phy-mtk-tphy.txt Optional properties (controller (parent) node): · line 40
Quoted 4 lines
Documentation/devicetree/bindings/phy/phy-mtk-tphy.txt +1
-0@@ -37,6 +37,9 @@ Optional properties (controller (parent) node): calibrate - mediatek,src-coef : coefficient for slew rate calibrate, depends on SoC process + - force_vbus : if the platform has no vbus connection between phy and mac,
mediatek,force-vbus
This is board specific? If SoC specific, you should drop and imply this from the compatible string.
Quoted 7 lines
Documentation/devicetree/bindings/phy/phy-mtk-tphy.txt +2
-0+ (force_vbus mode), then this property should be exist. + Otherwise not to add this property. Required properties (port (child) node): - reg : address and length of the register set for the port.Signature · 1 line
2.18.0