[PATCH 1/1] clk: kendryte/pll.h: do not redefine nop()

[Sean Anderson]

On 7/28/20 11:52 AM, Heinrich Schuchardt wrote:
> 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 <xypron.glpk at gmx.de>
> ---
>  include/kendryte/pll.h | 5 +++++
>  1 file changed, 5 insertions(+)
> 
> 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 <clk.h>
>  #include <test/export.h>
> +#include <asm/io.h>
> 
>  #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,
> --
> 2.27.0
> 

Reviewed-by: Sean Anderson <seanga2 at gmail.com>