arm: rmobile: rcar: Move arch_preboot_os function to rcar-gen2-common/common.c
The arch_preboot_os function used in boards using R-Car ARM SoC (r8a7790, r8a7791, r8a7793 and r8a7794) is common. This makes rcar-gen2-common/common.c file providing common function for R-Car ARM SoC, and moves this function to this file. Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
This commit is contained in:
		
							parent
							
								
									44e1eebf86
								
							
						
					
					
						commit
						72fd3838c6
					
				|  | @ -6,4 +6,4 @@ | ||||||
| # SPDX-License-Identifier: GPL-2.0
 | # SPDX-License-Identifier: GPL-2.0
 | ||||||
| #
 | #
 | ||||||
| 
 | 
 | ||||||
| obj-y	:= alt.o qos.o | obj-y	:= alt.o qos.o ../rcar-gen2-common/common.o | ||||||
|  |  | ||||||
|  | @ -60,12 +60,6 @@ int board_early_init_f(void) | ||||||
| 	return 0; | 	return 0; | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| void arch_preboot_os(void) |  | ||||||
| { |  | ||||||
| 	/* Disable TMU0 */ |  | ||||||
| 	mstp_setbits_le32(MSTPSR1, SMSTPCR1, TMU0_MSTP125); |  | ||||||
| } |  | ||||||
| 
 |  | ||||||
| int board_init(void) | int board_init(void) | ||||||
| { | { | ||||||
| 	/* adress of boot parameters */ | 	/* adress of boot parameters */ | ||||||
|  |  | ||||||
|  | @ -6,4 +6,4 @@ | ||||||
| # SPDX-License-Identifier: GPL-2.0
 | # SPDX-License-Identifier: GPL-2.0
 | ||||||
| #
 | #
 | ||||||
| 
 | 
 | ||||||
| obj-y	:= gose.o qos.o | obj-y	:= gose.o qos.o ../rcar-gen2-common/common.o | ||||||
|  |  | ||||||
|  | @ -60,16 +60,6 @@ int board_early_init_f(void) | ||||||
| 	return 0; | 	return 0; | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| #define TSTR0		0x04 |  | ||||||
| #define TSTR0_STR0	0x01 |  | ||||||
| void arch_preboot_os(void) |  | ||||||
| { |  | ||||||
| 	/* stop TMU0 */ |  | ||||||
| 	mstp_clrbits_le32(TMU_BASE + TSTR0, TMU_BASE + TSTR0, TSTR0_STR0); |  | ||||||
| 	/* Disable TMU0 */ |  | ||||||
| 	mstp_setbits_le32(MSTPSR1, SMSTPCR1, TMU0_MSTP125); |  | ||||||
| } |  | ||||||
| 
 |  | ||||||
| #define PUPR5		0xE6060114 | #define PUPR5		0xE6060114 | ||||||
| #define PUPR5_ETH	0x3FFC0000 | #define PUPR5_ETH	0x3FFC0000 | ||||||
| #define PUPR5_ETH_MAGIC	(1 << 27) | #define PUPR5_ETH_MAGIC	(1 << 27) | ||||||
|  |  | ||||||
|  | @ -6,4 +6,4 @@ | ||||||
| # SPDX-License-Identifier: GPL-2.0
 | # SPDX-License-Identifier: GPL-2.0
 | ||||||
| #
 | #
 | ||||||
| 
 | 
 | ||||||
| obj-y	:= koelsch.o qos.o | obj-y	:= koelsch.o qos.o ../rcar-gen2-common/common.o | ||||||
|  |  | ||||||
|  | @ -61,12 +61,6 @@ int board_early_init_f(void) | ||||||
| 	return 0; | 	return 0; | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| void arch_preboot_os(void) |  | ||||||
| { |  | ||||||
| 	/* Disable TMU0 */ |  | ||||||
| 	mstp_setbits_le32(MSTPSR1, SMSTPCR1, TMU0_MSTP125); |  | ||||||
| } |  | ||||||
| 
 |  | ||||||
| /* LSI pin pull-up control */ | /* LSI pin pull-up control */ | ||||||
| #define PUPR5 0xe6060114 | #define PUPR5 0xe6060114 | ||||||
| #define PUPR5_ETH 0x3FFC0000 | #define PUPR5_ETH 0x3FFC0000 | ||||||
|  |  | ||||||
|  | @ -6,4 +6,4 @@ | ||||||
| # SPDX-License-Identifier: GPL-2.0
 | # SPDX-License-Identifier: GPL-2.0
 | ||||||
| #
 | #
 | ||||||
| 
 | 
 | ||||||
| obj-y	:= lager.o qos.o | obj-y	:= lager.o qos.o ../rcar-gen2-common/common.o | ||||||
|  |  | ||||||
|  | @ -67,12 +67,6 @@ int board_early_init_f(void) | ||||||
| 	return 0; | 	return 0; | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| void arch_preboot_os(void) |  | ||||||
| { |  | ||||||
| 	/* Disable TMU0 */ |  | ||||||
| 	mstp_setbits_le32(MSTPSR1, SMSTPCR1, TMU0_MSTP125); |  | ||||||
| } |  | ||||||
| 
 |  | ||||||
| DECLARE_GLOBAL_DATA_PTR; | DECLARE_GLOBAL_DATA_PTR; | ||||||
| int board_init(void) | int board_init(void) | ||||||
| { | { | ||||||
|  |  | ||||||
|  | @ -0,0 +1,27 @@ | ||||||
|  | /*
 | ||||||
|  |  * board/renesas/rcar-gen2-common/common.c | ||||||
|  |  * | ||||||
|  |  * Copyright (C) 2013 Renesas Electronics Corporation | ||||||
|  |  * Copyright (C) 2013 Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> | ||||||
|  |  * | ||||||
|  |  * SPDX-License-Identifier: GPL-2.0 | ||||||
|  |  */ | ||||||
|  | 
 | ||||||
|  | #include <common.h> | ||||||
|  | #include <asm/io.h> | ||||||
|  | #include <asm/arch/sys_proto.h> | ||||||
|  | #include <asm/arch/rmobile.h> | ||||||
|  | #include <asm/arch/rcar-mstp.h> | ||||||
|  | 
 | ||||||
|  | #define TSTR0		0x04 | ||||||
|  | #define TSTR0_STR0	0x01 | ||||||
|  | 
 | ||||||
|  | #define TMU0_MSTP125	(1 << 25) | ||||||
|  | void arch_preboot_os(void) | ||||||
|  | { | ||||||
|  | 	/* stop TMU0 */ | ||||||
|  | 	mstp_clrbits_le32(TMU_BASE + TSTR0, TMU_BASE + TSTR0, TSTR0_STR0); | ||||||
|  | 
 | ||||||
|  | 	/* Disable TMU0 */ | ||||||
|  | 	mstp_setbits_le32(MSTPSR1, SMSTPCR1, TMU0_MSTP125); | ||||||
|  | } | ||||||
		Loading…
	
		Reference in New Issue