Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 9afc2ef0307aecf52482df67c31b75d5f9e66b47

Authored by Roy Zang
Committed by Andrew Fleming-AFLEMING
1 parent 950309c643
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

Fix IO port selection issue on MPC8544DS and MPC8572DS boards 

The IO port selection is not correct on MPC8572DS and MPC8544DS board.
 This patch fixes this issue.
 For MPC8572
 Port			cfg_io_ports
 PCIE1		0x2, 0x3, 0x7, 0xb, 0xc, 0xf
 PCIE2		0x3, 0x7
 PCIE3		0x7

For MPC8544
Port			cfg_io_ports
PCIE1		0x2, 0x3, 0x4, 0x5, 0x6, 0x7
PCIE2		0x4, 0x5, 0x6, 0x7
PCIE3		0x6, 0x7
Signed-off-by: Roy Zang <tie-fei.zang@freescale.com>

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

board/freescale/mpc8544ds/mpc8544ds.c
Diff comments   View file @ 9afc2ef
... ... @@ -121,7 +121,7 @@
121 121 volatile ccsr_fsl_pci_t *pci = (ccsr_fsl_pci_t *) CONFIG_SYS_PCIE3_ADDR;
122 122 struct pci_controller *hose = &pcie3_hose;
123 123 int pcie_ep = (host_agent == 1);
124   - int pcie_configured = io_sel >= 1;
  124 + int pcie_configured = io_sel >= 6;
125 125 struct pci_region *r = hose->regions;
126 126  
127 127 if (pcie_configured && !(devdisr & MPC85xx_DEVDISR_PCIE)){
board/freescale/mpc8572ds/mpc8572ds.c
Diff comments   View file @ 9afc2ef
... ... @@ -166,7 +166,7 @@
166 166 struct pci_controller *hose = &pcie3_hose;
167 167 int pcie_ep = (host_agent == 0) || (host_agent == 3) ||
168 168 (host_agent == 5) || (host_agent == 6);
169   - int pcie_configured = io_sel >= 1;
  169 + int pcie_configured = (io_sel == 0x7);
170 170 struct pci_region *r = hose->regions;
171 171 u32 temp32;
172 172  
... ... @@ -234,7 +234,7 @@
234 234 struct pci_controller *hose = &pcie2_hose;
235 235 int pcie_ep = (host_agent == 2) || (host_agent == 4) ||
236 236 (host_agent == 6) || (host_agent == 0);
237   - int pcie_configured = io_sel & 4;
  237 + int pcie_configured = (io_sel == 0x3) || (io_sel == 0x7);
238 238 struct pci_region *r = hose->regions;
239 239  
240 240 if (pcie_configured && !(devdisr & MPC85xx_DEVDISR_PCIE)){
... ... @@ -287,7 +287,9 @@
287 287 struct pci_controller *hose = &pcie1_hose;
288 288 int pcie_ep = (host_agent <= 1) || (host_agent == 4) ||
289 289 (host_agent == 5);
290   - int pcie_configured = io_sel & 6;
  290 + int pcie_configured = (io_sel == 0x2) || (io_sel == 0x3) ||
  291 + (io_sel == 0x7) || (io_sel == 0xb) ||
  292 + (io_sel == 0xc) || (io_sel == 0xf);
291 293 struct pci_region *r = hose->regions;
292 294  
293 295 if (pcie_configured && !(devdisr & MPC85xx_DEVDISR_PCIE)){