From 4aa33690fc9a225e7e35b5870e4c7378aae46e67 Mon Sep 17 00:00:00 2001 From: Kever Yang Date: Wed, 19 Feb 2020 09:46:05 +0800 Subject: rockchip: elgin-rv1108: Use syscon API to get grf base Use syscon API to get grf base instead of get from dts. Signed-off-by: Kever Yang Reviewed-by: Simon Glass Acked-by: Otavio Salvador --- board/elgin/elgin_rv1108/elgin_rv1108.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'board') diff --git a/board/elgin/elgin_rv1108/elgin_rv1108.c b/board/elgin/elgin_rv1108/elgin_rv1108.c index 607667ac63..06df25a326 100644 --- a/board/elgin/elgin_rv1108/elgin_rv1108.c +++ b/board/elgin/elgin_rv1108/elgin_rv1108.c @@ -5,8 +5,9 @@ */ #include +#include #include -#include +#include #include #include #include @@ -15,7 +16,6 @@ DECLARE_GLOBAL_DATA_PTR; int mach_cpu_init(void) { - int node; struct rv1108_grf *grf; enum { GPIO3C3_SHIFT = 6, @@ -35,8 +35,7 @@ int mach_cpu_init(void) GPIO2D1_UART2_SIN_M0, }; - node = fdt_node_offset_by_compatible(gd->fdt_blob, -1, "rockchip,rv1108-grf"); - grf = (struct rv1108_grf *)fdtdec_get_addr(gd->fdt_blob, node, "reg"); + grf = syscon_get_first_range(ROCKCHIP_SYSCON_GRF); /* Elgin board use UART2 m0 for debug*/ rk_clrsetreg(&grf->gpio2d_iomux, -- cgit v1.2.1 From 9cec3367087bcdcf6f583e60b95243d0d5e9ae92 Mon Sep 17 00:00:00 2001 From: Kever Yang Date: Wed, 19 Feb 2020 09:46:06 +0800 Subject: rockchip: evb-rv1108: Use syscon API to get grf base Use syscon API to get grf base instead of get from dts. Signed-off-by: Kever Yang Reviewed-by: Simon Glass --- board/rockchip/evb_rv1108/evb_rv1108.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'board') diff --git a/board/rockchip/evb_rv1108/evb_rv1108.c b/board/rockchip/evb_rv1108/evb_rv1108.c index 733f29376e..5d622c3737 100644 --- a/board/rockchip/evb_rv1108/evb_rv1108.c +++ b/board/rockchip/evb_rv1108/evb_rv1108.c @@ -5,8 +5,9 @@ */ #include +#include #include -#include +#include #include #include @@ -14,7 +15,6 @@ DECLARE_GLOBAL_DATA_PTR; int mach_cpu_init(void) { - int node; struct rv1108_grf *grf; enum { GPIO3C3_SHIFT = 6, @@ -34,8 +34,7 @@ int mach_cpu_init(void) GPIO2D1_UART2_SIN_M0, }; - node = fdt_node_offset_by_compatible(gd->fdt_blob, -1, "rockchip,rv1108-grf"); - grf = (struct rv1108_grf *)fdtdec_get_addr(gd->fdt_blob, node, "reg"); + grf = syscon_get_first_range(ROCKCHIP_SYSCON_GRF); /*evb board use UART2 m0 for debug*/ rk_clrsetreg(&grf->gpio2d_iomux, -- cgit v1.2.1 From 1ac0d52a9bb2a20e07542ca54c526e35b0f2ffca Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 13 Mar 2020 14:42:46 -0300 Subject: elgin-rv1108: Use rk_board_late_init() for GPIO settings Since commit 8e9a8d0d0c8c ("rockchip: elgin-rv1108: use board_early_init_f for per-boar init") the function that configure the board GPIOs is no longer called since CONFIG_BOARD_EARLY_INIT_F=y is not selected. These GPIOs do not need to be configured in such early stagem, so change it to rk_board_late_init() and also select CONFIG_BOARD_LATE_INIT=y to fix the regression. Signed-off-by: Otavio Salvador Signed-off-by: Fabio Berton Reviewed-by: Kever Yang --- board/elgin/elgin_rv1108/elgin_rv1108.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'board') diff --git a/board/elgin/elgin_rv1108/elgin_rv1108.c b/board/elgin/elgin_rv1108/elgin_rv1108.c index 06df25a326..c5a1cc95e4 100644 --- a/board/elgin/elgin_rv1108/elgin_rv1108.c +++ b/board/elgin/elgin_rv1108/elgin_rv1108.c @@ -49,7 +49,7 @@ int mach_cpu_init(void) #define MODEM_ENABLE_GPIO 111 -int board_early_init_f(void) +int rk_board_late_init(void) { gpio_request(MODEM_ENABLE_GPIO, "modem_enable"); gpio_direction_output(MODEM_ENABLE_GPIO, 0); -- cgit v1.2.1