@@ -354,7 +354,8 @@ static int mtk_pcie_set_trans_table(struct mtk_gen3_pcie *pcie,
354
354
355
355
dev_dbg (pcie -> dev , "set %s trans window[%d]: cpu_addr = %#llx, pci_addr = %#llx, size = %#llx\n" ,
356
356
range_type , * num , (unsigned long long )cpu_addr ,
357
- (unsigned long long )pci_addr , (unsigned long long )table_size );
357
+ (unsigned long long )pci_addr ,
358
+ (unsigned long long )table_size );
358
359
359
360
cpu_addr += table_size ;
360
361
pci_addr += table_size ;
@@ -889,7 +890,8 @@ static int mtk_pcie_parse_port(struct mtk_gen3_pcie *pcie)
889
890
for (i = 0 ; i < num_resets ; i ++ )
890
891
pcie -> phy_resets [i ].id = pcie -> soc -> phy_resets .id [i ];
891
892
892
- ret = devm_reset_control_bulk_get_optional_shared (dev , num_resets , pcie -> phy_resets );
893
+ ret = devm_reset_control_bulk_get_optional_shared (dev , num_resets ,
894
+ pcie -> phy_resets );
893
895
if (ret ) {
894
896
dev_err (dev , "failed to get PHY bulk reset\n" );
895
897
return ret ;
@@ -919,13 +921,14 @@ static int mtk_pcie_parse_port(struct mtk_gen3_pcie *pcie)
919
921
return pcie -> num_clks ;
920
922
}
921
923
922
- ret = of_property_read_u32 (dev -> of_node , "num-lanes" , & num_lanes );
923
- if (ret == 0 ) {
924
- if (num_lanes == 0 || num_lanes > 16 || (num_lanes != 1 && num_lanes % 2 ))
924
+ ret = of_property_read_u32 (dev -> of_node , "num-lanes" , & num_lanes );
925
+ if (ret == 0 ) {
926
+ if (num_lanes == 0 || num_lanes > 16 ||
927
+ (num_lanes != 1 && num_lanes % 2 ))
925
928
dev_warn (dev , "invalid num-lanes, using controller defaults\n" );
926
- else
929
+ else
927
930
pcie -> num_lanes = num_lanes ;
928
- }
931
+ }
929
932
930
933
return 0 ;
931
934
}
@@ -986,7 +989,8 @@ static int mtk_pcie_en7581_power_up(struct mtk_gen3_pcie *pcie)
986
989
goto err_phy_on ;
987
990
}
988
991
989
- err = reset_control_bulk_deassert (pcie -> soc -> phy_resets .num_resets , pcie -> phy_resets );
992
+ err = reset_control_bulk_deassert (pcie -> soc -> phy_resets .num_resets ,
993
+ pcie -> phy_resets );
990
994
if (err ) {
991
995
dev_err (dev , "failed to deassert PHYs\n" );
992
996
goto err_phy_deassert ;
@@ -1031,7 +1035,8 @@ static int mtk_pcie_en7581_power_up(struct mtk_gen3_pcie *pcie)
1031
1035
err_clk_prepare_enable :
1032
1036
pm_runtime_put_sync (dev );
1033
1037
pm_runtime_disable (dev );
1034
- reset_control_bulk_assert (pcie -> soc -> phy_resets .num_resets , pcie -> phy_resets );
1038
+ reset_control_bulk_assert (pcie -> soc -> phy_resets .num_resets ,
1039
+ pcie -> phy_resets );
1035
1040
err_phy_deassert :
1036
1041
phy_power_off (pcie -> phy );
1037
1042
err_phy_on :
@@ -1055,7 +1060,8 @@ static int mtk_pcie_power_up(struct mtk_gen3_pcie *pcie)
1055
1060
usleep_range (PCIE_MTK_RESET_TIME_US , 2 * PCIE_MTK_RESET_TIME_US );
1056
1061
1057
1062
/* PHY power on and enable pipe clock */
1058
- err = reset_control_bulk_deassert (pcie -> soc -> phy_resets .num_resets , pcie -> phy_resets );
1063
+ err = reset_control_bulk_deassert (pcie -> soc -> phy_resets .num_resets ,
1064
+ pcie -> phy_resets );
1059
1065
if (err ) {
1060
1066
dev_err (dev , "failed to deassert PHYs\n" );
1061
1067
return err ;
@@ -1095,7 +1101,8 @@ static int mtk_pcie_power_up(struct mtk_gen3_pcie *pcie)
1095
1101
err_phy_on :
1096
1102
phy_exit (pcie -> phy );
1097
1103
err_phy_init :
1098
- reset_control_bulk_assert (pcie -> soc -> phy_resets .num_resets , pcie -> phy_resets );
1104
+ reset_control_bulk_assert (pcie -> soc -> phy_resets .num_resets ,
1105
+ pcie -> phy_resets );
1099
1106
1100
1107
return err ;
1101
1108
}
@@ -1110,7 +1117,8 @@ static void mtk_pcie_power_down(struct mtk_gen3_pcie *pcie)
1110
1117
1111
1118
phy_power_off (pcie -> phy );
1112
1119
phy_exit (pcie -> phy );
1113
- reset_control_bulk_assert (pcie -> soc -> phy_resets .num_resets , pcie -> phy_resets );
1120
+ reset_control_bulk_assert (pcie -> soc -> phy_resets .num_resets ,
1121
+ pcie -> phy_resets );
1114
1122
}
1115
1123
1116
1124
static int mtk_pcie_get_controller_max_link_speed (struct mtk_gen3_pcie * pcie )
@@ -1137,7 +1145,8 @@ static int mtk_pcie_setup(struct mtk_gen3_pcie *pcie)
1137
1145
* Deassert the line in order to avoid unbalance in deassert_count
1138
1146
* counter since the bulk is shared.
1139
1147
*/
1140
- reset_control_bulk_deassert (pcie -> soc -> phy_resets .num_resets , pcie -> phy_resets );
1148
+ reset_control_bulk_deassert (pcie -> soc -> phy_resets .num_resets ,
1149
+ pcie -> phy_resets );
1141
1150
1142
1151
/* Don't touch the hardware registers before power up */
1143
1152
err = pcie -> soc -> power_up (pcie );
0 commit comments