From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Pali=20Roh=C3=A1r?= Date: Sun, 29 Nov 2020 17:52:42 +0100 Subject: [PATCH 12/13] Nokia RX-51: Move content of rx51.h to rx51.c In-Reply-To: <20201129164618.5829-1-pali@kernel.org> References: <20201129164618.5829-1-pali@kernel.org> Message-ID: <20201129165242.6299-1-pali@kernel.org> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de After removal of MUX configuration there is no need to have extra rx51.h. Signed-off-by: Pali Roh?r --- 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 78edd2145c..58fc779ad3 100644 --- a/board/nokia/rx51/rx51.c +++ b/board/nokia/rx51/rx51.c @@ -39,9 +39,24 @@ #include #include -#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 - * ?????? ???????? - * - * (C) Copyright 2011-2012 - * Pali Roh?r - * - * (C) Copyright 2008 - * Dirk Behme - */ -#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