From patchwork Mon Apr 13 01:38:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kever Yang X-Patchwork-Id: 237731 List-Id: U-Boot discussion From: kever.yang at rock-chips.com (Kever Yang) Date: Mon, 13 Apr 2020 09:38:30 +0800 Subject: [PATCH 1/3] rockchip: rv1108: use correct API for board callback Message-ID: <20200413013832.11784-1-kever.yang@rock-chips.com> Use board_early_init_f() instead of mach_cpu_init() for board, the board_early_init_f() is used for board init and after dm_initf, while the mach_cpu_init() is used for CPU/SOC and before dm_initf()(not able to use syscon API). Fixes: 9cec336708 ("rockchip: evb-rv1108: Use syscon API to get grf base") Fixes: 4aa33690fc {"rockchip: elgin-rv1108: Use syscon API to get grf base") Signed-off-by: Kever Yang --- board/elgin/elgin_rv1108/elgin_rv1108.c | 2 +- board/rockchip/evb_rv1108/evb_rv1108.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/board/elgin/elgin_rv1108/elgin_rv1108.c b/board/elgin/elgin_rv1108/elgin_rv1108.c index c5a1cc95e4..f9100e178c 100644 --- a/board/elgin/elgin_rv1108/elgin_rv1108.c +++ b/board/elgin/elgin_rv1108/elgin_rv1108.c @@ -14,7 +14,7 @@ DECLARE_GLOBAL_DATA_PTR; -int mach_cpu_init(void) +int board_early_init_f(void) { struct rv1108_grf *grf; enum { diff --git a/board/rockchip/evb_rv1108/evb_rv1108.c b/board/rockchip/evb_rv1108/evb_rv1108.c index 5d622c3737..f34fe4401b 100644 --- a/board/rockchip/evb_rv1108/evb_rv1108.c +++ b/board/rockchip/evb_rv1108/evb_rv1108.c @@ -13,7 +13,7 @@ DECLARE_GLOBAL_DATA_PTR; -int mach_cpu_init(void) +int board_early_init_f(void) { struct rv1108_grf *grf; enum { From patchwork Mon Apr 13 01:38:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kever Yang X-Patchwork-Id: 237732 List-Id: U-Boot discussion From: kever.yang at rock-chips.com (Kever Yang) Date: Mon, 13 Apr 2020 09:38:31 +0800 Subject: [PATCH 2/3] rockchip: rv1108: Enable grf as pre-reloc node In-Reply-To: <20200413013832.11784-1-kever.yang@rock-chips.com> References: <20200413013832.11784-1-kever.yang@rock-chips.com> Message-ID: <20200413013832.11784-2-kever.yang@rock-chips.com> The grf node will be used before relocate, enable it in dts. Signed-off-by: Kever Yang --- arch/arm/dts/rv1108-u-boot.dtsi | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm/dts/rv1108-u-boot.dtsi b/arch/arm/dts/rv1108-u-boot.dtsi index 41ac054b81..6a2098b8d4 100644 --- a/arch/arm/dts/rv1108-u-boot.dtsi +++ b/arch/arm/dts/rv1108-u-boot.dtsi @@ -4,3 +4,7 @@ */ #include "rockchip-u-boot.dtsi" + +&grf { + u-boot,dm-pre-reloc; +}; From patchwork Mon Apr 13 01:38:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kever Yang X-Patchwork-Id: 237733 List-Id: U-Boot discussion From: kever.yang at rock-chips.com (Kever Yang) Date: Mon, 13 Apr 2020 09:38:32 +0800 Subject: [PATCH 3/3] rockchip: evb-rv1108: enable board early init In-Reply-To: <20200413013832.11784-1-kever.yang@rock-chips.com> References: <20200413013832.11784-1-kever.yang@rock-chips.com> Message-ID: <20200413013832.11784-3-kever.yang@rock-chips.com> Enable board early init callback to init board specific hardware. Signed-off-by: Kever Yang --- configs/evb-rv1108_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/evb-rv1108_defconfig b/configs/evb-rv1108_defconfig index ae2c9704ab..3998ba4f2a 100644 --- a/configs/evb-rv1108_defconfig +++ b/configs/evb-rv1108_defconfig @@ -10,6 +10,7 @@ CONFIG_DEBUG_UART=y CONFIG_DEFAULT_FDT_FILE="rv1108-evb.dtb" # CONFIG_DISPLAY_CPUINFO is not set CONFIG_DISPLAY_BOARDINFO_LATE=y +CONFIG_BOARD_EARLY_INIT_F=y CONFIG_RANDOM_UUID=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set