소스 검색

ARM: atmel: spl: make css field configurable

The clock source for master clock can be slow clock, main clock,
plla clock or upll clock. So, make the clock source selection
field in mckr can be configured.

Signed-off-by: Bo Shen <voice.shen@atmel.com>
Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
Bo Shen 10 년 전
부모
커밋
da79fa4d77
1개의 변경된 파일4개의 추가작업 그리고 2개의 파일을 삭제
  1. 4 2
      arch/arm/cpu/at91-common/spl.c

+ 4 - 2
arch/arm/cpu/at91-common/spl.c

@@ -76,10 +76,12 @@ void at91_mck_init(u32 mckr)
 	u32 tmp;
 
 	tmp = readl(&pmc->mckr);
-	tmp &= ~(AT91_PMC_MCKR_PRES_MASK |
+	tmp &= ~(AT91_PMC_MCKR_CSS_MASK |
+		 AT91_PMC_MCKR_PRES_MASK |
 		 AT91_PMC_MCKR_MDIV_MASK |
 		 AT91_PMC_MCKR_PLLADIV_2);
-	tmp |= mckr & (AT91_PMC_MCKR_PRES_MASK |
+	tmp |= mckr & (AT91_PMC_MCKR_CSS_MASK |
+		       AT91_PMC_MCKR_PRES_MASK |
 		       AT91_PMC_MCKR_MDIV_MASK |
 		       AT91_PMC_MCKR_PLLADIV_2);
 	writel(tmp, &pmc->mckr);