[PATCH 1/2] 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 kever.yang@rock-chips.com ---
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 <common.h> +#include <syscon.h> #include <asm/io.h> -#include <fdtdec.h> +#include <asm/arch-rockchip/clock.h> #include <asm/arch-rockchip/grf_rv1108.h> #include <asm/arch-rockchip/hardware.h> #include <asm/gpio.h> @@ -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,
Use syscon API to get grf base instead of get from dts.
Signed-off-by: Kever Yang kever.yang@rock-chips.com ---
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 <common.h> +#include <syscon.h> #include <asm/io.h> -#include <fdtdec.h> +#include <asm/arch-rockchip/clock.h> #include <asm/arch-rockchip/grf_rv1108.h> #include <asm/arch-rockchip/hardware.h>
@@ -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,
On Tue, 18 Feb 2020 at 18:46, Kever Yang kever.yang@rock-chips.com wrote:
Use syscon API to get grf base instead of get from dts.
Signed-off-by: Kever Yang kever.yang@rock-chips.com
board/rockchip/evb_rv1108/evb_rv1108.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
Reviewed-by: Simon Glass sjg@chromium.org
You might consider putting this code in a BOARD driver.
On Tue, 18 Feb 2020 at 18:46, Kever Yang kever.yang@rock-chips.com wrote:
Use syscon API to get grf base instead of get from dts.
Signed-off-by: Kever Yang kever.yang@rock-chips.com
board/elgin/elgin_rv1108/elgin_rv1108.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
Reviewed-by: Simon Glass sjg@chromium.org
On Thu, Feb 20, 2020 at 12:05 AM Simon Glass sjg@chromium.org wrote:
On Tue, 18 Feb 2020 at 18:46, Kever Yang kever.yang@rock-chips.com wrote:
Use syscon API to get grf base instead of get from dts.
Signed-off-by: Kever Yang kever.yang@rock-chips.com
board/elgin/elgin_rv1108/elgin_rv1108.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
Reviewed-by: Simon Glass sjg@chromium.org
Acked-by: Otavio Salvador otavio@ossystems.com.br
participants (3)
-
Kever Yang -
Otavio Salvador -
Simon Glass