usb: rk312x: fix wrong clk name

Signed-off-by: lyz <lyz@rock-chips.com>

diff --git a/arch/arm/boot/dts/rk312x.dtsi b/arch/arm/boot/dts/rk312x.dtsi
index 607235eb277da1b614f58c25fe3dd68f8ca3af6c..592fb3cf4cff395bb1ec12dcf06a018736a8d61f 100755 (executable)
--- 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 = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;
-               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 54cf6afb8cf98b8152e0934b5325d8c19348751f..eff95d8a83af7c994e538ef52cd56fde45759554 100755 (executable)
--- 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;