From: Heinrich Schuchardt Date: Tue, 28 Jul 2020 15:52:23 +0000 (+0200) Subject: clk: kendryte/pll.h: do not redefine nop() X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=183f1e27123769c41b3a73b92839497d4812f790;p=u-boot.git clk: kendryte/pll.h: do not redefine nop() The kendryte PLL code uses nop as barrier. The macro is not defined for the sandbox on x86 but is defined on RISC-V. Signed-off-by: Heinrich Schuchardt Reviewed-by: Sean Anderson Reviewed-by: Bin Meng --- diff --git a/include/kendryte/pll.h b/include/kendryte/pll.h index c8e3200799..55a40b9c97 100644 --- a/include/kendryte/pll.h +++ b/include/kendryte/pll.h @@ -7,6 +7,7 @@ #include #include +#include #define K210_PLL_CLKR GENMASK(3, 0) #define K210_PLL_CLKF GENMASK(9, 4) @@ -43,9 +44,13 @@ struct k210_pll_config { #ifdef CONFIG_UNIT_TEST TEST_STATIC int k210_pll_calc_config(u32 rate, u32 rate_in, struct k210_pll_config *best); + +#ifndef nop #define nop() #endif +#endif + extern const struct clk_ops k210_pll_ops; struct clk *k210_register_pll_struct(const char *name, const char *parent_name,