From patchwork Wed Feb 19 01:46:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kever Yang X-Patchwork-Id: 236529 List-Id: U-Boot discussion From: kever.yang at rock-chips.com (Kever Yang) Date: Wed, 19 Feb 2020 09:46:05 +0800 Subject: [PATCH 1/2] rockchip: elgin-rv1108: Use syscon API to get grf base Message-ID: <20200219014606.18515-1-kever.yang@rock-chips.com> 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(-) 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, From patchwork Wed Feb 19 01:46:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kever Yang X-Patchwork-Id: 236530 List-Id: U-Boot discussion From: kever.yang at rock-chips.com (Kever Yang) Date: Wed, 19 Feb 2020 09:46:06 +0800 Subject: [PATCH 2/2] rockchip: evb-rv1108: Use syscon API to get grf base In-Reply-To: <20200219014606.18515-1-kever.yang@rock-chips.com> References: <20200219014606.18515-1-kever.yang@rock-chips.com> Message-ID: <20200219014606.18515-2-kever.yang@rock-chips.com> 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(-) 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,