Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Tony Lindgren <tony@atomide.com>
Signed-off-by: Roger Quadros <rogerq@ti.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>

authored by

Roger Quadros and committed by
Lee Jones
051fc06d 775bb078

+18 -6
+6
arch/arm/boot/dts/omap4.dtsi
··· 697 697 #address-cells = <1>; 698 698 #size-cells = <1>; 699 699 ranges; 700 + clocks = <&init_60m_fclk>, 701 + <&xclk60mhsp1_ck>, 702 + <&xclk60mhsp2_ck>; 703 + clock-names = "refclk_60m_int", 704 + "refclk_60m_ext_p1", 705 + "refclk_60m_ext_p2"; 700 706 701 707 usbhsohci: ohci@4a064800 { 702 708 compatible = "ti,ohci-omap3", "usb-ohci";
+6
arch/arm/boot/dts/omap5.dtsi
··· 775 775 #address-cells = <1>; 776 776 #size-cells = <1>; 777 777 ranges; 778 + clocks = <&l3init_60m_fclk>, 779 + <&xclk60mhsp1_ck>, 780 + <&xclk60mhsp2_ck>; 781 + clock-names = "refclk_60m_int", 782 + "refclk_60m_ext_p1", 783 + "refclk_60m_ext_p2"; 778 784 779 785 usbhsohci: ohci@4a064800 { 780 786 compatible = "ti,ohci-omap3", "usb-ohci";
+6 -6
drivers/mfd/omap-usb-host.c
··· 718 718 goto err_mem; 719 719 } 720 720 721 - omap->xclk60mhsp1_ck = devm_clk_get(dev, "xclk60mhsp1_ck"); 721 + omap->xclk60mhsp1_ck = devm_clk_get(dev, "refclk_60m_ext_p1"); 722 722 if (IS_ERR(omap->xclk60mhsp1_ck)) { 723 723 ret = PTR_ERR(omap->xclk60mhsp1_ck); 724 - dev_err(dev, "xclk60mhsp1_ck failed error:%d\n", ret); 724 + dev_err(dev, "refclk_60m_ext_p1 failed error:%d\n", ret); 725 725 goto err_mem; 726 726 } 727 727 728 - omap->xclk60mhsp2_ck = devm_clk_get(dev, "xclk60mhsp2_ck"); 728 + omap->xclk60mhsp2_ck = devm_clk_get(dev, "refclk_60m_ext_p2"); 729 729 if (IS_ERR(omap->xclk60mhsp2_ck)) { 730 730 ret = PTR_ERR(omap->xclk60mhsp2_ck); 731 - dev_err(dev, "xclk60mhsp2_ck failed error:%d\n", ret); 731 + dev_err(dev, "refclk_60m_ext_p2 failed error:%d\n", ret); 732 732 goto err_mem; 733 733 } 734 734 735 - omap->init_60m_fclk = devm_clk_get(dev, "init_60m_fclk"); 735 + omap->init_60m_fclk = devm_clk_get(dev, "refclk_60m_int"); 736 736 if (IS_ERR(omap->init_60m_fclk)) { 737 737 ret = PTR_ERR(omap->init_60m_fclk); 738 - dev_err(dev, "init_60m_fclk failed error:%d\n", ret); 738 + dev_err(dev, "refclk_60m_int failed error:%d\n", ret); 739 739 goto err_mem; 740 740 } 741 741