Skip to contentSkip to conversation

Board support updates for topic-miamiplus modules

PATCH New Mike Looijmans 2 participants 4 messages Jan 18, 2019

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

cover Board support updates for topic-miamiplus modules

Patches rebased for re-submission, were sent earlier as part of a longer series.

This improves performance and functionality for the topic-miamiplus boards with Zynq 7035/7045/7100.

Mike Looijmans (2):
topic-miamiplus: Run CPU at 800MHz for speedgrade-2
board: topic-miamiplus: Run IO PLL at 1000 MHz

 arch/arm/dts/zynq-topic-miamiplus.dts              |  9 ++++++
 .../topic/zynq/zynq-topic-miamiplus/ps7_init_gpl.c | 34 ++++++++++------------
 2 files changed, 25 insertions(+), 18 deletions(-)
Signature · 1 line
1.9.1
#1 lore raw

PATCH 1/2 topic-miamiplus: Run CPU at 800MHz for speedgrade-2

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.

---
 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(-)
arch/arm/dts/zynq-topic-miamiplus.dts +9 -0
index c0ccea9..df53886 100644
@@ -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>;
 };
board/topic/zynq/zynq-topic-miamiplus/ps7_init_gpl.c +2 -2
index c1cc1df..fd5846a 100644
@@ -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),
Signature · 1 line
1.9.1
#2 lore raw

PATCH 2/2 board: topic-miamiplus: Run IO PLL at 1000 MHz

In reply to 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.

---
 .../topic/zynq/zynq-topic-miamiplus/ps7_init_gpl.c | 30 ++++++++++------------
 1 file changed, 14 insertions(+), 16 deletions(-)
board/topic/zynq/zynq-topic-miamiplus/ps7_init_gpl.c +14 -16
index fd5846a..d90a350 100644
@@ -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),
Signature · 1 line
1.9.1
#3 lore raw

cover Board support updates for topic-miamiplus modules

In reply to Mike Looijmans
Quoted 6 lines · Mike Looijmans

Patches rebased for re-submission, were sent earlier as part of a longer series.

This improves performance and functionality for the topic-miamiplus boards with Zynq 7035/7045/7100.

Quoted 8 lines

Mike Looijmans (2):
topic-miamiplus: Run CPU at 800MHz for speedgrade-2
board: topic-miamiplus: Run IO PLL at 1000 MHz

 arch/arm/dts/zynq-topic-miamiplus.dts              |  9 ++++++
 .../topic/zynq/zynq-topic-miamiplus/ps7_init_gpl.c | 34 ++++++++++------------
 2 files changed, 25 insertions(+), 18 deletions(-)

Applied both.

Thanks,
Michal

Signature · 14 lines
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/Versal SoCs


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: OpenPGP digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190118/c3829fd1/attachment.sig>