From patchwork Fri Aug 24 12:00:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Looijmans X-Patchwork-Id: 961835 X-Patchwork-Delegate: monstr@monstr.eu Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=topic.nl Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 41xfzv31dhz9s3C for ; Fri, 24 Aug 2018 22:02:51 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 0EF5CC21E45; Fri, 24 Aug 2018 12:02:31 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 70479C21E52; Fri, 24 Aug 2018 12:01:46 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id CDCAAC21E2B; Fri, 24 Aug 2018 12:01:44 +0000 (UTC) Received: from atl4mhob09.registeredsite.com (atl4mhob09.registeredsite.com [209.17.115.47]) by lists.denx.de (Postfix) with ESMTPS id 006BCC21E34 for ; Fri, 24 Aug 2018 12:00:50 +0000 (UTC) Received: from mailpod.hostingplatform.com (atl4qobmail04pod0.registeredsite.com [10.30.71.206]) by atl4mhob09.registeredsite.com (8.14.4/8.14.4) with ESMTP id w7OC0kPX014928 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Fri, 24 Aug 2018 08:00:46 -0400 Received: (qmail 23124 invoked by uid 0); 24 Aug 2018 12:00:46 -0000 X-TCPREMOTEIP: 37.74.225.130 X-Authenticated-UID: mike@milosoftware.com Received: from unknown (HELO mikebuntu.TOPIC.LOCAL) (mike@milosoftware.com@37.74.225.130) by 0 with ESMTPA; 24 Aug 2018 12:00:46 -0000 From: Mike Looijmans To: u-boot@lists.denx.de Date: Fri, 24 Aug 2018 14:00:38 +0200 Message-Id: <1535112041-1563-2-git-send-email-mike.looijmans@topic.nl> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1535112041-1563-1-git-send-email-mike.looijmans@topic.nl> References: <1535112041-1563-1-git-send-email-mike.looijmans@topic.nl> Cc: michal.simek@xilinx.com, git@xilinx.com Subject: [U-Boot] [PATCH 1/4] topic-miamiplus: Run CPU at 800MHz for speedgrade-2 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" The miamiplus contains a speedgrade-2 device, which may run the CPU at 800MHz. Change the PLL setting to 800MHz, and adapt the setpoints in the devicetree. Signed-off-by: Mike Looijmans --- arch/arm/dts/zynq-topic-miamiplus.dts | 9 +++++++++ board/topic/zynq/zynq-topic-miamiplus/ps7_init_gpl.c | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/arch/arm/dts/zynq-topic-miamiplus.dts b/arch/arm/dts/zynq-topic-miamiplus.dts index c0ccea9..df53886 100644 --- a/arch/arm/dts/zynq-topic-miamiplus.dts +++ b/arch/arm/dts/zynq-topic-miamiplus.dts @@ -11,6 +11,15 @@ compatible = "topic,miamiplus", "xlnx,zynq-7000"; }; +/* The miamiplus contains a speedgrade-2 device and runs at 800MHz */ +&cpu0 { + operating-points = < + /* kHz uV */ + 800000 1000000 + 400000 1000000 + >; +}; + &qspi { is-dual = <1>; }; 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 c1cc1df..fd5846a 100644 --- a/board/topic/zynq/zynq-topic-miamiplus/ps7_init_gpl.c +++ b/board/topic/zynq/zynq-topic-miamiplus/ps7_init_gpl.c @@ -8,8 +8,8 @@ static unsigned long ps7_pll_init_data_3_0[] = { EMIT_MASKWRITE(0XF8000008, 0x0000FFFFU, 0x0000DF0DU), - EMIT_MASKWRITE(0XF8000110, 0x003FFFF0U, 0x000FA220U), - EMIT_MASKWRITE(0XF8000100, 0x0007F000U, 0x00028000U), + EMIT_MASKWRITE(0XF8000110, 0x003FFFF0U, 0x000FA240U), + EMIT_MASKWRITE(0XF8000100, 0x0007F000U, 0x00030000U), EMIT_MASKWRITE(0XF8000100, 0x00000010U, 0x00000010U), EMIT_MASKWRITE(0XF8000100, 0x00000001U, 0x00000001U), EMIT_MASKWRITE(0XF8000100, 0x00000001U, 0x00000000U), From patchwork Fri Aug 24 12:00:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Looijmans X-Patchwork-Id: 961838 X-Patchwork-Delegate: monstr@monstr.eu Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=topic.nl Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 41xg2B3kxwz9s3C for ; Fri, 24 Aug 2018 22:04:50 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 16D8CC21E2F; Fri, 24 Aug 2018 12:02:49 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 0B061C21E36; Fri, 24 Aug 2018 12:01:55 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 059DDC21E49; Fri, 24 Aug 2018 12:01:53 +0000 (UTC) Received: from atl4mhob12.registeredsite.com (atl4mhob12.registeredsite.com [209.17.115.50]) by lists.denx.de (Postfix) with ESMTPS id 332DCC21E36 for ; Fri, 24 Aug 2018 12:00:51 +0000 (UTC) Received: from mailpod.hostingplatform.com (atl4qobmail04pod0.registeredsite.com [10.30.71.206]) by atl4mhob12.registeredsite.com (8.14.4/8.14.4) with ESMTP id w7OC0l2h023804 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Fri, 24 Aug 2018 08:00:47 -0400 Received: (qmail 23191 invoked by uid 0); 24 Aug 2018 12:00:47 -0000 X-TCPREMOTEIP: 37.74.225.130 X-Authenticated-UID: mike@milosoftware.com Received: from unknown (HELO mikebuntu.TOPIC.LOCAL) (mike@milosoftware.com@37.74.225.130) by 0 with ESMTPA; 24 Aug 2018 12:00:47 -0000 From: Mike Looijmans To: u-boot@lists.denx.de Date: Fri, 24 Aug 2018 14:00:39 +0200 Message-Id: <1535112041-1563-3-git-send-email-mike.looijmans@topic.nl> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1535112041-1563-1-git-send-email-mike.looijmans@topic.nl> References: <1535112041-1563-1-git-send-email-mike.looijmans@topic.nl> Cc: michal.simek@xilinx.com, git@xilinx.com Subject: [U-Boot] [PATCH 2/4] board: topic_miamilite: Support cost-reduced version X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" To reduce board cost, the topic-miamilite board hardware was adapted. It now only has single QSPI NOR flash and a single DDR RAM chip. This reduces the memory interface to 16-bit and halves the available RAM and flash. Signed-off-by: Mike Looijmans --- arch/arm/dts/zynq-topic-miamilite.dts | 7 ++++--- board/topic/zynq/zynq-topic-miamilite/ps7_init_gpl.c | 14 +++++++------- board/topic/zynq/zynq-topic-miamilite/ps7_regs.txt | 14 +++++++------- include/configs/topic_miami.h | 7 +++++-- include/configs/topic_miamilite.h | 11 +++++++++++ 5 files changed, 34 insertions(+), 19 deletions(-) create mode 100644 include/configs/topic_miamilite.h diff --git a/arch/arm/dts/zynq-topic-miamilite.dts b/arch/arm/dts/zynq-topic-miamilite.dts index 366fd5b..c06549c 100644 --- a/arch/arm/dts/zynq-topic-miamilite.dts +++ b/arch/arm/dts/zynq-topic-miamilite.dts @@ -9,8 +9,9 @@ / { model = "Topic Miami Lite Zynq Board"; compatible = "topic,miamilite", "xlnx,zynq-7000"; -}; -&qspi { - is-dual = <1>; + memory@0 { + device_type = "memory"; + reg = <0x0 0x20000000>; + }; }; diff --git a/board/topic/zynq/zynq-topic-miamilite/ps7_init_gpl.c b/board/topic/zynq/zynq-topic-miamilite/ps7_init_gpl.c index afec403..28670bd 100644 --- a/board/topic/zynq/zynq-topic-miamilite/ps7_init_gpl.c +++ b/board/topic/zynq/zynq-topic-miamilite/ps7_init_gpl.c @@ -59,7 +59,7 @@ static unsigned long ps7_clock_init_data_3_0[] = { }; static unsigned long ps7_ddr_init_data_3_0[] = { - EMIT_MASKWRITE(0xF8006000, 0x0001FFFFU, 0x00000080U), + EMIT_MASKWRITE(0xF8006000, 0x0001FFFFU, 0x00000084U), EMIT_MASKWRITE(0xF8006004, 0x0007FFFFU, 0x00001081U), EMIT_MASKWRITE(0xF8006008, 0x03FFFFFFU, 0x03C0780FU), EMIT_MASKWRITE(0xF800600C, 0x03FFFFFFU, 0x02001001U), @@ -74,9 +74,9 @@ static unsigned long ps7_ddr_init_data_3_0[] = { EMIT_MASKWRITE(0xF8006030, 0xFFFFFFFFU, 0x00040930U), EMIT_MASKWRITE(0xF8006034, 0x13FF3FFFU, 0x000116D4U), EMIT_MASKWRITE(0xF8006038, 0x00000003U, 0x00000000U), - EMIT_MASKWRITE(0xF800603C, 0x000FFFFFU, 0x00000777U), - EMIT_MASKWRITE(0xF8006040, 0xFFFFFFFFU, 0xFFF00000U), - EMIT_MASKWRITE(0xF8006044, 0x0FFFFFFFU, 0x0F666666U), + EMIT_MASKWRITE(0xF800603C, 0x000FFFFFU, 0x00000666U), + EMIT_MASKWRITE(0xF8006040, 0xFFFFFFFFU, 0xFFFF0000U), + EMIT_MASKWRITE(0xF8006044, 0x0FFFFFFFU, 0x0F555555U), EMIT_MASKWRITE(0xF8006048, 0x0003F03FU, 0x0003C008U), EMIT_MASKWRITE(0xF8006050, 0xFF0F8FFFU, 0x77010800U), EMIT_MASKWRITE(0xF8006058, 0x00010000U, 0x00000000U), @@ -102,8 +102,8 @@ static unsigned long ps7_ddr_init_data_3_0[] = { EMIT_MASKWRITE(0xF8006114, 0x000000FFU, 0x00000000U), EMIT_MASKWRITE(0xF8006118, 0x7FFFFFCFU, 0x40000001U), EMIT_MASKWRITE(0xF800611C, 0x7FFFFFCFU, 0x40000001U), - EMIT_MASKWRITE(0xF8006120, 0x7FFFFFCFU, 0x40000001U), - EMIT_MASKWRITE(0xF8006124, 0x7FFFFFCFU, 0x40000001U), + EMIT_MASKWRITE(0xF8006120, 0x7FFFFFCFU, 0x40000000U), + EMIT_MASKWRITE(0xF8006124, 0x7FFFFFCFU, 0x40000000U), EMIT_MASKWRITE(0xF800612C, 0x000FFFFFU, 0x0003482CU), EMIT_MASKWRITE(0xF8006130, 0x000FFFFFU, 0x00033032U), EMIT_MASKWRITE(0xF8006134, 0x000FFFFFU, 0x0002E81FU), @@ -140,7 +140,7 @@ static unsigned long ps7_ddr_init_data_3_0[] = { EMIT_MASKWRITE(0xF80062B0, 0x003FFFFFU, 0x00005125U), EMIT_MASKWRITE(0xF80062B4, 0x0003FFFFU, 0x000012A8U), EMIT_MASKPOLL(0xF8000B74, 0x00002000U), - EMIT_MASKWRITE(0xF8006000, 0x0001FFFFU, 0x00000081U), + EMIT_MASKWRITE(0xF8006000, 0x0001FFFFU, 0x00000085U), EMIT_MASKPOLL(0xF8006054, 0x00000007U), EMIT_EXIT(), }; diff --git a/board/topic/zynq/zynq-topic-miamilite/ps7_regs.txt b/board/topic/zynq/zynq-topic-miamilite/ps7_regs.txt index db6e642..08d5344 100644 --- a/board/topic/zynq/zynq-topic-miamilite/ps7_regs.txt +++ b/board/topic/zynq/zynq-topic-miamilite/ps7_regs.txt @@ -1,5 +1,5 @@ 0xF8000120 0x1F000200 // ARM_CLK_CTRL - divisor = 2 433 MHz (?) -0xf8000700 0x202 +0xf8000700 0x200 0xf8000704 0x202 0xf8000708 0x202 0xf800070c 0x202 @@ -8,11 +8,11 @@ 0xf8000718 0x202 0xf800071c 0x200 0xf8000720 0x202 -0xf8000724 0x202 -0xf8000728 0x202 -0xf800072c 0x202 -0xf8000730 0x202 -0xf8000734 0x202 +0xf8000724 0x200 +0xf8000728 0x200 +0xf800072c 0x200 +0xf8000730 0x200 +0xf8000734 0x200 0xf8000738 0x12e1 0xf800073c 0x12e0 0xf8000740 0x1200 @@ -58,4 +58,4 @@ 0xF800014C 0x00000621 // LQSPI_CLK_CTRL - ARMPLL/6 (200 MHz) 0xE000D000 0x800238C1 // QSPI config - divide-by-2 0xE000D038 0x00000020 // QSPI loopback - internal, 0 delay -0xE000D0A0 0xE2FF06EB // LQSPI_CFG - Quad read, dual flash +0xE000D0A0 0x82FF04EB // LQSPI_CFG - QIOREAD mode, Numonyx/Micron diff --git a/include/configs/topic_miami.h b/include/configs/topic_miami.h index f14c4ee..c32c63c 100644 --- a/include/configs/topic_miami.h +++ b/include/configs/topic_miami.h @@ -57,9 +57,12 @@ /* Setup proper boot sequences for Miami boards */ #if defined(CONFIG_USB) +# ifndef ENV_USB_RESET +# define ENV_USB_RESET "i2c dev 1 && i2c mw 41 1 ff && i2c mw 41 3 fe && "\ + "i2c mw 41 1 fe && i2c mw 41 1 ff" +# endif # define EXTRA_ENV_USB \ - "usbreset=i2c dev 1 && i2c mw 41 1 ff && i2c mw 41 3 fe && "\ - "i2c mw 41 1 fe && i2c mw 41 1 ff\0" \ + "usbreset=" ENV_USB_RESET "\0" \ "usbboot=run usbreset && if usb start; then " \ "echo Booting from USB... && " \ "if load usb 0 0x1900000 ${bootscript}; then "\ diff --git a/include/configs/topic_miamilite.h b/include/configs/topic_miamilite.h new file mode 100644 index 0000000..7ec48d4 --- /dev/null +++ b/include/configs/topic_miamilite.h @@ -0,0 +1,11 @@ +/* + * (C) Copyright 2017 Topic Embedded Products + * + * Configuration for Miami Lite Zynq Evaluation and Development Board + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +/* USB reset is on GPIO signal instead of expander */ +#define ENV_USB_RESET "gpio clear 0 && gpio set 0" +#include "topic_miami.h" From patchwork Fri Aug 24 12:00:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Looijmans X-Patchwork-Id: 961836 X-Patchwork-Delegate: monstr@monstr.eu Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=topic.nl Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 41xg124jKtz9s4c for ; Fri, 24 Aug 2018 22:03:50 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 587AFC21E2B; Fri, 24 Aug 2018 12:03:07 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id B8FF6C21DD3; Fri, 24 Aug 2018 12:01:55 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 1DDF2C21E18; Fri, 24 Aug 2018 12:01:54 +0000 (UTC) Received: from atl4mhob06.registeredsite.com (atl4mhob06.registeredsite.com [209.17.115.44]) by lists.denx.de (Postfix) with ESMTPS id A899EC21E31 for ; Fri, 24 Aug 2018 12:00:52 +0000 (UTC) Received: from mailpod.hostingplatform.com (atl4qobmail04pod0.registeredsite.com [10.30.71.206]) by atl4mhob06.registeredsite.com (8.14.4/8.14.4) with ESMTP id w7OC0mkM029208 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Fri, 24 Aug 2018 08:00:48 -0400 Received: (qmail 23254 invoked by uid 0); 24 Aug 2018 12:00:48 -0000 X-TCPREMOTEIP: 37.74.225.130 X-Authenticated-UID: mike@milosoftware.com Received: from unknown (HELO mikebuntu.TOPIC.LOCAL) (mike@milosoftware.com@37.74.225.130) by 0 with ESMTPA; 24 Aug 2018 12:00:48 -0000 From: Mike Looijmans To: u-boot@lists.denx.de Date: Fri, 24 Aug 2018 14:00:40 +0200 Message-Id: <1535112041-1563-4-git-send-email-mike.looijmans@topic.nl> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1535112041-1563-1-git-send-email-mike.looijmans@topic.nl> References: <1535112041-1563-1-git-send-email-mike.looijmans@topic.nl> Cc: michal.simek@xilinx.com, git@xilinx.com Subject: [U-Boot] [PATCH 3/4] configs/topic_miami.h: Use same partitioning for USB boot as for SD X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Use the same partitioning as the SD card by default. This allows to insert an SD card into a USB reader or use an USB drive with the same partitioning and boot using that instead of requiring a ramdisk image. Signed-off-by: Mike Looijmans --- include/configs/topic_miami.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/include/configs/topic_miami.h b/include/configs/topic_miami.h index c32c63c..6f8f2b4 100644 --- a/include/configs/topic_miami.h +++ b/include/configs/topic_miami.h @@ -63,15 +63,15 @@ # endif # define EXTRA_ENV_USB \ "usbreset=" ENV_USB_RESET "\0" \ - "usbboot=run usbreset && if usb start; then " \ + "usbboot=run usbreset; if usb start; then " \ "echo Booting from USB... && " \ "if load usb 0 0x1900000 ${bootscript}; then "\ "source 0x1900000; fi; " \ - "load usb 0 ${kernel_addr} ${kernel_image} && " \ - "load usb 0 ${devicetree_addr} ${devicetree_image} && " \ - "load usb 0 ${ramdisk_load_address} ${ramdisk_image} && " \ - "bootm ${kernel_addr} ${ramdisk_load_address} "\ - "${devicetree_addr}; " \ + "setenv bootargs console=ttyPS0,115200 " \ + "root=/dev/sda2 rw rootfstype=ext4 rootwait quiet; " \ + "load usb 0 ${kernel_addr} ${kernel_image}&& " \ + "load usb 0 ${devicetree_addr} ${devicetree_image}&& " \ + "bootm ${kernel_addr} - ${devicetree_addr}; " \ "fi\0" /* Note that addresses here should match the addresses in the env */ # undef DFU_ALT_INFO From patchwork Fri Aug 24 12:00:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Looijmans X-Patchwork-Id: 961837 X-Patchwork-Delegate: monstr@monstr.eu Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=topic.nl Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 41xg211HNsz9s3C for ; Fri, 24 Aug 2018 22:04:40 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id B058DC21E47; Fri, 24 Aug 2018 12:03:23 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=RCVD_IN_MSPIKE_H2 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id BAE56C21E79; Fri, 24 Aug 2018 12:01:59 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 432ACC21E76; Fri, 24 Aug 2018 12:01:58 +0000 (UTC) Received: from atl4mhob15.registeredsite.com (atl4mhob15.registeredsite.com [209.17.115.53]) by lists.denx.de (Postfix) with ESMTPS id 0F1E0C21E39 for ; Fri, 24 Aug 2018 12:00:52 +0000 (UTC) Received: from mailpod.hostingplatform.com (atl4qobmail04pod0.registeredsite.com [10.30.71.206]) by atl4mhob15.registeredsite.com (8.14.4/8.14.4) with ESMTP id w7OC0noJ024406 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Fri, 24 Aug 2018 08:00:49 -0400 Received: (qmail 23307 invoked by uid 0); 24 Aug 2018 12:00:49 -0000 X-TCPREMOTEIP: 37.74.225.130 X-Authenticated-UID: mike@milosoftware.com Received: from unknown (HELO mikebuntu.TOPIC.LOCAL) (mike@milosoftware.com@37.74.225.130) by 0 with ESMTPA; 24 Aug 2018 12:00:49 -0000 From: Mike Looijmans To: u-boot@lists.denx.de Date: Fri, 24 Aug 2018 14:00:41 +0200 Message-Id: <1535112041-1563-5-git-send-email-mike.looijmans@topic.nl> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1535112041-1563-1-git-send-email-mike.looijmans@topic.nl> References: <1535112041-1563-1-git-send-email-mike.looijmans@topic.nl> Cc: michal.simek@xilinx.com, git@xilinx.com Subject: [U-Boot] [PATCH 4/4] board: topic-miamiplus: Run IO PLL at 1000 MHz X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" 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, 0x00000002U), EMIT_MASKWRITE(0XF8000104, 0x00000010U, 0x00000000U), EMIT_MASKWRITE(0XF8000124, 0xFFF00003U, 0x0C200003U), - EMIT_MASKWRITE(0XF8000118, 0x003FFFF0U, 0x00113220U), - EMIT_MASKWRITE(0XF8000108, 0x0007F000U, 0x00024000U), + EMIT_MASKWRITE(0XF8000118, 0x003FFFF0U, 0x001452C0U), + EMIT_MASKWRITE(0XF8000108, 0x0007F000U, 0x0001E000U), EMIT_MASKWRITE(0XF8000108, 0x00000010U, 0x00000010U), EMIT_MASKWRITE(0XF8000108, 0x00000001U, 0x00000001U), EMIT_MASKWRITE(0XF8000108, 0x00000001U, 0x00000000U), @@ -37,20 +37,18 @@ static unsigned long ps7_pll_init_data_3_0[] = { static unsigned long ps7_clock_init_data_3_0[] = { EMIT_MASKWRITE(0XF8000008, 0x0000FFFFU, 0x0000DF0DU), - EMIT_MASKWRITE(0XF8000128, 0x03F03F01U, 0x00302301U), - EMIT_MASKWRITE(0XF8000138, 0x00000011U, 0x00000011U), + EMIT_MASKWRITE(0XF8000128, 0x03F03F01U, 0x00700F01U), + EMIT_MASKWRITE(0XF8000138, 0x00000011U, 0x00000001U), EMIT_MASKWRITE(0XF800013C, 0x00000011U, 0x00000011U), - EMIT_MASKWRITE(0XF8000140, 0x03F03F71U, 0x00100141U), - EMIT_MASKWRITE(0XF8000144, 0x03F03F71U, 0x00100141U), - EMIT_MASKWRITE(0XF8000148, 0x00003F31U, 0x00000C01U), - EMIT_MASKWRITE(0XF800014C, 0x00003F31U, 0x00000601U), - EMIT_MASKWRITE(0XF8000150, 0x00003F33U, 0x00001803U), - EMIT_MASKWRITE(0XF8000154, 0x00003F33U, 0x00000C03U), - EMIT_MASKWRITE(0XF8000158, 0x00003F33U, 0x00000601U), - EMIT_MASKWRITE(0XF8000168, 0x00003F31U, 0x00000601U), - EMIT_MASKWRITE(0XF8000170, 0x03F03F30U, 0x00100C00U), - EMIT_MASKWRITE(0XF8000180, 0x03F03F30U, 0x00100C00U), - EMIT_MASKWRITE(0XF8000190, 0x03F03F30U, 0x00100600U), + EMIT_MASKWRITE(0XF8000140, 0x03F03F71U, 0x00100801U), + EMIT_MASKWRITE(0XF800014C, 0x00003F31U, 0x00000501U), + EMIT_MASKWRITE(0XF8000150, 0x00003F33U, 0x00000A01U), + EMIT_MASKWRITE(0XF8000154, 0x00003F33U, 0x00000A03U), + EMIT_MASKWRITE(0XF8000158, 0x00003F33U, 0x00000501U), + EMIT_MASKWRITE(0XF8000168, 0x00003F31U, 0x00000501U), + EMIT_MASKWRITE(0XF8000170, 0x03F03F30U, 0x00200500U), + EMIT_MASKWRITE(0XF8000180, 0x03F03F30U, 0x00100700U), + EMIT_MASKWRITE(0XF8000190, 0x03F03F30U, 0x00100500U), EMIT_MASKWRITE(0XF80001A0, 0x03F03F30U, 0x00101800U), EMIT_MASKWRITE(0XF80001C4, 0x00000001U, 0x00000001U), EMIT_MASKWRITE(0XF800012C, 0x01FFCCCDU, 0x01FC4C4DU), @@ -88,7 +86,7 @@ static unsigned long ps7_ddr_init_data_3_0[] = { EMIT_MASKWRITE(0XF8006078, 0x03FFFFFFU, 0x00466111U), EMIT_MASKWRITE(0XF800607C, 0x000FFFFFU, 0x00032222U), EMIT_MASKWRITE(0XF80060A4, 0xFFFFFFFFU, 0x10200802U), - EMIT_MASKWRITE(0XF80060A8, 0x0FFFFFFFU, 0x0690CB73U), + EMIT_MASKWRITE(0XF80060A8, 0x0FFFFFFFU, 0x0690CB52U), EMIT_MASKWRITE(0XF80060AC, 0x000001FFU, 0x000001FEU), EMIT_MASKWRITE(0XF80060B0, 0x1FFFFFFFU, 0x1CFFFFFFU), EMIT_MASKWRITE(0XF80060B4, 0x00000200U, 0x00000200U),