diff options
| author | Wenyou Yang <wenyou.yang@atmel.com> | 2015-11-05 16:37:50 +0800 |
|---|---|---|
| committer | Andreas Bießmann <andreas.devel@googlemail.com> | 2015-11-30 22:27:54 +0100 |
| commit | 5906d2aa0cb461fc10c9d429d9b38a6b1265afe2 (patch) | |
| tree | 5059b48b60dc7869941cf30b78ae73646dfa1890 | |
| parent | 5cb9dfa031c01ed747a11b18bdf64ba598a3597f (diff) | |
| download | u-boot-imx-5906d2aa0cb461fc10c9d429d9b38a6b1265afe2.zip u-boot-imx-5906d2aa0cb461fc10c9d429d9b38a6b1265afe2.tar.gz u-boot-imx-5906d2aa0cb461fc10c9d429d9b38a6b1265afe2.tar.bz2 | |
arm: at91/spl: matrix: remove matrix write protection code
On processor reset, the matrix write protection is disabled,
so no need to disable/enable write protection when writing
the matrix registers.
Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com>
Reviewed-by: Andreas Bießmann <andreas.devel@googlemail.com>
| -rw-r--r-- | arch/arm/mach-at91/matrix.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/arm/mach-at91/matrix.c b/arch/arm/mach-at91/matrix.c index cf36386..452a6b9 100644 --- a/arch/arm/mach-at91/matrix.c +++ b/arch/arm/mach-at91/matrix.c @@ -15,10 +15,6 @@ void matrix_init(void) struct atmel_matrix *h32mx = (struct atmel_matrix *)ATMEL_BASE_MATRIX1; int i; - /* Disable the write protect */ - writel(ATMEL_MATRIX_WPMR_WPKEY & ~ATMEL_MATRIX_WPMR_WPEN, &h64mx->wpmr); - writel(ATMEL_MATRIX_WPMR_WPKEY & ~ATMEL_MATRIX_WPMR_WPEN, &h32mx->wpmr); - /* DDR port 1 ~ poart 7, slave number is: 4 ~ 10 */ for (i = 4; i <= 10; i++) { writel(0x000f0f0f, &h64mx->ssr[i]); @@ -44,8 +40,4 @@ void matrix_init(void) /* Configure Programmable Security peripherals on matrix 32 */ writel(readl(&h32mx->spselr[0]) | 0xFFC00000, &h32mx->spselr[0]); writel(readl(&h32mx->spselr[1]) | 0x60E3FFFF, &h32mx->spselr[1]); - - /* Enable the write protect */ - writel(ATMEL_MATRIX_WPMR_WPKEY | ATMEL_MATRIX_WPMR_WPEN, &h64mx->wpmr); - writel(ATMEL_MATRIX_WPMR_WPKEY | ATMEL_MATRIX_WPMR_WPEN, &h32mx->wpmr); } |