From: Wenyou Yang Date: Thu, 5 Nov 2015 08:37:50 +0000 (+0800) Subject: arm: at91/spl: matrix: remove matrix write protection code X-Git-Tag: v2016.01-rc2~107^2~3 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=5906d2aa0cb461fc10c9d429d9b38a6b1265afe2;p=oweals%2Fu-boot.git 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 Reviewed-by: Andreas Bießmann --- diff --git a/arch/arm/mach-at91/matrix.c b/arch/arm/mach-at91/matrix.c index cf363861c6..452a6b995c 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); }