[U-Boot] [PATCH v2 2/5] arm: at91/spl: matrix: remove matrix write protection code

Andreas Bießmann andreas.devel at googlemail.com
Mon Nov 23 17:48:39 CET 2015


On 05.11.15 09:37, Wenyou Yang wrote:
> 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 at atmel.com>

Reviewed-by: Andreas Bießmann <andreas.devel at googlemail.com>

> ---
> 
> Changes in v2: None
> 
>  arch/arm/mach-at91/matrix.c |    8 --------
>  1 file changed, 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);
>  }
> 


More information about the U-Boot mailing list