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

Commit 3aca446a authored by Roger Quadros's avatar Roger Quadros Committed by Lee Jones
Browse files

mfd: omap-usb-host: Get clocks based on hardware revision 



Not all revisions have all the clocks so get the necessary clocks
based on hardware revision.

This should avoid un-necessary clk_get failure messages that were
observed earlier.

Also remove the dummy USB host clocks from the OMAP3 clock data.
These are no longer expected by the driver.

Acked-by: Mike Turquette <mturquette@linaro.org> [OMAP3 CLK data]
Acked-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarRoger Quadros <rogerq@ti.com>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent 61b7025f

arch/arm/mach-omap2/cclock3xxx_data.c

+0 −4
Original line number Diff line number Diff line
@@ -3495,10 +3495,6 @@ static struct omap_clk omap3xxx_clks[] = { 
	CLK(NULL,	"dss_tv_fck",	&dss_tv_fck),

	CLK(NULL,	"dss_96m_fck",	&dss_96m_fck),

	CLK(NULL,	"dss2_alwon_fck",	&dss2_alwon_fck),

	CLK(NULL,	"utmi_p1_gfclk",	&dummy_ck),

	CLK(NULL,	"utmi_p2_gfclk",	&dummy_ck),

	CLK(NULL,	"xclk60mhsp1_ck",	&dummy_ck),

	CLK(NULL,	"xclk60mhsp2_ck",	&dummy_ck),

	CLK(NULL,	"init_60m_fclk",	&dummy_ck),

	CLK(NULL,	"gpt1_fck",	&gpt1_fck),

	CLK(NULL,	"aes2_ick",	&aes2_ick),

drivers/clk/ti/clk-3xxx.c

+0 −4
Original line number Diff line number Diff line
@@ -130,10 +130,6 @@ static struct ti_dt_clk omap3xxx_clks[] = { 
	DT_CLK(NULL, "dss_tv_fck", "dss_tv_fck"),

	DT_CLK(NULL, "dss_96m_fck", "dss_96m_fck"),

	DT_CLK(NULL, "dss2_alwon_fck", "dss2_alwon_fck"),

	DT_CLK(NULL, "utmi_p1_gfclk", "dummy_ck"),

	DT_CLK(NULL, "utmi_p2_gfclk", "dummy_ck"),

	DT_CLK(NULL, "xclk60mhsp1_ck", "dummy_ck"),

	DT_CLK(NULL, "xclk60mhsp2_ck", "dummy_ck"),

	DT_CLK(NULL, "init_60m_fclk", "dummy_ck"),

	DT_CLK(NULL, "gpt1_fck", "gpt1_fck"),

	DT_CLK(NULL, "aes2_ick", "aes2_ick"),

drivers/mfd/omap-usb-host.c

+32 −11
Original line number Diff line number Diff line
@@ -665,22 +665,43 @@ static int usbhs_omap_probe(struct platform_device *pdev) 
		goto err_mem;

	}



	/* Set all clocks as invalid to begin with */

	omap->ehci_logic_fck = ERR_PTR(-ENODEV);

	omap->init_60m_fclk = ERR_PTR(-ENODEV);

	omap->utmi_p1_gfclk = ERR_PTR(-ENODEV);

	omap->utmi_p2_gfclk = ERR_PTR(-ENODEV);

	omap->xclk60mhsp1_ck = ERR_PTR(-ENODEV);

	omap->xclk60mhsp2_ck = ERR_PTR(-ENODEV);



	for (i = 0; i < omap->nports; i++) {

		omap->utmi_clk[i] = ERR_PTR(-ENODEV);

		omap->hsic480m_clk[i] = ERR_PTR(-ENODEV);

		omap->hsic60m_clk[i] = ERR_PTR(-ENODEV);

	}



	/* for OMAP3 i.e. USBHS REV1 */

	if (omap->usbhs_rev == OMAP_USBHS_REV1) {

		need_logic_fck = false;

		for (i = 0; i < omap->nports; i++) {

		if (is_ehci_phy_mode(i) || is_ehci_tll_mode(i) ||

			is_ehci_hsic_mode(i))

			if (is_ehci_phy_mode(pdata->port_mode[i]) ||

			    is_ehci_tll_mode(pdata->port_mode[i]) ||

			    is_ehci_hsic_mode(pdata->port_mode[i]))



				need_logic_fck |= true;

		}



	omap->ehci_logic_fck = ERR_PTR(-EINVAL);

		if (need_logic_fck) {

		omap->ehci_logic_fck = devm_clk_get(dev, "ehci_logic_fck");

			omap->ehci_logic_fck = devm_clk_get(dev,

							    "ehci_logic_fck");

			if (IS_ERR(omap->ehci_logic_fck)) {

				ret = PTR_ERR(omap->ehci_logic_fck);

				dev_dbg(dev, "ehci_logic_fck failed:%d\n", ret);

			}

		}

		goto initialize;

	}



	/* for OMAP4+ i.e. USBHS REV2+ */

	omap->utmi_p1_gfclk = devm_clk_get(dev, "utmi_p1_gfclk");

	if (IS_ERR(omap->utmi_p1_gfclk)) {

		ret = PTR_ERR(omap->utmi_p1_gfclk);
@@ -748,7 +769,6 @@ static int usbhs_omap_probe(struct platform_device *pdev) 
	}



	if (is_ehci_phy_mode(pdata->port_mode[0])) {

		/* for OMAP3, clk_set_parent fails */

		ret = clk_set_parent(omap->utmi_p1_gfclk,

					omap->xclk60mhsp1_ck);

		if (ret != 0)
@@ -776,6 +796,7 @@ static int usbhs_omap_probe(struct platform_device *pdev) 
					ret);

	}



initialize:

	omap_usbhs_init(dev);



	if (dev->of_node) {