From dc6795b3604e1a1533e7f9eabe31a70c0fef16b4 Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Mon, 20 Apr 2015 14:07:00 +0200 Subject: [PATCH] zynqmp: Fix veloce for RTL5.4 Command: DTS file has changed a little bit that's why fix veloce booting command to reflect these changes. Do not use fdt_addr variable and hardcode FDT address because it is used in Veloce boot script. Also fix uart baudrate setup to use 4800bps and 48kHz input clock based on Veloce 5.4 spec. Signed-off-by: Michal Simek --- arch/arm/cpu/armv8/zynqmp/clk.c | 2 +- board/xilinx/zynqmp/zynqmp.c | 2 +- drivers/serial/serial_zynq.c | 2 +- include/configs/xilinx_zynqmp.h | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/arch/arm/cpu/armv8/zynqmp/clk.c b/arch/arm/cpu/armv8/zynqmp/clk.c index 9147fa74950..9218586e94a 100644 --- a/arch/arm/cpu/armv8/zynqmp/clk.c +++ b/arch/arm/cpu/armv8/zynqmp/clk.c @@ -18,7 +18,7 @@ unsigned long get_uart_clk(int dev_id) switch (ver) { case ZYNQMP_CSU_VERSION_VELOCE: - return 96000; + return 48000; case ZYNQMP_CSU_VERSION_EP108: return 25000000; } diff --git a/board/xilinx/zynqmp/zynqmp.c b/board/xilinx/zynqmp/zynqmp.c index 4f623f962b3..64eb5a98c94 100644 --- a/board/xilinx/zynqmp/zynqmp.c +++ b/board/xilinx/zynqmp/zynqmp.c @@ -115,7 +115,7 @@ int board_late_init(void) switch (ver) { case ZYNQMP_CSU_VERSION_VELOCE: - setenv("baudrate", "9600"); + setenv("baudrate", "4800"); setenv("bootcmd", "run veloce"); case ZYNQMP_CSU_VERSION_EP108: setenv("serverip", "10.10.70.101"); diff --git a/drivers/serial/serial_zynq.c b/drivers/serial/serial_zynq.c index f70d0200c2c..c0f26517851 100644 --- a/drivers/serial/serial_zynq.c +++ b/drivers/serial/serial_zynq.c @@ -54,7 +54,7 @@ static void uart_zynq_serial_setbrg(const int port) /* Covering case where input clock is so slow */ if (clock < 1000000 && gd->baudrate > 9600) - gd->baudrate = 9600; + gd->baudrate = 4800; baud = gd->baudrate; diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index d66e68b0344..eb67dbb1a16 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -144,10 +144,10 @@ "fdt_addr=0x7000000\0" \ "fdt_high=0x10000000\0" \ "sata_root=if test $scsidevs -gt 0; then setenv bootargs $bootargs root=/dev/sda rw rootfstype=ext4; fi\0" \ - "veloce=fdt addr $fdt_addr && " \ - "fdt set /amba/misc_clk clock-frequency <96000> && "\ - "fdt set /amba_apu/timer clock-frequency <480000> && " \ - "fdt set /amba/i2c_clk clock-frequency <480000> && " \ + "veloce=fdt addr f000000 && " \ + "fdt set /amba/misc_clk clock-frequency <48000> && "\ + "fdt set /timer clock-frequency <240000> && " \ + "fdt set /amba/i2c_clk clock-frequency <240000> && " \ "booti 80000 - f000000\0" \ "netboot=tftpboot 80000 Image && tftpboot $fdt_addr system.dtb && " \ "booti 80000 - $fdt_addr\0" \ -- 2.47.3