From 969526426953dcbb1a1f0d0098f3b33cbae615b5 Mon Sep 17 00:00:00 2001 From: Yue Wang Date: Tue, 26 Dec 2017 18:27:52 +0800 Subject: [PATCH] usb: fix usb PLL set. PD#157680: usb: fix usb PLL set. meson-txlx: fix usb PLL set. Change-Id: I3580e6d24a4bd9d22d4173fc370d5263339486f1 Signed-off-by: Yue Wang --- arch/arm64/boot/dts/amlogic/txlx_t962e_r321.dts | 2 +- arch/arm64/boot/dts/amlogic/txlx_t962x_r311.dts | 2 +- drivers/amlogic/usb/phy/usbphy.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/txlx_t962e_r321.dts b/arch/arm64/boot/dts/amlogic/txlx_t962e_r321.dts index 17d09b4e0f2c..18ec1bbef93e 100644 --- a/arch/arm64/boot/dts/amlogic/txlx_t962e_r321.dts +++ b/arch/arm64/boot/dts/amlogic/txlx_t962e_r321.dts @@ -964,7 +964,7 @@ clocks = <&clkc CLKID_USB_GENERAL &clkc CLKID_USB1_TO_DDR>; clock-names = "usb_general", - "usb1_to_ddr"; + "usb1"; }; /* Sound iomap */ diff --git a/arch/arm64/boot/dts/amlogic/txlx_t962x_r311.dts b/arch/arm64/boot/dts/amlogic/txlx_t962x_r311.dts index c5dfa28ace18..6d0802177cd1 100644 --- a/arch/arm64/boot/dts/amlogic/txlx_t962x_r311.dts +++ b/arch/arm64/boot/dts/amlogic/txlx_t962x_r311.dts @@ -964,7 +964,7 @@ clocks = <&clkc CLKID_USB_GENERAL &clkc CLKID_USB1_TO_DDR>; clock-names = "usb_general", - "usb1_to_ddr"; + "usb1"; }; /* Sound iomap */ diff --git a/drivers/amlogic/usb/phy/usbphy.c b/drivers/amlogic/usb/phy/usbphy.c index 1e31c5a47379..6f14c06b9e6f 100644 --- a/drivers/amlogic/usb/phy/usbphy.c +++ b/drivers/amlogic/usb/phy/usbphy.c @@ -396,7 +396,7 @@ int clk_enable_usb_gxl(struct platform_device *pdev, usb_reset = devm_clk_get(&pdev->dev, "usb_general"); clk_prepare_enable(usb_reset); p_clk_reset[pdev->id].usb_reset_usb_general = usb_reset; - usb_reset = devm_clk_get(&pdev->dev, "usb1_to_ddr"); + usb_reset = devm_clk_get(&pdev->dev, "usb1"); clk_prepare_enable(usb_reset); p_clk_reset[pdev->id].usb_reset_usb_to_ddr = usb_reset; set_device_mode(pdev, usb_peri_reg, controller_type);