aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2023-10-26 14:31:36 -0400
committerTom Rini <trini@konsulko.com>2023-11-07 14:49:40 -0500
commitd563bb5d167dbb8630ececbb35e9cdbef0ddb4be (patch)
treedd689ad4a097144319a4882a99fad9b6076ebfcc
parenteff0aa47b5e668dde39a0d9d1b2de92cd5fa8f29 (diff)
downloadu-boot-d563bb5d167dbb8630ececbb35e9cdbef0ddb4be.zip
u-boot-d563bb5d167dbb8630ececbb35e9cdbef0ddb4be.tar.gz
u-boot-d563bb5d167dbb8630ececbb35e9cdbef0ddb4be.tar.bz2
clk_k210.c: Clean up how we handle nop
Now that sandbox has <asm/barrier.h> and defines nop() there we should include that in our driver for clarity and then remove our local nop() from <k210/pll.h>. Reviewed-by: Sean Anderson <seanga2@gmail.com> Signed-off-by: Tom Rini <trini@konsulko.com>
-rw-r--r--drivers/clk/clk_k210.c1
-rw-r--r--include/k210/pll.h3
2 files changed, 1 insertions, 3 deletions
diff --git a/drivers/clk/clk_k210.c b/drivers/clk/clk_k210.c
index c534cc0..b9469b9 100644
--- a/drivers/clk/clk_k210.c
+++ b/drivers/clk/clk_k210.c
@@ -16,6 +16,7 @@
#include <dt-bindings/mfd/k210-sysctl.h>
#include <k210/pll.h>
#include <linux/bitfield.h>
+#include <asm/barrier.h>
DECLARE_GLOBAL_DATA_PTR;
diff --git a/include/k210/pll.h b/include/k210/pll.h
index fd16a89..175c47f 100644
--- a/include/k210/pll.h
+++ b/include/k210/pll.h
@@ -16,9 +16,6 @@ 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
#endif /* K210_PLL_H */