[RESEND v2 PATCH 15/16] Nokia RX-51: Move content of rx51.h to rx51.c

Pali Rohár
2021-02-07T13:50:15Z

After removal of MUX configuration there is no need to have extra rx51.h.

Signed-off-by: Pali Roh?r <pali@kernel.org>
Reviewed-by: Lukasz Majewski <lukma@denx.de>
Acked-by: Pavel Machek <pavel@ucw.cz>
---
board/nokia/rx51/rx51.c | 17 ++++++++++++++++-
board/nokia/rx51/rx51.h | 31 -------------------------------
2 files changed, 16 insertions(+), 32 deletions(-)
delete mode 100644 board/nokia/rx51/rx51.h

diff --git a/board/nokia/rx51/rx51.c b/board/nokia/rx51/rx51.c
index cb72ffaaa9..0597a94faa 100644
--- a/board/nokia/rx51/rx51.c
+++ b/board/nokia/rx51/rx51.c
@@ -39,9 +39,24 @@
#include <asm/arch/sys_proto.h>
#include <asm/arch/mmc_host_def.h>

-#include "rx51.h"
#include "tag_omap.h"

+/* Needed for ROM SMC call */
+struct emu_hal_params_rx51 {
+ u32 num_params;
+ u32 param1;
+ u32 param2;
+ u32 param3;
+ u32 param4;
+};
+
+#define ONENAND_GPMC_CONFIG1_RX51 0xfb001202
+#define ONENAND_GPMC_CONFIG2_RX51 0x00111100
+#define ONENAND_GPMC_CONFIG3_RX51 0x00020200
+#define ONENAND_GPMC_CONFIG4_RX51 0x11001102
+#define ONENAND_GPMC_CONFIG5_RX51 0x03101616
+#define ONENAND_GPMC_CONFIG6_RX51 0x90060000
+
DECLARE_GLOBAL_DATA_PTR;

GraphicDevice gdev;
diff --git a/board/nokia/rx51/rx51.h b/board/nokia/rx51/rx51.h
deleted file mode 100644
index 0eddb06219..0000000000
--- a/board/nokia/rx51/rx51.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0+ */
-/*
- * (C) Copyright 2012
- * ?????? ???????? <freemangordon@abv.bg>
- *
- * (C) Copyright 2011-2012
- * Pali Roh?r <pali@kernel.org>
- *
- * (C) Copyright 2008
- * Dirk Behme <dirk.behme@gmail.com>
- */
-#ifndef _RX51_H_
-#define _RX51_H_
-
-/* Needed for ROM SMC call */
-struct emu_hal_params_rx51 {
- u32 num_params;
- u32 param1;
- u32 param2;
- u32 param3;
- u32 param4;
-};
-
-#define ONENAND_GPMC_CONFIG1_RX51 0xfb001202
-#define ONENAND_GPMC_CONFIG2_RX51 0x00111100
-#define ONENAND_GPMC_CONFIG3_RX51 0x00020200
-#define ONENAND_GPMC_CONFIG4_RX51 0x11001102
-#define ONENAND_GPMC_CONFIG5_RX51 0x03101616
-#define ONENAND_GPMC_CONFIG6_RX51 0x90060000
-
-#endif
--
2.20.1