Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 568336ecc7083afd0b8b16a6b8b4a796491c142f

Authored by chenhui zhao
Committed by Kumar Gala
1 parent a6d0bfa86f
Exists in master and in 54 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, imx_v2015.04_4.1.15_1.0.0_ga, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-emmc-imx_v2014.04_3.10.53_1.1.0_ga, smarc-emmc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx-l5.0.0_1.0.0-ga, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx_v2015.04_4.1.15_1.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, ti-u-boot-2015.07, u-boot-2013.01.y, v2013.10, v2013.10-smarct33, v2013.10-smartmen, v2014.01, v2014.04, v2014.04-smarct33, v2014.04-smarct33-emmc, v2014.04-smartmen, v2014.07, v2014.07-smarct33, v2014.07-smartmen, v2015.07-smarct33, v2015.07-smarct33-emmc, v2015.07-smarct4x, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc, v2017.01-smarct4x

powerpc/mpc85xxcds: Fix PCI speed 

The CDS uses PCICLK as SYSCLK. The PCICLK should be 33333333Hz or 66666666Hz.

Signed-off-by: Ebony Zhu <ebony.zhu@freescale.com>
Signed-off-by: Zhao Chenhui <chenhui.zhao@freescale.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

Showing 4 changed files with 12 additions and 12 deletions Side-by-side Diff

board/freescale/common/cadmus.c
Diff comments   View file @ 568336e
1 1 /*
2   - * Copyright 2004 Freescale Semiconductor.
  2 + * Copyright 2004, 2011 Freescale Semiconductor.
3 3 *
4 4 * See file CREDITS for list of people who contributed to this
5 5 * project.
6 6  
7 7  
... ... @@ -61,12 +61,12 @@
61 61 uint pci1_speed = (cadmus->cm_pci >> 2) & 0x3; /* PSPEED in [4:5] */
62 62  
63 63 if (pci1_speed == 0) {
64   - return 33000000;
  64 + return 33333333;
65 65 } else if (pci1_speed == 1) {
66   - return 66000000;
  66 + return 66666666;
67 67 } else {
68 68 /* Really, unknown. Be safe? */
69   - return 33000000;
  69 + return 33333333;
70 70 }
71 71 }
72 72  
board/freescale/mpc8541cds/mpc8541cds.c
Diff comments   View file @ 568336e
1 1 /*
2   - * Copyright 2004 Freescale Semiconductor.
  2 + * Copyright 2004, 2011 Freescale Semiconductor.
3 3 *
4 4 * (C) Copyright 2002 Scott McNutt <smcnutt@artesyncp.com>
5 5 *
... ... @@ -200,6 +200,7 @@
200 200 int checkboard (void)
201 201 {
202 202 volatile ccsr_gur_t *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR);
  203 + char buf[32];
203 204  
204 205 /* PCI slot in USER bits CSR[6:7] by convention. */
205 206 uint pci_slot = get_pci_slot ();
... ... @@ -222,8 +223,7 @@
222 223  
223 224 printf("PCI1: %d bit, %s MHz, %s\n",
224 225 (pci1_32) ? 32 : 64,
225   - (pci1_speed == 33000000) ? "33" :
226   - (pci1_speed == 66000000) ? "66" : "unknown",
  226 + strmhz(buf, pci1_speed),
227 227 pci1_clk_sel ? "sync" : "async");
228 228  
229 229 if (pci_dual) {
board/freescale/mpc8548cds/mpc8548cds.c
Diff comments   View file @ 568336e
... ... @@ -214,6 +214,7 @@
214 214 u32 devdisr, pordevsr, io_sel;
215 215 u32 porpllsr, pci_agent, pci_speed, pci_32, pci_arb, pci_clk_sel;
216 216 int first_free_busno = 0;
  217 + char buf[32];
217 218  
218 219 devdisr = in_be32(&gur->devdisr);
219 220 pordevsr = in_be32(&gur->pordevsr);
... ... @@ -238,8 +239,7 @@
238 239 pci_agent = fsl_setup_hose(&pci1_hose, pci_info.regs);
239 240 printf("PCI1: %d bit, %s MHz, %s, %s, %s (base address %lx)\n",
240 241 (pci_32) ? 32 : 64,
241   - (pci_speed == 33333000) ? "33" :
242   - (pci_speed == 66666000) ? "66" : "unknown",
  242 + strmhz(buf, pci_speed),
243 243 pci_clk_sel ? "sync" : "async",
244 244 pci_agent ? "agent" : "host",
245 245 pci_arb ? "arbiter" : "external-arbiter",
board/freescale/mpc8555cds/mpc8555cds.c
Diff comments   View file @ 568336e
1 1 /*
2   - * Copyright 2004 Freescale Semiconductor.
  2 + * Copyright 2004, 2011 Freescale Semiconductor.
3 3 *
4 4 * See file CREDITS for list of people who contributed to this
5 5 * project.
... ... @@ -198,6 +198,7 @@
198 198 int checkboard (void)
199 199 {
200 200 volatile ccsr_gur_t *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR);
  201 + char buf[32];
201 202  
202 203 /* PCI slot in USER bits CSR[6:7] by convention. */
203 204 uint pci_slot = get_pci_slot ();
... ... @@ -220,8 +221,7 @@
220 221  
221 222 printf("PCI1: %d bit, %s MHz, %s\n",
222 223 (pci1_32) ? 32 : 64,
223   - (pci1_speed == 33000000) ? "33" :
224   - (pci1_speed == 66000000) ? "66" : "unknown",
  224 + strmhz(buf, pci1_speed),
225 225 pci1_clk_sel ? "sync" : "async");
226 226  
227 227 if (pci_dual) {