Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 82dbe1a6 authored by Bartosz Golaszewski's avatar Bartosz Golaszewski Committed by Sekhar Nori
Browse files

sata: ahci-da850: get the sata clock using a connection id 



In preparation for using two clocks in the driver (the sysclk2-based
clock and the external REFCLK), check if we got the functional clock
after calling ahci_platform_get_resources(). If not, retry calling
clk_get() with con_id specified.

Signed-off-by: default avatarBartosz Golaszewski <bgolaszewski@baylibre.com>
Acked-by: default avatarTejun Heo <tj@kernel.org>
Signed-off-by: default avatarSekhar Nori <nsekhar@ti.com>
parent 7ce7d89f

drivers/ata/ahci_da850.c

+16 −0
Original line number Original line Diff line number Diff line
@@ -71,12 +71,28 @@ static int ahci_da850_probe(struct platform_device *pdev) 
	struct ahci_host_priv *hpriv;

	struct ahci_host_priv *hpriv;

	struct resource *res;

	struct resource *res;

	void __iomem *pwrdn_reg;

	void __iomem *pwrdn_reg;

	struct clk *clk;

	int rc;

	int rc;





	hpriv = ahci_platform_get_resources(pdev);

	hpriv = ahci_platform_get_resources(pdev);

	if (IS_ERR(hpriv))

	if (IS_ERR(hpriv))

		return PTR_ERR(hpriv);

		return PTR_ERR(hpriv);





	/*

	 * Internally ahci_platform_get_resources() calls clk_get(dev, NULL)

	 * when trying to obtain the functional clock. This SATA controller

	 * uses two clocks for which we specify two connection ids. If we don't

	 * have the functional clock at this point - call clk_get() again with

	 * con_id = "fck".

	 */

	if (!hpriv->clks[0]) {

		clk = clk_get(dev, "fck");

		if (IS_ERR(clk))

			return PTR_ERR(clk);



		hpriv->clks[0] = clk;

	}



	rc = ahci_platform_enable_resources(hpriv);

	rc = ahci_platform_enable_resources(hpriv);

	if (rc)

	if (rc)

		return rc;

		return rc;