From a564b342c4c2c30fa6d22476b0c5872a1845a367 Mon Sep 17 00:00:00 2001 From: Johannes Schlatow Date: Fri, 23 Mar 2018 13:58:12 +0100 Subject: [PATCH] zynq: fix private timer clk in board defs Fixes #107 --- include/drivers/defs/zynq_parallella.h | 3 ++- include/drivers/defs/zynq_zc702.h | 3 ++- include/drivers/defs/zynq_zc706.h | 3 ++- include/drivers/defs/zynq_zedboard.h | 4 ++-- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/include/drivers/defs/zynq_parallella.h b/include/drivers/defs/zynq_parallella.h index 4fcb885..c59517e 100644 --- a/include/drivers/defs/zynq_parallella.h +++ b/include/drivers/defs/zynq_parallella.h @@ -24,10 +24,11 @@ namespace Zynq_parallella { /* clocks (assuming 6:2:1 mode) */ PS_CLOCK = 33333333, CPU_1X_CLOCK = 111111100, + CPU_3X2X_CLOCK = 3*CPU_1X_CLOCK, CPU_6X4X_CLOCK = 6*CPU_1X_CLOCK, CORTEX_A9_CLOCK = CPU_6X4X_CLOCK, - CORTEX_A9_PRIVATE_TIMER_CLK = CORTEX_A9_CLOCK, + CORTEX_A9_PRIVATE_TIMER_CLK = CPU_3X2X_CLOCK, CORTEX_A9_PRIVATE_TIMER_DIV = 100, SDHCI_BASE = MMIO_0_BASE + 0x101000, diff --git a/include/drivers/defs/zynq_zc702.h b/include/drivers/defs/zynq_zc702.h index 972a92d..7f72820 100644 --- a/include/drivers/defs/zynq_zc702.h +++ b/include/drivers/defs/zynq_zc702.h @@ -23,10 +23,11 @@ namespace Zynq_zc702 { enum { /* clocks (assuming 6:2:1 mode) */ CPU_1X_CLOCK = 111111100, + CPU_3X2X_CLOCK = 3*CPU_1X_CLOCK, CPU_6X4X_CLOCK = 6*CPU_1X_CLOCK, CORTEX_A9_CLOCK = CPU_6X4X_CLOCK, - CORTEX_A9_PRIVATE_TIMER_CLK = CORTEX_A9_CLOCK, + CORTEX_A9_PRIVATE_TIMER_CLK = CPU_3X2X_CLOCK, CORTEX_A9_PRIVATE_TIMER_DIV = 100, SDHCI_BASE = MMIO_0_BASE + 0x100000, diff --git a/include/drivers/defs/zynq_zc706.h b/include/drivers/defs/zynq_zc706.h index c031956..dceca8c 100644 --- a/include/drivers/defs/zynq_zc706.h +++ b/include/drivers/defs/zynq_zc706.h @@ -23,10 +23,11 @@ namespace Zynq_zc706 { enum { /* clocks (assuming 6:2:1 mode) */ CPU_1X_CLOCK = 111111100, + CPU_3X2X_CLOCK = 3*CPU_1X_CLOCK, CPU_6X4X_CLOCK = 6*CPU_1X_CLOCK, CORTEX_A9_CLOCK = CPU_6X4X_CLOCK, - CORTEX_A9_PRIVATE_TIMER_CLK = CORTEX_A9_CLOCK, + CORTEX_A9_PRIVATE_TIMER_CLK = CPU_3X2X_CLOCK, CORTEX_A9_PRIVATE_TIMER_DIV = 100, SDHCI_BASE = MMIO_0_BASE + 0x100000, diff --git a/include/drivers/defs/zynq_zedboard.h b/include/drivers/defs/zynq_zedboard.h index 180fa5b..a4d3320 100644 --- a/include/drivers/defs/zynq_zedboard.h +++ b/include/drivers/defs/zynq_zedboard.h @@ -33,8 +33,8 @@ namespace Zynq_zedboard { UART_1_MMIO_BASE = MMIO_0_BASE + UART_SIZE, - CORTEX_A9_CLOCK = CPU_6X4X_CLOCK, - CORTEX_A9_PRIVATE_TIMER_CLK = CORTEX_A9_CLOCK, + CORTEX_A9_CLOCK = CPU_6X4X_CLOCK, + CORTEX_A9_PRIVATE_TIMER_CLK = CPU_3X2X_CLOCK, CORTEX_A9_PRIVATE_TIMER_DIV = 100, RAM_0_SIZE = 0x20000000, /* 512MB */