Commit c34cc2f2 authored by Stephen Boyd's avatar Stephen Boyd

Merge tag 'clk-davinci-fixes-4.18' of https://github.com/dlech/linux into clk-fixes

Pull davinci clk fixes for 4.18 from David Lechner:

Here are a couple of typo fixes for clk-davinci for 4.18.

* tag 'clk-davinci-fixes-4.18' of https://github.com/dlech/linux:
  clk: davinci: fix a typo (which leads to build failures)
  clk: davinci: cfgchip: testing the wrong variable
parents 12f8c553 176cbf5f
...@@ -672,7 +672,7 @@ static int of_da8xx_usb_phy_clk_init(struct device *dev, struct regmap *regmap) ...@@ -672,7 +672,7 @@ static int of_da8xx_usb_phy_clk_init(struct device *dev, struct regmap *regmap)
usb1 = da8xx_cfgchip_register_usb1_clk48(dev, regmap); usb1 = da8xx_cfgchip_register_usb1_clk48(dev, regmap);
if (IS_ERR(usb1)) { if (IS_ERR(usb1)) {
if (PTR_ERR(usb0) == -EPROBE_DEFER) if (PTR_ERR(usb1) == -EPROBE_DEFER)
return -EPROBE_DEFER; return -EPROBE_DEFER;
dev_warn(dev, "Failed to register usb1_clk48 (%ld)\n", dev_warn(dev, "Failed to register usb1_clk48 (%ld)\n",
......
...@@ -107,7 +107,7 @@ extern const struct davinci_psc_init_data of_da850_psc1_init_data; ...@@ -107,7 +107,7 @@ extern const struct davinci_psc_init_data of_da850_psc1_init_data;
#ifdef CONFIG_ARCH_DAVINCI_DM355 #ifdef CONFIG_ARCH_DAVINCI_DM355
extern const struct davinci_psc_init_data dm355_psc_init_data; extern const struct davinci_psc_init_data dm355_psc_init_data;
#endif #endif
#ifdef CONFIG_ARCH_DAVINCI_DM356 #ifdef CONFIG_ARCH_DAVINCI_DM365
extern const struct davinci_psc_init_data dm365_psc_init_data; extern const struct davinci_psc_init_data dm365_psc_init_data;
#endif #endif
#ifdef CONFIG_ARCH_DAVINCI_DM644x #ifdef CONFIG_ARCH_DAVINCI_DM644x
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment