[PATCH] Revert "board: zynqmp: Fix for wrong AMS setting by ROM"

[PATCH] Revert "board: zynqmp: Fix for wrong AMS setting by ROM"

[Michal Simek]

From: T Karthik Reddy <t.karthik.reddy@xilinx.com>

This reverts commit dfbe492edef421de09617dc26805fc428440924e.
Analog bus control register should be programmed in SPL only. This commit
3414712ba8a ("arm64: zynqmp: Writing correct value to ANALOG_BUS") is
programming the same. So revert this commit.

Signed-off-by: T Karthik Reddy <t.karthik.reddy@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---

 board/xilinx/zynqmp/zynqmp.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/board/xilinx/zynqmp/zynqmp.c b/board/xilinx/zynqmp/zynqmp.c
index 70b3c81f1284..bc2090941d90 100644
--- a/board/xilinx/zynqmp/zynqmp.c
+++ b/board/xilinx/zynqmp/zynqmp.c
@@ -399,9 +399,6 @@ static void print_secure_boot(void)
 	       status & ZYNQMP_CSU_STATUS_ENCRYPTED ? "" : "not ");
 }
 
-#define PS_SYSMON_ANALOG_BUS_VAL	0x3210
-#define PS_SYSMON_ANALOG_BUS_REG	0xFFA50914
-
 int board_init(void)
 {
 #if defined(CONFIG_ZYNQMP_FIRMWARE)
@@ -429,9 +426,6 @@ int board_init(void)
 
 	printf("EL Level:\tEL%d\n", current_el());
 
-	/* Bug in ROM sets wrong value in this register */
-	writel(PS_SYSMON_ANALOG_BUS_VAL, PS_SYSMON_ANALOG_BUS_REG);
-
 #if CONFIG_IS_ENABLED(FPGA) && defined(CONFIG_FPGA_ZYNQMPPL)
 	zynqmppl.name = zynqmp_get_silicon_idcode_name();
 	printf("Chip ID:\t%s\n", zynqmppl.name);
-- 
2.35.1

Re: [PATCH] Revert "board: zynqmp: Fix for wrong AMS setting by ROM"

[Michal Simek]

st 23. 2. 2022 v 15:01 odesílatel Michal Simek <michal.simek@xilinx.com> napsal:
>
> From: T Karthik Reddy <t.karthik.reddy@xilinx.com>
>
> This reverts commit dfbe492edef421de09617dc26805fc428440924e.
> Analog bus control register should be programmed in SPL only. This commit
> 3414712ba8a ("arm64: zynqmp: Writing correct value to ANALOG_BUS") is
> programming the same. So revert this commit.
>
> Signed-off-by: T Karthik Reddy <t.karthik.reddy@xilinx.com>
> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
> ---
>
>  board/xilinx/zynqmp/zynqmp.c | 6 ------
>  1 file changed, 6 deletions(-)
>
> diff --git a/board/xilinx/zynqmp/zynqmp.c b/board/xilinx/zynqmp/zynqmp.c
> index 70b3c81f1284..bc2090941d90 100644
> --- a/board/xilinx/zynqmp/zynqmp.c
> +++ b/board/xilinx/zynqmp/zynqmp.c
> @@ -399,9 +399,6 @@ static void print_secure_boot(void)
>                status & ZYNQMP_CSU_STATUS_ENCRYPTED ? "" : "not ");
>  }
>
> -#define PS_SYSMON_ANALOG_BUS_VAL       0x3210
> -#define PS_SYSMON_ANALOG_BUS_REG       0xFFA50914
> -
>  int board_init(void)
>  {
>  #if defined(CONFIG_ZYNQMP_FIRMWARE)
> @@ -429,9 +426,6 @@ int board_init(void)
>
>         printf("EL Level:\tEL%d\n", current_el());
>
> -       /* Bug in ROM sets wrong value in this register */
> -       writel(PS_SYSMON_ANALOG_BUS_VAL, PS_SYSMON_ANALOG_BUS_REG);
> -
>  #if CONFIG_IS_ENABLED(FPGA) && defined(CONFIG_FPGA_ZYNQMPPL)
>         zynqmppl.name = zynqmp_get_silicon_idcode_name();
>         printf("Chip ID:\t%s\n", zynqmppl.name);
> --
> 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