tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'mfd-fixes-4.7.1' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd
Pull more MFD fixes from Lee Jones:
"Apologies for missing these from the first pull request.
Final patches fixing Reset API change"
* tag 'mfd-fixes-4.7.1' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd:
usb: dwc3: st: Use explicit reset_control_get_exclusive() API
phy: phy-stih407-usb: Use explicit reset_control_get_exclusive() API
phy: miphy28lp: Inform the reset framework that our reset line may be shared
+5
-3
+2
-1
drivers/phy/phy-miphy28lp.c
+2
-1
drivers/phy/phy-miphy28lp.c
···
1143
1143
struct miphy28lp_dev *miphy_dev = miphy_phy->phydev;
1144
1144
int err;
1145
1145
1146
-
miphy_phy->miphy_rst = of_reset_control_get(node, "miphy-sw-rst");
1146
+
miphy_phy->miphy_rst =
1147
+
of_reset_control_get_shared(node, "miphy-sw-rst");
1147
1148
1148
1149
if (IS_ERR(miphy_phy->miphy_rst)) {
1149
1150
dev_err(miphy_dev->dev,
+1
-1
drivers/phy/phy-stih407-usb.c
+1
-1
drivers/phy/phy-stih407-usb.c
···
111
111
return PTR_ERR(phy_dev->rstc);
112
112
}
113
113
114
-
phy_dev->rstport = devm_reset_control_get(dev, "port");
114
+
phy_dev->rstport = devm_reset_control_get_exclusive(dev, "port");
115
115
if (IS_ERR(phy_dev->rstport)) {
116
116
dev_err(dev, "failed to ctrl picoPHY reset\n");
117
117
return PTR_ERR(phy_dev->rstport);
+2
-1
drivers/usb/dwc3/dwc3-st.c
+2
-1
drivers/usb/dwc3/dwc3-st.c
···
233
233
dev_vdbg(&pdev->dev, "glue-logic addr 0x%p, syscfg-reg offset 0x%x\n",
234
234
dwc3_data->glue_base, dwc3_data->syscfg_reg_off);
235
235
236
-
dwc3_data->rstc_pwrdn = devm_reset_control_get(dev, "powerdown");
236
+
dwc3_data->rstc_pwrdn =
237
+
devm_reset_control_get_exclusive(dev, "powerdown");
237
238
if (IS_ERR(dwc3_data->rstc_pwrdn)) {
238
239
dev_err(&pdev->dev, "could not get power controller\n");
239
240
ret = PTR_ERR(dwc3_data->rstc_pwrdn);