Re: [U-Boot] [PATCH 4/4] board: topic-miamiplus: Run IO PLL at 1000 MHz

2018-09-07 Thread Michal Simek
On 24.8.2018 14:00, Mike Looijmans wrote:
> The miamiplus can use GEM0 through MIO pins, which requires a 125 MHz TX
> clock to be generated. With the IO PLL at 1200 MHz this isn't possible, so
> change it to run at 1000 and adjust the divisors accordingly. Also set the
> GEM0 clock source to MIO instead of EMIO.
> 
> Signed-off-by: Mike Looijmans 
> ---
>  .../topic/zynq/zynq-topic-miamiplus/ps7_init_gpl.c | 30 
> ++
>  1 file changed, 14 insertions(+), 16 deletions(-)
> 
> diff --git a/board/topic/zynq/zynq-topic-miamiplus/ps7_init_gpl.c 
> b/board/topic/zynq/zynq-topic-miamiplus/ps7_init_gpl.c
> index fd5846a..d90a350 100644
> --- a/board/topic/zynq/zynq-topic-miamiplus/ps7_init_gpl.c
> +++ b/board/topic/zynq/zynq-topic-miamiplus/ps7_init_gpl.c
> @@ -24,8 +24,8 @@ static unsigned long ps7_pll_init_data_3_0[] = {
>   EMIT_MASKPOLL(0XF800010C, 0x0002U),
>   EMIT_MASKWRITE(0XF8000104, 0x0010U, 0xU),
>   EMIT_MASKWRITE(0XF8000124, 0xFFF3U, 0x0C23U),
> - EMIT_MASKWRITE(0XF8000118, 0x0030U, 0x00113220U),
> - EMIT_MASKWRITE(0XF8000108, 0x0007F000U, 0x00024000U),
> + EMIT_MASKWRITE(0XF8000118, 0x0030U, 0x001452C0U),
> + EMIT_MASKWRITE(0XF8000108, 0x0007F000U, 0x0001E000U),
>   EMIT_MASKWRITE(0XF8000108, 0x0010U, 0x0010U),
>   EMIT_MASKWRITE(0XF8000108, 0x0001U, 0x0001U),
>   EMIT_MASKWRITE(0XF8000108, 0x0001U, 0xU),
> @@ -37,20 +37,18 @@ static unsigned long ps7_pll_init_data_3_0[] = {
>  
>  static unsigned long ps7_clock_init_data_3_0[] = {
>   EMIT_MASKWRITE(0XF808, 0xU, 0xDF0DU),
> - EMIT_MASKWRITE(0XF8000128, 0x03F03F01U, 0x00302301U),
> - EMIT_MASKWRITE(0XF8000138, 0x0011U, 0x0011U),
> + EMIT_MASKWRITE(0XF8000128, 0x03F03F01U, 0x00700F01U),
> + EMIT_MASKWRITE(0XF8000138, 0x0011U, 0x0001U),
>   EMIT_MASKWRITE(0XF800013C, 0x0011U, 0x0011U),
> - EMIT_MASKWRITE(0XF8000140, 0x03F03F71U, 0x00100141U),
> - EMIT_MASKWRITE(0XF8000144, 0x03F03F71U, 0x00100141U),
> - EMIT_MASKWRITE(0XF8000148, 0x3F31U, 0x0C01U),
> - EMIT_MASKWRITE(0XF800014C, 0x3F31U, 0x0601U),
> - EMIT_MASKWRITE(0XF8000150, 0x3F33U, 0x1803U),
> - EMIT_MASKWRITE(0XF8000154, 0x3F33U, 0x0C03U),
> - EMIT_MASKWRITE(0XF8000158, 0x3F33U, 0x0601U),
> - EMIT_MASKWRITE(0XF8000168, 0x3F31U, 0x0601U),
> - EMIT_MASKWRITE(0XF8000170, 0x03F03F30U, 0x00100C00U),
> - EMIT_MASKWRITE(0XF8000180, 0x03F03F30U, 0x00100C00U),
> - EMIT_MASKWRITE(0XF8000190, 0x03F03F30U, 0x00100600U),
> + EMIT_MASKWRITE(0XF8000140, 0x03F03F71U, 0x00100801U),
> + EMIT_MASKWRITE(0XF800014C, 0x3F31U, 0x0501U),
> + EMIT_MASKWRITE(0XF8000150, 0x3F33U, 0x0A01U),
> + EMIT_MASKWRITE(0XF8000154, 0x3F33U, 0x0A03U),
> + EMIT_MASKWRITE(0XF8000158, 0x3F33U, 0x0501U),
> + EMIT_MASKWRITE(0XF8000168, 0x3F31U, 0x0501U),
> + EMIT_MASKWRITE(0XF8000170, 0x03F03F30U, 0x00200500U),
> + EMIT_MASKWRITE(0XF8000180, 0x03F03F30U, 0x00100700U),
> + EMIT_MASKWRITE(0XF8000190, 0x03F03F30U, 0x00100500U),
>   EMIT_MASKWRITE(0XF80001A0, 0x03F03F30U, 0x00101800U),
>   EMIT_MASKWRITE(0XF80001C4, 0x0001U, 0x0001U),
>   EMIT_MASKWRITE(0XF800012C, 0x01FFCCCDU, 0x01FC4C4DU),
> @@ -88,7 +86,7 @@ static unsigned long ps7_ddr_init_data_3_0[] = {
>   EMIT_MASKWRITE(0XF8006078, 0x03FFU, 0x00466111U),
>   EMIT_MASKWRITE(0XF800607C, 0x000FU, 0x0003U),
>   EMIT_MASKWRITE(0XF80060A4, 0xU, 0x10200802U),
> - EMIT_MASKWRITE(0XF80060A8, 0x0FFFU, 0x0690CB73U),
> + EMIT_MASKWRITE(0XF80060A8, 0x0FFFU, 0x0690CB52U),
>   EMIT_MASKWRITE(0XF80060AC, 0x01FFU, 0x01FEU),
>   EMIT_MASKWRITE(0XF80060B0, 0x1FFFU, 0x1CFFU),
>   EMIT_MASKWRITE(0XF80060B4, 0x0200U, 0x0200U),
> 

also good.

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 SoCs




signature.asc
Description: OpenPGP digital signature
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot


[U-Boot] [PATCH 4/4] board: topic-miamiplus: Run IO PLL at 1000 MHz

2018-08-24 Thread Mike Looijmans
The miamiplus can use GEM0 through MIO pins, which requires a 125 MHz TX
clock to be generated. With the IO PLL at 1200 MHz this isn't possible, so
change it to run at 1000 and adjust the divisors accordingly. Also set the
GEM0 clock source to MIO instead of EMIO.

Signed-off-by: Mike Looijmans 
---
 .../topic/zynq/zynq-topic-miamiplus/ps7_init_gpl.c | 30 ++
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/board/topic/zynq/zynq-topic-miamiplus/ps7_init_gpl.c 
b/board/topic/zynq/zynq-topic-miamiplus/ps7_init_gpl.c
index fd5846a..d90a350 100644
--- a/board/topic/zynq/zynq-topic-miamiplus/ps7_init_gpl.c
+++ b/board/topic/zynq/zynq-topic-miamiplus/ps7_init_gpl.c
@@ -24,8 +24,8 @@ static unsigned long ps7_pll_init_data_3_0[] = {
EMIT_MASKPOLL(0XF800010C, 0x0002U),
EMIT_MASKWRITE(0XF8000104, 0x0010U, 0xU),
EMIT_MASKWRITE(0XF8000124, 0xFFF3U, 0x0C23U),
-   EMIT_MASKWRITE(0XF8000118, 0x0030U, 0x00113220U),
-   EMIT_MASKWRITE(0XF8000108, 0x0007F000U, 0x00024000U),
+   EMIT_MASKWRITE(0XF8000118, 0x0030U, 0x001452C0U),
+   EMIT_MASKWRITE(0XF8000108, 0x0007F000U, 0x0001E000U),
EMIT_MASKWRITE(0XF8000108, 0x0010U, 0x0010U),
EMIT_MASKWRITE(0XF8000108, 0x0001U, 0x0001U),
EMIT_MASKWRITE(0XF8000108, 0x0001U, 0xU),
@@ -37,20 +37,18 @@ static unsigned long ps7_pll_init_data_3_0[] = {
 
 static unsigned long ps7_clock_init_data_3_0[] = {
EMIT_MASKWRITE(0XF808, 0xU, 0xDF0DU),
-   EMIT_MASKWRITE(0XF8000128, 0x03F03F01U, 0x00302301U),
-   EMIT_MASKWRITE(0XF8000138, 0x0011U, 0x0011U),
+   EMIT_MASKWRITE(0XF8000128, 0x03F03F01U, 0x00700F01U),
+   EMIT_MASKWRITE(0XF8000138, 0x0011U, 0x0001U),
EMIT_MASKWRITE(0XF800013C, 0x0011U, 0x0011U),
-   EMIT_MASKWRITE(0XF8000140, 0x03F03F71U, 0x00100141U),
-   EMIT_MASKWRITE(0XF8000144, 0x03F03F71U, 0x00100141U),
-   EMIT_MASKWRITE(0XF8000148, 0x3F31U, 0x0C01U),
-   EMIT_MASKWRITE(0XF800014C, 0x3F31U, 0x0601U),
-   EMIT_MASKWRITE(0XF8000150, 0x3F33U, 0x1803U),
-   EMIT_MASKWRITE(0XF8000154, 0x3F33U, 0x0C03U),
-   EMIT_MASKWRITE(0XF8000158, 0x3F33U, 0x0601U),
-   EMIT_MASKWRITE(0XF8000168, 0x3F31U, 0x0601U),
-   EMIT_MASKWRITE(0XF8000170, 0x03F03F30U, 0x00100C00U),
-   EMIT_MASKWRITE(0XF8000180, 0x03F03F30U, 0x00100C00U),
-   EMIT_MASKWRITE(0XF8000190, 0x03F03F30U, 0x00100600U),
+   EMIT_MASKWRITE(0XF8000140, 0x03F03F71U, 0x00100801U),
+   EMIT_MASKWRITE(0XF800014C, 0x3F31U, 0x0501U),
+   EMIT_MASKWRITE(0XF8000150, 0x3F33U, 0x0A01U),
+   EMIT_MASKWRITE(0XF8000154, 0x3F33U, 0x0A03U),
+   EMIT_MASKWRITE(0XF8000158, 0x3F33U, 0x0501U),
+   EMIT_MASKWRITE(0XF8000168, 0x3F31U, 0x0501U),
+   EMIT_MASKWRITE(0XF8000170, 0x03F03F30U, 0x00200500U),
+   EMIT_MASKWRITE(0XF8000180, 0x03F03F30U, 0x00100700U),
+   EMIT_MASKWRITE(0XF8000190, 0x03F03F30U, 0x00100500U),
EMIT_MASKWRITE(0XF80001A0, 0x03F03F30U, 0x00101800U),
EMIT_MASKWRITE(0XF80001C4, 0x0001U, 0x0001U),
EMIT_MASKWRITE(0XF800012C, 0x01FFCCCDU, 0x01FC4C4DU),
@@ -88,7 +86,7 @@ static unsigned long ps7_ddr_init_data_3_0[] = {
EMIT_MASKWRITE(0XF8006078, 0x03FFU, 0x00466111U),
EMIT_MASKWRITE(0XF800607C, 0x000FU, 0x0003U),
EMIT_MASKWRITE(0XF80060A4, 0xU, 0x10200802U),
-   EMIT_MASKWRITE(0XF80060A8, 0x0FFFU, 0x0690CB73U),
+   EMIT_MASKWRITE(0XF80060A8, 0x0FFFU, 0x0690CB52U),
EMIT_MASKWRITE(0XF80060AC, 0x01FFU, 0x01FEU),
EMIT_MASKWRITE(0XF80060B0, 0x1FFFU, 0x1CFFU),
EMIT_MASKWRITE(0XF80060B4, 0x0200U, 0x0200U),
-- 
1.9.1

___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot