diff options
| author | Tom Rini <trini@ti.com> | 2014-12-10 09:07:06 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-12-10 09:07:06 -0500 |
| commit | d51aae64236878b72283bd135df716e30f7f5ded (patch) | |
| tree | 1af09157a52d3e14cbde89127fa1149d677a98e7 /board/renesas/gose | |
| parent | 39e4795a797663d08cd2216975430b2819e3173c (diff) | |
| parent | 2b8c0814f88fa2d6fd8a1ac994e4396b39a0eac8 (diff) | |
Merge branch 'rmobile' of git://git.denx.de/u-boot-sh
Diffstat (limited to 'board/renesas/gose')
| -rw-r--r-- | board/renesas/gose/Makefile | 2 | ||||
| -rw-r--r-- | board/renesas/gose/gose.c | 28 |
2 files changed, 2 insertions, 28 deletions
diff --git a/board/renesas/gose/Makefile b/board/renesas/gose/Makefile index a4fb6cc43d..2dac748efb 100644 --- a/board/renesas/gose/Makefile +++ b/board/renesas/gose/Makefile @@ -6,4 +6,4 @@ # SPDX-License-Identifier: GPL-2.0 # -obj-y := gose.o qos.o +obj-y := gose.o qos.o ../rcar-gen2-common/common.o diff --git a/board/renesas/gose/gose.c b/board/renesas/gose/gose.c index 715fba05f7..677b976aaf 100644 --- a/board/renesas/gose/gose.c +++ b/board/renesas/gose/gose.c @@ -15,6 +15,7 @@ #include <asm/arch/sys_proto.h> #include <asm/gpio.h> #include <asm/arch/rmobile.h> +#include <asm/arch/rcar-mstp.h> #include <netdev.h> #include <miiphy.h> #include <i2c.h> @@ -41,27 +42,10 @@ void s_init(void) qos_init(); } -#define MSTPSR1 0xE6150038 -#define SMSTPCR1 0xE6150134 #define TMU0_MSTP125 (1 << 25) - -#define MSTPSR7 0xE61501C4 -#define SMSTPCR7 0xE615014C #define SCIF0_MSTP721 (1 << 21) - -#define MSTPSR8 0xE61509A0 -#define SMSTPCR8 0xE6150990 #define ETHER_MSTP813 (1 << 13) -#define mstp_setbits(type, addr, saddr, set) \ - out_##type((saddr), in_##type(addr) | (set)) -#define mstp_clrbits(type, addr, saddr, clear) \ - out_##type((saddr), in_##type(addr) & ~(clear)) -#define mstp_setbits_le32(addr, saddr, set) \ - mstp_setbits(le32, addr, saddr, set) -#define mstp_clrbits_le32(addr, saddr, clear) \ - mstp_clrbits(le32, addr, saddr, clear) - int board_early_init_f(void) { /* TMU0 */ @@ -76,16 +60,6 @@ int board_early_init_f(void) 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_ETH 0x3FFC0000 #define PUPR5_ETH_MAGIC (1 << 27) |