| Message ID | 1427787309-1601-4-git-send-email-peter.griffin@linaro.org |
|---|---|
| State | New |
| Headers | show |
Hi Tejun, On Tue, 31 Mar 2015, Tejun Heo wrote: > On Tue, Mar 31, 2015 at 08:35:09AM +0100, Peter Griffin wrote: > > Currently the ahci_st driver will hang the system on probe, as the > > st_configure_oob function does some register writes before the IP > > is clocked. This patch moves the function call to after > > ahci_platform_enable_resources (which enables the IP clock), and > > resolves the hang. > > > > Addtionally st_ahci_configure_oob should be called in the st_ahci_resume > > function, so we also rectify that ensuring it is also called after > > the IP clock has been enabled. > > > > Signed-off-by: Peter Griffin <peter.griffin@linaro.org> > > Acked-by: Lee Jones <lee.jones@linaro.org> > > Acked-by: Maxime Coquelin <maxime.coquelin@st.com> > > How should this patch be routed? Should I pick this up and apply to > libata/for-4.1 or should it go together with the other patches? If > the latter, please feel free to add my acked-by. This patch (and also the DT documentation change) can go via your tree. Maxime will take the stih407 DT patch. regards, Peter. -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Tejun, On Tue, 31 Mar 2015, Tejun Heo wrote: > On Tue, Mar 31, 2015 at 04:36:27PM +0100, Peter Griffin wrote: > > This patch (and also the DT documentation change) can go via your tree. Maxime > > will take the stih407 DT patch. > > Hmmm... The first patch doesn't apply to libata/for-4.1? I was just investigating this, and you don't have the patch I sent on 25th February entitled "ahci: st: Update the DT example for how to obtain the PHY." I also did a re-send yesterday with ack's collected here https://lkml.org/lkml/2015/3/30/404. However both times it seems I didn't add you to the email :-( which certainly explains why you don't have it. If I re-send that patch with you on CC can you take and apply it as well? That would preserve the ack's. regards, Peter. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
diff --git a/drivers/ata/ahci_st.c b/drivers/ata/ahci_st.c index bc971af..ea0ff00 100644 --- a/drivers/ata/ahci_st.c +++ b/drivers/ata/ahci_st.c @@ -68,8 +68,6 @@ static int st_ahci_deassert_resets(struct device *dev) } } - st_ahci_configure_oob(drv_data->hpriv->mmio); - if (drv_data->sw_rst) { err = reset_control_deassert(drv_data->sw_rst); if (err) { @@ -172,6 +170,8 @@ static int st_ahci_probe(struct platform_device *pdev) if (err) return err; + st_ahci_configure_oob(drv_data->hpriv->mmio); + err = ahci_platform_init_host(pdev, hpriv, &st_ahci_port_info, &ahci_platform_sht); if (err) { @@ -222,6 +222,8 @@ static int st_ahci_resume(struct device *dev) return err; } + st_ahci_configure_oob(drv_data->hpriv->mmio); + return ahci_platform_resume_host(dev); } #endif