diff options
-rw-r--r-- | arch/arm/mach-davinci/usb-da8xx.c | 12 | ||||
-rw-r--r-- | drivers/phy/ti/phy-da8xx-usb.c | 8 |
2 files changed, 10 insertions, 10 deletions
diff --git a/arch/arm/mach-davinci/usb-da8xx.c b/arch/arm/mach-davinci/usb-da8xx.c index d480a02e1298..fb31f6eeba96 100644 --- a/arch/arm/mach-davinci/usb-da8xx.c +++ b/arch/arm/mach-davinci/usb-da8xx.c | |||
@@ -256,14 +256,14 @@ static int usb20_phy_clk_set_parent(struct clk *clk, struct clk *parent) | |||
256 | } | 256 | } |
257 | 257 | ||
258 | static struct clk usb20_phy_clk = { | 258 | static struct clk usb20_phy_clk = { |
259 | .name = "usb20_phy", | 259 | .name = "usb0_clk48", |
260 | .clk_enable = usb20_phy_clk_enable, | 260 | .clk_enable = usb20_phy_clk_enable, |
261 | .clk_disable = usb20_phy_clk_disable, | 261 | .clk_disable = usb20_phy_clk_disable, |
262 | .set_parent = usb20_phy_clk_set_parent, | 262 | .set_parent = usb20_phy_clk_set_parent, |
263 | }; | 263 | }; |
264 | 264 | ||
265 | static struct clk_lookup usb20_phy_clk_lookup = | 265 | static struct clk_lookup usb20_phy_clk_lookup = |
266 | CLK("da8xx-usb-phy", "usb20_phy", &usb20_phy_clk); | 266 | CLK("da8xx-usb-phy", "usb0_clk48", &usb20_phy_clk); |
267 | 267 | ||
268 | /** | 268 | /** |
269 | * da8xx_register_usb20_phy_clk - register USB0PHYCLKMUX clock | 269 | * da8xx_register_usb20_phy_clk - register USB0PHYCLKMUX clock |
@@ -320,18 +320,18 @@ static int usb11_phy_clk_set_parent(struct clk *clk, struct clk *parent) | |||
320 | } | 320 | } |
321 | 321 | ||
322 | static struct clk usb11_phy_clk = { | 322 | static struct clk usb11_phy_clk = { |
323 | .name = "usb11_phy", | 323 | .name = "usb1_clk48", |
324 | .set_parent = usb11_phy_clk_set_parent, | 324 | .set_parent = usb11_phy_clk_set_parent, |
325 | }; | 325 | }; |
326 | 326 | ||
327 | static struct clk_lookup usb11_phy_clk_lookup = | 327 | static struct clk_lookup usb11_phy_clk_lookup = |
328 | CLK("da8xx-usb-phy", "usb11_phy", &usb11_phy_clk); | 328 | CLK("da8xx-usb-phy", "usb1_clk48", &usb11_phy_clk); |
329 | 329 | ||
330 | /** | 330 | /** |
331 | * da8xx_register_usb11_phy_clk - register USB1PHYCLKMUX clock | 331 | * da8xx_register_usb11_phy_clk - register USB1PHYCLKMUX clock |
332 | * | 332 | * |
333 | * @use_usb_refclkin: Selects the parent clock - either "usb_refclkin" if true | 333 | * @use_usb_refclkin: Selects the parent clock - either "usb_refclkin" if true |
334 | * or "usb20_phy" if false. | 334 | * or "usb0_clk48" if false. |
335 | */ | 335 | */ |
336 | int __init da8xx_register_usb11_phy_clk(bool use_usb_refclkin) | 336 | int __init da8xx_register_usb11_phy_clk(bool use_usb_refclkin) |
337 | { | 337 | { |
@@ -341,7 +341,7 @@ int __init da8xx_register_usb11_phy_clk(bool use_usb_refclkin) | |||
341 | if (use_usb_refclkin) | 341 | if (use_usb_refclkin) |
342 | parent = clk_get(NULL, "usb_refclkin"); | 342 | parent = clk_get(NULL, "usb_refclkin"); |
343 | else | 343 | else |
344 | parent = clk_get(&da8xx_usb_phy.dev, "usb20_phy"); | 344 | parent = clk_get(&da8xx_usb_phy.dev, "usb0_clk48"); |
345 | if (IS_ERR(parent)) | 345 | if (IS_ERR(parent)) |
346 | return PTR_ERR(parent); | 346 | return PTR_ERR(parent); |
347 | 347 | ||
diff --git a/drivers/phy/ti/phy-da8xx-usb.c b/drivers/phy/ti/phy-da8xx-usb.c index 1b82bff6330f..5bd33d06df95 100644 --- a/drivers/phy/ti/phy-da8xx-usb.c +++ b/drivers/phy/ti/phy-da8xx-usb.c | |||
@@ -162,15 +162,15 @@ static int da8xx_usb_phy_probe(struct platform_device *pdev) | |||
162 | return PTR_ERR(d_phy->regmap); | 162 | return PTR_ERR(d_phy->regmap); |
163 | } | 163 | } |
164 | 164 | ||
165 | d_phy->usb11_clk = devm_clk_get(dev, "usb11_phy"); | 165 | d_phy->usb11_clk = devm_clk_get(dev, "usb1_clk48"); |
166 | if (IS_ERR(d_phy->usb11_clk)) { | 166 | if (IS_ERR(d_phy->usb11_clk)) { |
167 | dev_err(dev, "Failed to get usb11_phy clock\n"); | 167 | dev_err(dev, "Failed to get usb1_clk48\n"); |
168 | return PTR_ERR(d_phy->usb11_clk); | 168 | return PTR_ERR(d_phy->usb11_clk); |
169 | } | 169 | } |
170 | 170 | ||
171 | d_phy->usb20_clk = devm_clk_get(dev, "usb20_phy"); | 171 | d_phy->usb20_clk = devm_clk_get(dev, "usb0_clk48"); |
172 | if (IS_ERR(d_phy->usb20_clk)) { | 172 | if (IS_ERR(d_phy->usb20_clk)) { |
173 | dev_err(dev, "Failed to get usb20_phy clock\n"); | 173 | dev_err(dev, "Failed to get usb0_clk48\n"); |
174 | return PTR_ERR(d_phy->usb20_clk); | 174 | return PTR_ERR(d_phy->usb20_clk); |
175 | } | 175 | } |
176 | 176 | ||