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

Commit 051fc06d authored by Roger Quadros's avatar Roger Quadros Committed by Lee Jones
Browse files

mfd: omap-usb-host: Use clock names as per function for reference clocks 



Use a meaningful name for the reference clocks so that it indicates the
function.

Update the OMAP4+ USB Host node as well to be in sync with the changes.

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 775bb078

arch/arm/boot/dts/omap4.dtsi

+6 −0
Original line number Diff line number Diff line
@@ -697,6 +697,12 @@ 
			#address-cells = <1>;

			#size-cells = <1>;

			ranges;

			clocks = <&init_60m_fclk>,

				 <&xclk60mhsp1_ck>,

				 <&xclk60mhsp2_ck>;

			clock-names = "refclk_60m_int",

				      "refclk_60m_ext_p1",

				      "refclk_60m_ext_p2";



			usbhsohci: ohci@4a064800 {

				compatible = "ti,ohci-omap3", "usb-ohci";

arch/arm/boot/dts/omap5.dtsi

+6 −0
Original line number Diff line number Diff line
@@ -775,6 +775,12 @@ 
			#address-cells = <1>;

			#size-cells = <1>;

			ranges;

			clocks = <&l3init_60m_fclk>,

				 <&xclk60mhsp1_ck>,

				 <&xclk60mhsp2_ck>;

			clock-names = "refclk_60m_int",

				      "refclk_60m_ext_p1",

				      "refclk_60m_ext_p2";



			usbhsohci: ohci@4a064800 {

				compatible = "ti,ohci-omap3", "usb-ohci";

drivers/mfd/omap-usb-host.c

+6 −6
Original line number Diff line number Diff line
@@ -718,24 +718,24 @@ static int usbhs_omap_probe(struct platform_device *pdev) 
		goto err_mem;

	}



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

	omap->xclk60mhsp1_ck = devm_clk_get(dev, "refclk_60m_ext_p1");

	if (IS_ERR(omap->xclk60mhsp1_ck)) {

		ret = PTR_ERR(omap->xclk60mhsp1_ck);

		dev_err(dev, "xclk60mhsp1_ck failed error:%d\n", ret);

		dev_err(dev, "refclk_60m_ext_p1 failed error:%d\n", ret);

		goto err_mem;

	}



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

	omap->xclk60mhsp2_ck = devm_clk_get(dev, "refclk_60m_ext_p2");

	if (IS_ERR(omap->xclk60mhsp2_ck)) {

		ret = PTR_ERR(omap->xclk60mhsp2_ck);

		dev_err(dev, "xclk60mhsp2_ck failed error:%d\n", ret);

		dev_err(dev, "refclk_60m_ext_p2 failed error:%d\n", ret);

		goto err_mem;

	}



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

	omap->init_60m_fclk = devm_clk_get(dev, "refclk_60m_int");

	if (IS_ERR(omap->init_60m_fclk)) {

		ret = PTR_ERR(omap->init_60m_fclk);

		dev_err(dev, "init_60m_fclk failed error:%d\n", ret);

		dev_err(dev, "refclk_60m_int failed error:%d\n", ret);

		goto err_mem;

	}