330-fix-pci-init-mt7620.patch 704 B

123456789101112131415161718192021
  1. --- a/arch/mips/pci/pci-mt7620.c
  2. +++ b/arch/mips/pci/pci-mt7620.c
  3. @@ -32,6 +32,7 @@
  4. #define PPLL_CFG1 0x9c
  5. #define PPLL_DRV 0xa0
  6. +#define PPLL_LD BIT(23)
  7. #define PDRV_SW_SET BIT(31)
  8. #define LC_CKDRVPD BIT(19)
  9. #define LC_CKDRVOHZ BIT(18)
  10. @@ -239,8 +240,8 @@ static int mt7620_pci_hw_init(struct pla
  11. rt_sysc_m32(0, RALINK_PCIE0_CLK_EN, RALINK_CLKCFG1);
  12. mdelay(100);
  13. - if (!(rt_sysc_r32(PPLL_CFG1) & PDRV_SW_SET)) {
  14. - dev_err(&pdev->dev, "MT7620 PPLL unlock\n");
  15. + if (!(rt_sysc_r32(PPLL_CFG1) & PPLL_LD)) {
  16. + dev_err(&pdev->dev, "MT7620 PPLL is unlocked, aborting init\n");
  17. reset_control_assert(rstpcie0);
  18. rt_sysc_m32(RALINK_PCIE0_CLK_EN, 0, RALINK_CLKCFG1);
  19. return -1;