[PATCH] arm64: zynqmp: Remove low level UART setting cont

Michal Simek monstr at monstr.eu
Tue Mar 29 09:18:49 CEST 2022


čt 24. 3. 2022 v 13:31 odesílatel Michal Simek <michal.simek at xilinx.com> napsal:
>
> There is no reason to do serial initialization. Uart driver does it already
> based on DT. Good effect is that it is clear which interface is console.
> The same change was done in past by commit 84d2bbf082fa ("arm64: zynqmp:
> Remove low level UART setting").
>
> Signed-off-by: Michal Simek <michal.simek at xilinx.com>
> ---
>
>  board/xilinx/zynqmp/zynqmp-dlc21-revA/psu_init_gpl.c      | 4 ----
>  board/xilinx/zynqmp/zynqmp-e-a2197-00-revA/psu_init_gpl.c | 4 ----
>  .../zynqmp-topic-miamimp-xilinx-xdp-v1r1/psu_init_gpl.c   | 8 --------
>  board/xilinx/zynqmp/zynqmp-zcu102-rev1.1/psu_init_gpl.c   | 8 --------
>  board/xilinx/zynqmp/zynqmp-zcu111-revA/psu_init_gpl.c     | 8 --------
>  board/xilinx/zynqmp/zynqmp-zcu208-revA/psu_init_gpl.c     | 4 ----
>  board/xilinx/zynqmp/zynqmp-zcu216-revA/psu_init_gpl.c     | 4 ----
>  7 files changed, 40 deletions(-)
>
> diff --git a/board/xilinx/zynqmp/zynqmp-dlc21-revA/psu_init_gpl.c b/board/xilinx/zynqmp/zynqmp-dlc21-revA/psu_init_gpl.c
> index 528958d83ed6..dae81e60ccb6 100644
> --- a/board/xilinx/zynqmp/zynqmp-dlc21-revA/psu_init_gpl.c
> +++ b/board/xilinx/zynqmp/zynqmp-dlc21-revA/psu_init_gpl.c
> @@ -509,10 +509,6 @@ static unsigned long psu_peripherals_init_data(void)
>         psu_mask_write(0xFF5E0238, 0x00000008U, 0x00000000U);
>         psu_mask_write(0xFF5E0238, 0x00007800U, 0x00000000U);
>         psu_mask_write(0xFF5E0238, 0x00000002U, 0x00000000U);
> -       psu_mask_write(0xFF000034, 0x000000FFU, 0x00000005U);
> -       psu_mask_write(0xFF000018, 0x0000FFFFU, 0x0000008FU);
> -       psu_mask_write(0xFF000000, 0x000001FFU, 0x00000017U);
> -       psu_mask_write(0xFF000004, 0x000003FFU, 0x00000020U);
>         psu_mask_write(0xFF5E0238, 0x00040000U, 0x00000000U);
>         psu_mask_write(0xFF4B0024, 0x000000FFU, 0x000000FFU);
>         psu_mask_write(0xFFCA5000, 0x00001FFFU, 0x00000000U);
> diff --git a/board/xilinx/zynqmp/zynqmp-e-a2197-00-revA/psu_init_gpl.c b/board/xilinx/zynqmp/zynqmp-e-a2197-00-revA/psu_init_gpl.c
> index 348f0e7789a7..40d9279378ba 100644
> --- a/board/xilinx/zynqmp/zynqmp-e-a2197-00-revA/psu_init_gpl.c
> +++ b/board/xilinx/zynqmp/zynqmp-e-a2197-00-revA/psu_init_gpl.c
> @@ -521,10 +521,6 @@ static unsigned long psu_peripherals_init_data(void)
>         psu_mask_write(0xFF180324, 0x03C00000U, 0x00000000U);
>         psu_mask_write(0xFF5E0238, 0x00000600U, 0x00000000U);
>         psu_mask_write(0xFF5E0238, 0x00000002U, 0x00000000U);
> -       psu_mask_write(0xFF000034, 0x000000FFU, 0x00000006U);
> -       psu_mask_write(0xFF000018, 0x0000FFFFU, 0x0000007CU);
> -       psu_mask_write(0xFF000000, 0x000001FFU, 0x00000017U);
> -       psu_mask_write(0xFF000004, 0x000003FFU, 0x00000020U);
>         psu_mask_write(0xFF5E0238, 0x00040000U, 0x00000000U);
>         psu_mask_write(0xFF4B0024, 0x000000FFU, 0x000000FFU);
>         psu_mask_write(0xFFCA5000, 0x00001FFFU, 0x00000000U);
> diff --git a/board/xilinx/zynqmp/zynqmp-topic-miamimp-xilinx-xdp-v1r1/psu_init_gpl.c b/board/xilinx/zynqmp/zynqmp-topic-miamimp-xilinx-xdp-v1r1/psu_init_gpl.c
> index dbed7b789e36..333510bfe92d 100644
> --- a/board/xilinx/zynqmp/zynqmp-topic-miamimp-xilinx-xdp-v1r1/psu_init_gpl.c
> +++ b/board/xilinx/zynqmp/zynqmp-topic-miamimp-xilinx-xdp-v1r1/psu_init_gpl.c
> @@ -522,14 +522,6 @@ static unsigned long psu_peripherals_init_data(void)
>         psu_mask_write(0xFF5E0238, 0x00000018U, 0x00000000U);
>         psu_mask_write(0xFF5E0238, 0x00007800U, 0x00000000U);
>         psu_mask_write(0xFF5E0238, 0x00000006U, 0x00000000U);
> -       psu_mask_write(0xFF000034, 0x000000FFU, 0x00000005U);
> -       psu_mask_write(0xFF000018, 0x0000FFFFU, 0x0000008FU);
> -       psu_mask_write(0xFF000000, 0x000001FFU, 0x00000017U);
> -       psu_mask_write(0xFF000004, 0x000003FFU, 0x00000020U);
> -       psu_mask_write(0xFF010034, 0x000000FFU, 0x00000005U);
> -       psu_mask_write(0xFF010018, 0x0000FFFFU, 0x0000008FU);
> -       psu_mask_write(0xFF010000, 0x000001FFU, 0x00000017U);
> -       psu_mask_write(0xFF010004, 0x000003FFU, 0x00000020U);
>         psu_mask_write(0xFF5E0238, 0x00040000U, 0x00000000U);
>         psu_mask_write(0xFF4B0024, 0x000000FFU, 0x000000FFU);
>         psu_mask_write(0xFFCA5000, 0x00001FFFU, 0x00000000U);
> diff --git a/board/xilinx/zynqmp/zynqmp-zcu102-rev1.1/psu_init_gpl.c b/board/xilinx/zynqmp/zynqmp-zcu102-rev1.1/psu_init_gpl.c
> index 1f3f2e66b955..f1fdc7dad1ae 100644
> --- a/board/xilinx/zynqmp/zynqmp-zcu102-rev1.1/psu_init_gpl.c
> +++ b/board/xilinx/zynqmp/zynqmp-zcu102-rev1.1/psu_init_gpl.c
> @@ -516,14 +516,6 @@ static unsigned long psu_peripherals_init_data(void)
>         psu_mask_write(0xFF5E0238, 0x00008000U, 0x00000000U);
>         psu_mask_write(0xFF5E0238, 0x00007800U, 0x00000000U);
>         psu_mask_write(0xFF5E0238, 0x00000006U, 0x00000000U);
> -       psu_mask_write(0xFF000034, 0x000000FFU, 0x0000000CU);
> -       psu_mask_write(0xFF000018, 0x0000FFFFU, 0x0000003EU);
> -       psu_mask_write(0xFF000000, 0x000001FFU, 0x00000017U);
> -       psu_mask_write(0xFF000004, 0x000003FFU, 0x00000020U);
> -       psu_mask_write(0xFF010034, 0x000000FFU, 0x0000000CU);
> -       psu_mask_write(0xFF010018, 0x0000FFFFU, 0x0000003EU);
> -       psu_mask_write(0xFF010000, 0x000001FFU, 0x00000017U);
> -       psu_mask_write(0xFF010004, 0x000003FFU, 0x00000020U);
>         psu_mask_write(0xFF5E0238, 0x00040000U, 0x00000000U);
>         psu_mask_write(0xFF4B0024, 0x000000FFU, 0x000000FFU);
>         psu_mask_write(0xFFCA5000, 0x00001FFFU, 0x00000000U);
> diff --git a/board/xilinx/zynqmp/zynqmp-zcu111-revA/psu_init_gpl.c b/board/xilinx/zynqmp/zynqmp-zcu111-revA/psu_init_gpl.c
> index 7c6664dc988c..8963aa4a0735 100644
> --- a/board/xilinx/zynqmp/zynqmp-zcu111-revA/psu_init_gpl.c
> +++ b/board/xilinx/zynqmp/zynqmp-zcu111-revA/psu_init_gpl.c
> @@ -512,14 +512,6 @@ static unsigned long psu_peripherals_init_data(void)
>         psu_mask_write(0xFF5E0238, 0x00008000U, 0x00000000U);
>         psu_mask_write(0xFF5E0238, 0x00007800U, 0x00000000U);
>         psu_mask_write(0xFF5E0238, 0x00000006U, 0x00000000U);
> -       psu_mask_write(0xFF000034, 0x000000FFU, 0x00000005U);
> -       psu_mask_write(0xFF000018, 0x0000FFFFU, 0x0000008FU);
> -       psu_mask_write(0xFF000000, 0x000001FFU, 0x00000017U);
> -       psu_mask_write(0xFF000004, 0x000003FFU, 0x00000020U);
> -       psu_mask_write(0xFF010034, 0x000000FFU, 0x00000005U);
> -       psu_mask_write(0xFF010018, 0x0000FFFFU, 0x0000008FU);
> -       psu_mask_write(0xFF010000, 0x000001FFU, 0x00000017U);
> -       psu_mask_write(0xFF010004, 0x000003FFU, 0x00000020U);
>         psu_mask_write(0xFF5E0238, 0x00040000U, 0x00000000U);
>         psu_mask_write(0xFF4B0024, 0x000000FFU, 0x000000FFU);
>         psu_mask_write(0xFFCA5000, 0x00001FFFU, 0x00000000U);
> diff --git a/board/xilinx/zynqmp/zynqmp-zcu208-revA/psu_init_gpl.c b/board/xilinx/zynqmp/zynqmp-zcu208-revA/psu_init_gpl.c
> index f07e60abb860..2adcad04d86d 100644
> --- a/board/xilinx/zynqmp/zynqmp-zcu208-revA/psu_init_gpl.c
> +++ b/board/xilinx/zynqmp/zynqmp-zcu208-revA/psu_init_gpl.c
> @@ -513,10 +513,6 @@ static unsigned long psu_peripherals_init_data(void)
>         psu_mask_write(0xFF5E0238, 0x00008000U, 0x00000000U);
>         psu_mask_write(0xFF5E0238, 0x00007800U, 0x00000000U);
>         psu_mask_write(0xFF5E0238, 0x00000002U, 0x00000000U);
> -       psu_mask_write(0xFF000034, 0x000000FFU, 0x00000006U);
> -       psu_mask_write(0xFF000018, 0x0000FFFFU, 0x0000007CU);
> -       psu_mask_write(0xFF000000, 0x000001FFU, 0x00000017U);
> -       psu_mask_write(0xFF000004, 0x000003FFU, 0x00000020U);
>         psu_mask_write(0xFF5E0238, 0x00040000U, 0x00000000U);
>         psu_mask_write(0xFF4B0024, 0x000000FFU, 0x000000FFU);
>         psu_mask_write(0xFFCA5000, 0x00001FFFU, 0x00000000U);
> diff --git a/board/xilinx/zynqmp/zynqmp-zcu216-revA/psu_init_gpl.c b/board/xilinx/zynqmp/zynqmp-zcu216-revA/psu_init_gpl.c
> index fc3605d602e7..bd316872eb33 100644
> --- a/board/xilinx/zynqmp/zynqmp-zcu216-revA/psu_init_gpl.c
> +++ b/board/xilinx/zynqmp/zynqmp-zcu216-revA/psu_init_gpl.c
> @@ -513,10 +513,6 @@ static unsigned long psu_peripherals_init_data(void)
>         psu_mask_write(0xFF5E0238, 0x00008000U, 0x00000000U);
>         psu_mask_write(0xFF5E0238, 0x00007800U, 0x00000000U);
>         psu_mask_write(0xFF5E0238, 0x00000002U, 0x00000000U);
> -       psu_mask_write(0xFF000034, 0x000000FFU, 0x00000006U);
> -       psu_mask_write(0xFF000018, 0x0000FFFFU, 0x0000007CU);
> -       psu_mask_write(0xFF000000, 0x000001FFU, 0x00000017U);
> -       psu_mask_write(0xFF000004, 0x000003FFU, 0x00000020U);
>         psu_mask_write(0xFF5E0238, 0x00040000U, 0x00000000U);
>         psu_mask_write(0xFF4B0024, 0x000000FFU, 0x000000FFU);
>         psu_mask_write(0xFFCA5000, 0x00001FFFU, 0x00000000U);
> --
> 2.35.1
>

Applied.
M

-- 
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Xilinx Microblaze
Maintainer of Linux kernel - Xilinx Zynq ARM and ZynqMP ARM64 SoCs
U-Boot custodian - Xilinx Microblaze/Zynq/ZynqMP/Versal SoCs


More information about the U-Boot mailing list