From: lyz Date: Tue, 23 Dec 2014 09:54:35 +0000 (+0800) Subject: usb: rk312x: fix wrong clk name X-Git-Tag: firefly_0821_release~4317 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=93c355776d9b0031d5e4ab00d709b15fae2e8185;p=firefly-linux-kernel-4.4.55.git usb: rk312x: fix wrong clk name Signed-off-by: lyz --- diff --git a/arch/arm/boot/dts/rk312x.dtsi b/arch/arm/boot/dts/rk312x.dtsi index 607235eb277d..592fb3cf4cff 100755 --- a/arch/arm/boot/dts/rk312x.dtsi +++ b/arch/arm/boot/dts/rk312x.dtsi @@ -711,8 +711,8 @@ compatible = "rockchip,rk3126_ehci"; reg = <0x101c0000 0x20000>; interrupts = ; - clocks = <&clk_gates1 6>, <&clk_gates7 3>, <&clk_gates10 14>; - clock-names = "clk_usbphy1", "hclk_hoct0_3126","hclk_host0_3126b"; + clocks = <&clk_gates1 6>, <&clk_gates7 3>; + clock-names = "clk_usbphy1", "hclk_host0"; resets = <&reset RK3128_RST_USBOTG1>, <&reset RK3128_RST_UTMI1>, <&reset RK3128_RST_OTGC1>; reset-names = "host_ahb", "host_phy", "host_controller"; diff --git a/drivers/usb/dwc_otg_310/usbdev_rk3126.c b/drivers/usb/dwc_otg_310/usbdev_rk3126.c index 54cf6afb8cf9..eff95d8a83af 100755 --- a/drivers/usb/dwc_otg_310/usbdev_rk3126.c +++ b/drivers/usb/dwc_otg_310/usbdev_rk3126.c @@ -449,10 +449,7 @@ static void usb20ehci_clock_init(void *pdata) struct rkehci_platform_data *usbpdata = pdata; struct clk *ahbclk, *phyclk; - if (soc_is_rk3126b()) - ahbclk = devm_clk_get(usbpdata->dev, "hclk_hoct0_3126b"); - else - ahbclk = devm_clk_get(usbpdata->dev, "hclk_hoct0_3126"); + ahbclk = devm_clk_get(usbpdata->dev, "hclk_host0"); if (IS_ERR(ahbclk)) { dev_err(usbpdata->dev, "Failed to get hclk_usb1\n"); return;