V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Revert "ns16650: Make sure we have CONFIG_CLK set before using infrastructure" 

This reverts commit 82f5279b0c.

The build failure of k2*evm boards was fixed in a different way by
the previous commit.  It is nasty to patch generic drivers around
with #ifdef CONFIG_CLK just for the KeyStone's matter.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Masahiro Yamada 2016-09-26 20:45:27 +09:00 committed by Tom Rini
parent 43ebbfc39f
commit 021abf696f
2 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/serial/ns16550.c
View File

@ -13,7 +13,6 @@
#include <serial.h> #include <serial.h>
#include <watchdog.h> #include <watchdog.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/compiler.h>
#include <asm/io.h> #include <asm/io.h>
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
@ -354,8 +353,8 @@ int ns16550_serial_ofdata_to_platdata(struct udevice *dev)
{ {
struct ns16550_platdata *plat = dev->platdata; struct ns16550_platdata *plat = dev->platdata;
fdt_addr_t addr; fdt_addr_t addr;
__maybe_unused struct clk clk; struct clk clk;
__maybe_unused int err; int err;
/* try Processor Local Bus device first */ /* try Processor Local Bus device first */
addr = dev_get_addr(dev); addr = dev_get_addr(dev);
@ -402,7 +401,6 @@ int ns16550_serial_ofdata_to_platdata(struct udevice *dev)
plat->reg_shift = fdtdec_get_int(gd->fdt_blob, dev->of_offset, plat->reg_shift = fdtdec_get_int(gd->fdt_blob, dev->of_offset,
"reg-shift", 0); "reg-shift", 0);
#ifdef CONFIG_CLK
err = clk_get_by_index(dev, 0, &clk); err = clk_get_by_index(dev, 0, &clk);
if (!err) { if (!err) {
err = clk_get_rate(&clk); err = clk_get_rate(&clk);
@ -412,7 +410,6 @@ int ns16550_serial_ofdata_to_platdata(struct udevice *dev)
debug("ns16550 failed to get clock\n"); debug("ns16550 failed to get clock\n");
return err; return err;
} }
#endif
if (!plat->clock) if (!plat->clock)
plat->clock = fdtdec_get_int(gd->fdt_blob, dev->of_offset, plat->clock = fdtdec_get_int(gd->fdt_blob, dev->of_offset,

25
include/clk.h
View File

@ -98,6 +98,19 @@ int clk_get_by_index(struct udevice *dev, int index, struct clk *clk);
* @return 0 if OK, or a negative error code. * @return 0 if OK, or a negative error code.
*/ */
int clk_get_by_name(struct udevice *dev, const char *name, struct clk *clk); int clk_get_by_name(struct udevice *dev, const char *name, struct clk *clk);
#else
static inline int clk_get_by_index(struct udevice *dev, int index,
struct clk *clk)
{
return -ENOSYS;
}
static inline int clk_get_by_name(struct udevice *dev, const char *name,
struct clk *clk)
{
return -ENOSYS;
}
#endif
/** /**
* clk_request - Request a clock by provider-specific ID. * clk_request - Request a clock by provider-specific ID.
@ -162,17 +175,5 @@ int clk_enable(struct clk *clk);
int clk_disable(struct clk *clk); int clk_disable(struct clk *clk);
int soc_clk_dump(void); int soc_clk_dump(void);
#else
static inline int clk_get_by_index(struct udevice *dev, int index,
struct clk *clk)
{
return -ENOSYS;
}
static inline int clk_get_by_name(struct udevice *dev, const char *name,
struct clk *clk)
{
return -ENOSYS;
}
#endif
#endif #endif