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 <michal.simek@xilinx.com>

diff --git a/arch/arm/cpu/armv8/zynqmp/clk.c b/arch/arm/cpu/armv8/zynqmp/clk.c
index 9147fa749507f32bb1c37d1dd5f074c23c4768df..9218586e94a3bf0a26c92af13900856a32144f00 100644 (file)
--- 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 4f623f962b31daa6816fa3dea9c8b1b6930d0a54..64eb5a98c94fd1aeb4558edacec07b9b9314b2a8 100644 (file)
--- 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 f70d0200c2c7cae24685528165eb1ff4aef34b4c..c0f26517851e87dd996eb1cc40c466e6363df740 100644 (file)
--- 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 d66e68b034459f7f8e67f8016cb5d52327929af4..eb67dbb1a16cc659ac4087ab97d7387afc7a4e0c 100644 (file)
--- 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" \