| Message ID | 1474890327-478-4-git-send-email-yamada.masahiro@socionext.com |
|---|---|
| State | Accepted |
| Commit | 021abf696fca37963db1f72e7e35d2ccdbe285ef |
| Delegated to: | Tom Rini |
| Headers | show |
On 26 September 2016 at 05:45, Masahiro Yamada <yamada.masahiro@socionext.com> wrote: > This reverts commit 82f5279b0cd99a9163d34cfe926d0316d9dc0d37. > > 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> > --- > > drivers/serial/ns16550.c | 7 ++----- > include/clk.h | 25 +++++++++++++------------ > 2 files changed, 15 insertions(+), 17 deletions(-) Reviewed-by: Simon Glass <sjg@chromium.org>
On Mon, Sep 26, 2016 at 08:45:27PM +0900, Masahiro Yamada wrote: > This reverts commit 82f5279b0cd99a9163d34cfe926d0316d9dc0d37. > > 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: Tom Rini <trini@konsulko.com>
On Mon, Sep 26, 2016 at 08:45:27PM +0900, Masahiro Yamada wrote: > This reverts commit 82f5279b0cd99a9163d34cfe926d0316d9dc0d37. > > 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> Applied to u-boot/master, thanks!
diff --git a/drivers/serial/ns16550.c b/drivers/serial/ns16550.c index 765499d..3f6ea4d 100644 --- a/drivers/serial/ns16550.c +++ b/drivers/serial/ns16550.c @@ -13,7 +13,6 @@ #include <serial.h> #include <watchdog.h> #include <linux/types.h> -#include <linux/compiler.h> #include <asm/io.h> DECLARE_GLOBAL_DATA_PTR; @@ -354,8 +353,8 @@ int ns16550_serial_ofdata_to_platdata(struct udevice *dev) { struct ns16550_platdata *plat = dev->platdata; fdt_addr_t addr; - __maybe_unused struct clk clk; - __maybe_unused int err; + struct clk clk; + int err; /* try Processor Local Bus device first */ 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, "reg-shift", 0); -#ifdef CONFIG_CLK err = clk_get_by_index(dev, 0, &clk); if (!err) { 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"); return err; } -#endif if (!plat->clock) plat->clock = fdtdec_get_int(gd->fdt_blob, dev->of_offset, diff --git a/include/clk.h b/include/clk.h index fe1f892..5a5c2ff 100644 --- a/include/clk.h +++ b/include/clk.h @@ -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. */ 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. @@ -162,17 +175,5 @@ int clk_enable(struct clk *clk); int clk_disable(struct clk *clk); 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
This reverts commit 82f5279b0cd99a9163d34cfe926d0316d9dc0d37. 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> --- drivers/serial/ns16550.c | 7 ++----- include/clk.h | 25 +++++++++++++------------ 2 files changed, 15 insertions(+), 17 deletions(-)