| Message ID | 1501679456-13595-1-git-send-email-andy.yan@rock-chips.com |
|---|---|
| State | Accepted |
| Commit | c72c161bc0af0dc8fdabdebf3812cfeef3915e4c |
| Delegated to: | Philipp Tomsich |
| Headers | show |
> On 02 Aug 2017, at 15:10, Andy Yan <andy.yan@rock-chips.com> wrote: > > As the debug uart is marked as dm-pre-reloc, the pinctrl driver > will handle the correct iomux setting. > > Signed-off-by: Andy Yan <andy.yan@rock-chips.com> > — Acked-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com> Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
On 2 August 2017 at 07:10, Andy Yan <andy.yan@rock-chips.com> wrote: > As the debug uart is marked as dm-pre-reloc, the pinctrl driver > will handle the correct iomux setting. > > Signed-off-by: Andy Yan <andy.yan@rock-chips.com> > --- > > board/rockchip/evb_px5/evb-px5.c | 24 ------------------------ > 1 file changed, 24 deletions(-) Reviewed-by: Simon Glass <sjg@chromium.org>
> As the debug uart is marked as dm-pre-reloc, the pinctrl driver > will handle the correct iomux setting. > > Signed-off-by: Andy Yan <andy.yan@rock-chips.com> > Acked-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com> > Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com> > Reviewed-by: Simon Glass <sjg@chromium.org> > --- > > board/rockchip/evb_px5/evb-px5.c | 24 ------------------------ > 1 file changed, 24 deletions(-) > Applied to u-boot-rockchip, thanks!
diff --git a/board/rockchip/evb_px5/evb-px5.c b/board/rockchip/evb_px5/evb-px5.c index 6dca1fc..6a47642 100644 --- a/board/rockchip/evb_px5/evb-px5.c +++ b/board/rockchip/evb_px5/evb-px5.c @@ -4,30 +4,6 @@ * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> -#include <asm/io.h> -#include <fdtdec.h> -#include <asm/arch/clock.h> -#include <asm/arch/grf_rk3368.h> - -DECLARE_GLOBAL_DATA_PTR; - -int mach_cpu_init(void) -{ - struct rk3368_pmu_grf *pmugrf; - int node; - - node = fdt_node_offset_by_compatible(gd->fdt_blob, -1, "rockchip,rk3368-pmugrf"); - pmugrf = (struct rk3368_pmu_grf *)fdtdec_get_addr(gd->fdt_blob, node, "reg"); - - rk_clrsetreg(&pmugrf->gpio0d_iomux, - GPIO0D0_MASK | GPIO0D1_MASK | - GPIO0D2_MASK | GPIO0D3_MASK, - GPIO0D0_GPIO << GPIO0D0_SHIFT | - GPIO0D1_GPIO << GPIO0D1_SHIFT | - GPIO0D2_UART4_SOUT << GPIO0D2_SHIFT | - GPIO0D3_UART4_SIN << GPIO0D3_SHIFT); - return 0; -} int board_init(void) {
As the debug uart is marked as dm-pre-reloc, the pinctrl driver will handle the correct iomux setting. Signed-off-by: Andy Yan <andy.yan@rock-chips.com> --- board/rockchip/evb_px5/evb-px5.c | 24 ------------------------ 1 file changed, 24 deletions(-)