File tree Expand file tree Collapse file tree 2 files changed +9
-4
lines changed Expand file tree Collapse file tree 2 files changed +9
-4
lines changed Original file line number Diff line number Diff line change @@ -1084,6 +1084,10 @@ static int ci_hdrc_probe(struct platform_device *pdev)
1084
1084
return - ENODEV ;
1085
1085
}
1086
1086
1087
+ ret = ci_ulpi_init (ci );
1088
+ if (ret )
1089
+ return ret ;
1090
+
1087
1091
if (ci -> platdata -> phy ) {
1088
1092
ci -> phy = ci -> platdata -> phy ;
1089
1093
} else if (ci -> platdata -> usb_phy ) {
@@ -1138,10 +1142,6 @@ static int ci_hdrc_probe(struct platform_device *pdev)
1138
1142
goto ulpi_exit ;
1139
1143
}
1140
1144
1141
- ret = ci_ulpi_init (ci );
1142
- if (ret )
1143
- return ret ;
1144
-
1145
1145
ci -> hw_bank .phys = res -> start ;
1146
1146
1147
1147
ci -> irq = platform_get_irq (pdev , 0 );
Original file line number Diff line number Diff line change @@ -68,6 +68,11 @@ int ci_ulpi_init(struct ci_hdrc *ci)
68
68
if (ci -> platdata -> phy_mode != USBPHY_INTERFACE_MODE_ULPI )
69
69
return 0 ;
70
70
71
+ /*
72
+ * Set PORTSC correctly so we can read/write ULPI registers for
73
+ * identification purposes
74
+ */
75
+ hw_phymode_configure (ci );
71
76
72
77
ci -> ulpi_ops .read = ci_ulpi_read ;
73
78
ci -> ulpi_ops .write = ci_ulpi_write ;
You can’t perform that action at this time.
0 commit comments