@@ -256,13 +256,10 @@ struct ropll_config {
256
256
};
257
257
258
258
enum rk_hdptx_reset {
259
- RST_PHY = 0 ,
260
- RST_APB ,
259
+ RST_APB = 0 ,
261
260
RST_INIT ,
262
261
RST_CMN ,
263
262
RST_LANE ,
264
- RST_ROPLL ,
265
- RST_LCPLL ,
266
263
RST_MAX
267
264
};
268
265
@@ -665,11 +662,6 @@ static void rk_hdptx_phy_disable(struct rk_hdptx_phy *hdptx)
665
662
{
666
663
u32 val ;
667
664
668
- /* reset phy and apb, or phy locked flag may keep 1 */
669
- reset_control_assert (hdptx -> rsts [RST_PHY ].rstc );
670
- usleep_range (20 , 30 );
671
- reset_control_deassert (hdptx -> rsts [RST_PHY ].rstc );
672
-
673
665
reset_control_assert (hdptx -> rsts [RST_APB ].rstc );
674
666
usleep_range (20 , 30 );
675
667
reset_control_deassert (hdptx -> rsts [RST_APB ].rstc );
@@ -792,10 +784,6 @@ static int rk_hdptx_ropll_tmds_cmn_config(struct rk_hdptx_phy *hdptx,
792
784
793
785
rk_hdptx_pre_power_up (hdptx );
794
786
795
- reset_control_assert (hdptx -> rsts [RST_ROPLL ].rstc );
796
- usleep_range (20 , 30 );
797
- reset_control_deassert (hdptx -> rsts [RST_ROPLL ].rstc );
798
-
799
787
rk_hdptx_multi_reg_write (hdptx , rk_hdtpx_common_cmn_init_seq );
800
788
rk_hdptx_multi_reg_write (hdptx , rk_hdtpx_tmds_cmn_init_seq );
801
789
@@ -1098,13 +1086,10 @@ static int rk_hdptx_phy_probe(struct platform_device *pdev)
1098
1086
return dev_err_probe (dev , PTR_ERR (hdptx -> regmap ),
1099
1087
"Failed to init regmap\n" );
1100
1088
1101
- hdptx -> rsts [RST_PHY ].id = "phy" ;
1102
1089
hdptx -> rsts [RST_APB ].id = "apb" ;
1103
1090
hdptx -> rsts [RST_INIT ].id = "init" ;
1104
1091
hdptx -> rsts [RST_CMN ].id = "cmn" ;
1105
1092
hdptx -> rsts [RST_LANE ].id = "lane" ;
1106
- hdptx -> rsts [RST_ROPLL ].id = "ropll" ;
1107
- hdptx -> rsts [RST_LCPLL ].id = "lcpll" ;
1108
1093
1109
1094
ret = devm_reset_control_bulk_get_exclusive (dev , RST_MAX , hdptx -> rsts );
1110
1095
if (ret )
0 commit comments