* [U-Boot] [PATCH 0/3] arm: at91/spl: make matrix and saic redirect sharing with others
@ 2015-11-04 6:28 Wenyou Yang
2015-11-04 6:28 ` [U-Boot] [PATCH 1/3] arm: at91/spl: matrix: move matrix init to separate file Wenyou Yang
` (2 more replies)
0 siblings, 3 replies; 10+ messages in thread
From: Wenyou Yang @ 2015-11-04 6:28 UTC (permalink / raw)
To: u-boot
This patches is to make matix initialization and saic redirect
code sharing with other SoCs, move them to seperate files from
SAMA5D4 particular file.
Wenyou Yang (3):
arm: at91/spl: matrix: move matrix init to separate file
arm: at91/spl: matrix: improve implementation of matrix
arm: at91: spl/atmel_sfr: move saic redirect to separate file
arch/arm/mach-at91/Makefile | 2 +-
arch/arm/mach-at91/armv7/sama5d4_devices.c | 55 ---------------------------
arch/arm/mach-at91/atmel_sfr.c | 21 ++++++++++
arch/arm/mach-at91/include/mach/sama5_sfr.h | 1 -
arch/arm/mach-at91/include/mach/sama5d4.h | 28 ++++++++++++++
arch/arm/mach-at91/matrix.c | 34 +++++++++++++++++
6 files changed, 84 insertions(+), 57 deletions(-)
create mode 100644 arch/arm/mach-at91/atmel_sfr.c
create mode 100644 arch/arm/mach-at91/matrix.c
--
1.7.9.5
^ permalink raw reply [flat|nested] 10+ messages in thread* [U-Boot] [PATCH 1/3] arm: at91/spl: matrix: move matrix init to separate file 2015-11-04 6:28 [U-Boot] [PATCH 0/3] arm: at91/spl: make matrix and saic redirect sharing with others Wenyou Yang @ 2015-11-04 6:28 ` Wenyou Yang 2015-11-05 2:52 ` Josh Wu 2015-11-04 6:28 ` [U-Boot] [PATCH 2/3] arm: at91/spl: matrix: improve implementation of matrix Wenyou Yang 2015-11-04 6:28 ` [U-Boot] [PATCH 3/3] arm: at91: spl/atmel_sfr: move saic redirect to separate file Wenyou Yang 2 siblings, 1 reply; 10+ messages in thread From: Wenyou Yang @ 2015-11-04 6:28 UTC (permalink / raw) To: u-boot To make the matrix initialization code sharing with other SoCs, move it from SAMA5D4 particular file, mach-at91/armv7/sama5d4_devices.c to a separate file, mach-at91/matrix.c Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com> --- arch/arm/mach-at91/Makefile | 2 +- arch/arm/mach-at91/armv7/sama5d4_devices.c | 42 ----------------------- arch/arm/mach-at91/matrix.c | 51 ++++++++++++++++++++++++++++ 3 files changed, 52 insertions(+), 43 deletions(-) create mode 100644 arch/arm/mach-at91/matrix.c diff --git a/arch/arm/mach-at91/Makefile b/arch/arm/mach-at91/Makefile index 313eb47..649aff2 100644 --- a/arch/arm/mach-at91/Makefile +++ b/arch/arm/mach-at91/Makefile @@ -6,7 +6,7 @@ obj-$(CONFIG_AT91SAM9M10G45) += mpddrc.o spl_at91.o obj-$(CONFIG_AT91SAM9N12) += mpddrc.o spl_at91.o obj-$(CONFIG_AT91SAM9X5) += mpddrc.o spl_at91.o obj-$(CONFIG_SAMA5D3) += mpddrc.o spl_atmel.o -obj-$(CONFIG_SAMA5D4) += mpddrc.o spl_atmel.o +obj-$(CONFIG_SAMA5D4) += mpddrc.o spl_atmel.o matrix.o obj-y += spl.o endif diff --git a/arch/arm/mach-at91/armv7/sama5d4_devices.c b/arch/arm/mach-at91/armv7/sama5d4_devices.c index 76301d6..52f4862 100644 --- a/arch/arm/mach-at91/armv7/sama5d4_devices.c +++ b/arch/arm/mach-at91/armv7/sama5d4_devices.c @@ -10,7 +10,6 @@ #include <asm/arch/at91_common.h> #include <asm/arch/at91_pmc.h> #include <asm/arch/clk.h> -#include <asm/arch/sama5_matrix.h> #include <asm/arch/sama5_sfr.h> #include <asm/arch/sama5d4.h> @@ -48,47 +47,6 @@ void at91_udp_hw_init(void) #endif #ifdef CONFIG_SPL_BUILD -void matrix_init(void) -{ - struct atmel_matrix *h64mx = (struct atmel_matrix *)ATMEL_BASE_MATRIX0; - 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]); - writel(0x0000ffff, &h64mx->sassr[i]); - writel(0x0000000f, &h64mx->srtsr[i]); - } - - /* CS3 */ - writel(0x00c0c0c0, &h32mx->ssr[3]); - writel(0xff000000, &h32mx->sassr[3]); - writel(0xff000000, &h32mx->srtsr[3]); - - /* NFC SRAM */ - writel(0x00010101, &h32mx->ssr[4]); - writel(0x00000001, &h32mx->sassr[4]); - writel(0x00000001, &h32mx->srtsr[4]); - - /* Configure Programmable Security peripherals on matrix 64 */ - writel(readl(&h64mx->spselr[0]) | 0x00080000, &h64mx->spselr[0]); - writel(readl(&h64mx->spselr[1]) | 0x00180000, &h64mx->spselr[1]); - writel(readl(&h64mx->spselr[2]) | 0x00000008, &h64mx->spselr[2]); - - /* 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); -} - void redirect_int_from_saic_to_aic(void) { struct atmel_sfr *sfr = (struct atmel_sfr *)ATMEL_BASE_SFR; diff --git a/arch/arm/mach-at91/matrix.c b/arch/arm/mach-at91/matrix.c new file mode 100644 index 0000000..cf36386 --- /dev/null +++ b/arch/arm/mach-at91/matrix.c @@ -0,0 +1,51 @@ +/* + * Copyright (C) 2015 Atmel Corporation + * Wenyou Yang <wenyou.yang@atmel.com> + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#include <common.h> +#include <asm/io.h> +#include <asm/arch/sama5_matrix.h> + +void matrix_init(void) +{ + struct atmel_matrix *h64mx = (struct atmel_matrix *)ATMEL_BASE_MATRIX0; + 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]); + writel(0x0000ffff, &h64mx->sassr[i]); + writel(0x0000000f, &h64mx->srtsr[i]); + } + + /* CS3 */ + writel(0x00c0c0c0, &h32mx->ssr[3]); + writel(0xff000000, &h32mx->sassr[3]); + writel(0xff000000, &h32mx->srtsr[3]); + + /* NFC SRAM */ + writel(0x00010101, &h32mx->ssr[4]); + writel(0x00000001, &h32mx->sassr[4]); + writel(0x00000001, &h32mx->srtsr[4]); + + /* Configure Programmable Security peripherals on matrix 64 */ + writel(readl(&h64mx->spselr[0]) | 0x00080000, &h64mx->spselr[0]); + writel(readl(&h64mx->spselr[1]) | 0x00180000, &h64mx->spselr[1]); + writel(readl(&h64mx->spselr[2]) | 0x00000008, &h64mx->spselr[2]); + + /* 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); +} -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [U-Boot] [PATCH 1/3] arm: at91/spl: matrix: move matrix init to separate file 2015-11-04 6:28 ` [U-Boot] [PATCH 1/3] arm: at91/spl: matrix: move matrix init to separate file Wenyou Yang @ 2015-11-05 2:52 ` Josh Wu 2015-11-05 7:54 ` Yang, Wenyou 0 siblings, 1 reply; 10+ messages in thread From: Josh Wu @ 2015-11-05 2:52 UTC (permalink / raw) To: u-boot Hi, Wenyou On 11/4/2015 2:28 PM, Wenyou Yang wrote: > To make the matrix initialization code sharing with other SoCs, > move it from SAMA5D4 particular file, > mach-at91/armv7/sama5d4_devices.c to a separate file, > mach-at91/matrix.c is it possible just move it to mach-at91/armv7/matrix.c, as it is only used by armv7 core? Best Regards, Josh Wu > > Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com> > --- > > arch/arm/mach-at91/Makefile | 2 +- > arch/arm/mach-at91/armv7/sama5d4_devices.c | 42 ----------------------- > arch/arm/mach-at91/matrix.c | 51 ++++++++++++++++++++++++++++ > 3 files changed, 52 insertions(+), 43 deletions(-) > create mode 100644 arch/arm/mach-at91/matrix.c > > diff --git a/arch/arm/mach-at91/Makefile b/arch/arm/mach-at91/Makefile > index 313eb47..649aff2 100644 > --- a/arch/arm/mach-at91/Makefile > +++ b/arch/arm/mach-at91/Makefile > @@ -6,7 +6,7 @@ obj-$(CONFIG_AT91SAM9M10G45) += mpddrc.o spl_at91.o > obj-$(CONFIG_AT91SAM9N12) += mpddrc.o spl_at91.o > obj-$(CONFIG_AT91SAM9X5) += mpddrc.o spl_at91.o > obj-$(CONFIG_SAMA5D3) += mpddrc.o spl_atmel.o > -obj-$(CONFIG_SAMA5D4) += mpddrc.o spl_atmel.o > +obj-$(CONFIG_SAMA5D4) += mpddrc.o spl_atmel.o matrix.o > obj-y += spl.o > endif > > diff --git a/arch/arm/mach-at91/armv7/sama5d4_devices.c b/arch/arm/mach-at91/armv7/sama5d4_devices.c > index 76301d6..52f4862 100644 > --- a/arch/arm/mach-at91/armv7/sama5d4_devices.c > +++ b/arch/arm/mach-at91/armv7/sama5d4_devices.c > @@ -10,7 +10,6 @@ > #include <asm/arch/at91_common.h> > #include <asm/arch/at91_pmc.h> > #include <asm/arch/clk.h> > -#include <asm/arch/sama5_matrix.h> > #include <asm/arch/sama5_sfr.h> > #include <asm/arch/sama5d4.h> > > @@ -48,47 +47,6 @@ void at91_udp_hw_init(void) > #endif > > #ifdef CONFIG_SPL_BUILD > -void matrix_init(void) > -{ > - struct atmel_matrix *h64mx = (struct atmel_matrix *)ATMEL_BASE_MATRIX0; > - 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]); > - writel(0x0000ffff, &h64mx->sassr[i]); > - writel(0x0000000f, &h64mx->srtsr[i]); > - } > - > - /* CS3 */ > - writel(0x00c0c0c0, &h32mx->ssr[3]); > - writel(0xff000000, &h32mx->sassr[3]); > - writel(0xff000000, &h32mx->srtsr[3]); > - > - /* NFC SRAM */ > - writel(0x00010101, &h32mx->ssr[4]); > - writel(0x00000001, &h32mx->sassr[4]); > - writel(0x00000001, &h32mx->srtsr[4]); > - > - /* Configure Programmable Security peripherals on matrix 64 */ > - writel(readl(&h64mx->spselr[0]) | 0x00080000, &h64mx->spselr[0]); > - writel(readl(&h64mx->spselr[1]) | 0x00180000, &h64mx->spselr[1]); > - writel(readl(&h64mx->spselr[2]) | 0x00000008, &h64mx->spselr[2]); > - > - /* 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); > -} > - > void redirect_int_from_saic_to_aic(void) > { > struct atmel_sfr *sfr = (struct atmel_sfr *)ATMEL_BASE_SFR; > diff --git a/arch/arm/mach-at91/matrix.c b/arch/arm/mach-at91/matrix.c > new file mode 100644 > index 0000000..cf36386 > --- /dev/null > +++ b/arch/arm/mach-at91/matrix.c > @@ -0,0 +1,51 @@ > +/* > + * Copyright (C) 2015 Atmel Corporation > + * Wenyou Yang <wenyou.yang@atmel.com> > + * > + * SPDX-License-Identifier: GPL-2.0+ > + */ > + > +#include <common.h> > +#include <asm/io.h> > +#include <asm/arch/sama5_matrix.h> > + > +void matrix_init(void) > +{ > + struct atmel_matrix *h64mx = (struct atmel_matrix *)ATMEL_BASE_MATRIX0; > + 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]); > + writel(0x0000ffff, &h64mx->sassr[i]); > + writel(0x0000000f, &h64mx->srtsr[i]); > + } > + > + /* CS3 */ > + writel(0x00c0c0c0, &h32mx->ssr[3]); > + writel(0xff000000, &h32mx->sassr[3]); > + writel(0xff000000, &h32mx->srtsr[3]); > + > + /* NFC SRAM */ > + writel(0x00010101, &h32mx->ssr[4]); > + writel(0x00000001, &h32mx->sassr[4]); > + writel(0x00000001, &h32mx->srtsr[4]); > + > + /* Configure Programmable Security peripherals on matrix 64 */ > + writel(readl(&h64mx->spselr[0]) | 0x00080000, &h64mx->spselr[0]); > + writel(readl(&h64mx->spselr[1]) | 0x00180000, &h64mx->spselr[1]); > + writel(readl(&h64mx->spselr[2]) | 0x00000008, &h64mx->spselr[2]); > + > + /* 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); > +} ^ permalink raw reply [flat|nested] 10+ messages in thread
* [U-Boot] [PATCH 1/3] arm: at91/spl: matrix: move matrix init to separate file 2015-11-05 2:52 ` Josh Wu @ 2015-11-05 7:54 ` Yang, Wenyou 0 siblings, 0 replies; 10+ messages in thread From: Yang, Wenyou @ 2015-11-05 7:54 UTC (permalink / raw) To: u-boot Hi Josh, Thank you for your review. > -----Original Message----- > From: Wu, Josh > Sent: 2015?11?5? 10:53 > To: Yang, Wenyou; U-Boot Mailing List > Subject: Re: [U-Boot] [PATCH 1/3] arm: at91/spl: matrix: move matrix init to > separate file > > Hi, Wenyou > > On 11/4/2015 2:28 PM, Wenyou Yang wrote: > > To make the matrix initialization code sharing with other SoCs, move > > it from SAMA5D4 particular file, mach-at91/armv7/sama5d4_devices.c to > > a separate file, mach-at91/matrix.c > is it possible just move it to mach-at91/armv7/matrix.c, as it is only used by > armv7 core? As you know, the at91 spl code is placed at the directory, mach-at91/, so place matrix.c here is acceptable. Yes, we should consider a separate directory to accommodate the at91 spl code in the future. > > Best Regards, > Josh Wu > > > > Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com> > > --- > > > > arch/arm/mach-at91/Makefile | 2 +- > > arch/arm/mach-at91/armv7/sama5d4_devices.c | 42 ----------------------- > > arch/arm/mach-at91/matrix.c | 51 > ++++++++++++++++++++++++++++ > > 3 files changed, 52 insertions(+), 43 deletions(-) > > create mode 100644 arch/arm/mach-at91/matrix.c > > > > diff --git a/arch/arm/mach-at91/Makefile b/arch/arm/mach-at91/Makefile > > index 313eb47..649aff2 100644 > > --- a/arch/arm/mach-at91/Makefile > > +++ b/arch/arm/mach-at91/Makefile > > @@ -6,7 +6,7 @@ obj-$(CONFIG_AT91SAM9M10G45) += mpddrc.o > spl_at91.o > > obj-$(CONFIG_AT91SAM9N12) += mpddrc.o spl_at91.o > > obj-$(CONFIG_AT91SAM9X5) += mpddrc.o spl_at91.o > > obj-$(CONFIG_SAMA5D3) += mpddrc.o spl_atmel.o > > -obj-$(CONFIG_SAMA5D4) += mpddrc.o spl_atmel.o > > +obj-$(CONFIG_SAMA5D4) += mpddrc.o spl_atmel.o matrix.o > > obj-y += spl.o > > endif > > > > diff --git a/arch/arm/mach-at91/armv7/sama5d4_devices.c > > b/arch/arm/mach-at91/armv7/sama5d4_devices.c > > index 76301d6..52f4862 100644 > > --- a/arch/arm/mach-at91/armv7/sama5d4_devices.c > > +++ b/arch/arm/mach-at91/armv7/sama5d4_devices.c > > @@ -10,7 +10,6 @@ > > #include <asm/arch/at91_common.h> > > #include <asm/arch/at91_pmc.h> > > #include <asm/arch/clk.h> > > -#include <asm/arch/sama5_matrix.h> > > #include <asm/arch/sama5_sfr.h> > > #include <asm/arch/sama5d4.h> > > > > @@ -48,47 +47,6 @@ void at91_udp_hw_init(void) > > #endif > > > > #ifdef CONFIG_SPL_BUILD > > -void matrix_init(void) > > -{ > > - struct atmel_matrix *h64mx = (struct atmel_matrix > *)ATMEL_BASE_MATRIX0; > > - 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]); > > - writel(0x0000ffff, &h64mx->sassr[i]); > > - writel(0x0000000f, &h64mx->srtsr[i]); > > - } > > - > > - /* CS3 */ > > - writel(0x00c0c0c0, &h32mx->ssr[3]); > > - writel(0xff000000, &h32mx->sassr[3]); > > - writel(0xff000000, &h32mx->srtsr[3]); > > - > > - /* NFC SRAM */ > > - writel(0x00010101, &h32mx->ssr[4]); > > - writel(0x00000001, &h32mx->sassr[4]); > > - writel(0x00000001, &h32mx->srtsr[4]); > > - > > - /* Configure Programmable Security peripherals on matrix 64 */ > > - writel(readl(&h64mx->spselr[0]) | 0x00080000, &h64mx->spselr[0]); > > - writel(readl(&h64mx->spselr[1]) | 0x00180000, &h64mx->spselr[1]); > > - writel(readl(&h64mx->spselr[2]) | 0x00000008, &h64mx->spselr[2]); > > - > > - /* 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); > > -} > > - > > void redirect_int_from_saic_to_aic(void) > > { > > struct atmel_sfr *sfr = (struct atmel_sfr *)ATMEL_BASE_SFR; diff > > --git a/arch/arm/mach-at91/matrix.c b/arch/arm/mach-at91/matrix.c new > > file mode 100644 index 0000000..cf36386 > > --- /dev/null > > +++ b/arch/arm/mach-at91/matrix.c > > @@ -0,0 +1,51 @@ > > +/* > > + * Copyright (C) 2015 Atmel Corporation > > + * Wenyou Yang <wenyou.yang@atmel.com> > > + * > > + * SPDX-License-Identifier: GPL-2.0+ > > + */ > > + > > +#include <common.h> > > +#include <asm/io.h> > > +#include <asm/arch/sama5_matrix.h> > > + > > +void matrix_init(void) > > +{ > > + struct atmel_matrix *h64mx = (struct atmel_matrix > *)ATMEL_BASE_MATRIX0; > > + 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]); > > + writel(0x0000ffff, &h64mx->sassr[i]); > > + writel(0x0000000f, &h64mx->srtsr[i]); > > + } > > + > > + /* CS3 */ > > + writel(0x00c0c0c0, &h32mx->ssr[3]); > > + writel(0xff000000, &h32mx->sassr[3]); > > + writel(0xff000000, &h32mx->srtsr[3]); > > + > > + /* NFC SRAM */ > > + writel(0x00010101, &h32mx->ssr[4]); > > + writel(0x00000001, &h32mx->sassr[4]); > > + writel(0x00000001, &h32mx->srtsr[4]); > > + > > + /* Configure Programmable Security peripherals on matrix 64 */ > > + writel(readl(&h64mx->spselr[0]) | 0x00080000, &h64mx->spselr[0]); > > + writel(readl(&h64mx->spselr[1]) | 0x00180000, &h64mx->spselr[1]); > > + writel(readl(&h64mx->spselr[2]) | 0x00000008, &h64mx->spselr[2]); > > + > > + /* 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); } Best Regards, Wenyou Yang ^ permalink raw reply [flat|nested] 10+ messages in thread
* [U-Boot] [PATCH 2/3] arm: at91/spl: matrix: improve implementation of matrix 2015-11-04 6:28 [U-Boot] [PATCH 0/3] arm: at91/spl: make matrix and saic redirect sharing with others Wenyou Yang 2015-11-04 6:28 ` [U-Boot] [PATCH 1/3] arm: at91/spl: matrix: move matrix init to separate file Wenyou Yang @ 2015-11-04 6:28 ` Wenyou Yang 2015-11-05 2:54 ` Josh Wu 2015-11-04 6:28 ` [U-Boot] [PATCH 3/3] arm: at91: spl/atmel_sfr: move saic redirect to separate file Wenyou Yang 2 siblings, 1 reply; 10+ messages in thread From: Wenyou Yang @ 2015-11-04 6:28 UTC (permalink / raw) To: u-boot To make matrix initialization code sharing with others, use the matrix slave id macros, instead of hard-coding. Remove the write protection mode code, it is unneeded for writing registers. Remove the security peripheral selecting code, it is unneeded for SPL use-case. Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com> --- arch/arm/mach-at91/include/mach/sama5d4.h | 25 +++++++++++++++++++++ arch/arm/mach-at91/matrix.c | 35 ++++++++--------------------- 2 files changed, 34 insertions(+), 26 deletions(-) diff --git a/arch/arm/mach-at91/include/mach/sama5d4.h b/arch/arm/mach-at91/include/mach/sama5d4.h index 3da8aff..449cf0e 100644 --- a/arch/arm/mach-at91/include/mach/sama5d4.h +++ b/arch/arm/mach-at91/include/mach/sama5d4.h @@ -179,6 +179,31 @@ #define CPU_HAS_PCR #define CPU_HAS_H32MXDIV +/* MATRIX0(H64MX) slave id definitions */ +#define H64MX_SLAVE_AXIMX_BRIDGE 0 /* Bridge from H64MX to AXIMX */ +#define H64MX_SLAVE_PERIPH_BRIDGE 1 /* H64MX Peripheral Bridge */ +#define H64MX_SLAVE_VDEC 2 /* Video Decoder */ +#define H64MX_SLAVE_DDRC_PORT0 3 /* DDR2 Port0-AESOTF */ +#define H64MX_SLAVE_DDRC_PORT1 4 /* DDR2 Port1 */ +#define H64MX_SLAVE_DDRC_PORT2 5 /* DDR2 Port2 */ +#define H64MX_SLAVE_DDRC_PORT3 6 /* DDR2 Port3 */ +#define H64MX_SLAVE_DDRC_PORT4 7 /* DDR2 Port4 */ +#define H64MX_SLAVE_DDRC_PORT5 8 /* DDR2 Port5 */ +#define H64MX_SLAVE_DDRC_PORT6 9 /* DDR2 Port6 */ +#define H64MX_SLAVE_DDRC_PORT7 10 /* DDR2 Port7 */ +#define H64MX_SLAVE_SRAM 11 /* Internal SRAM 128K */ +#define H64MX_SLAVE_H32MX_BRIDGE 12 /* Bridge from H64MX to H32MX */ + +/* MATRIX1(H32MX) slave id definitions */ +#define H32MX_SLAVE_H64MX_BRIDGE 0 /* Bridge from H32MX to H64MX */ +#define H32MX_SLAVE_PERIPH_BRIDGE0 1 /* H32MX Peripheral Bridge 0 */ +#define H32MX_SLAVE_PERIPH_BRIDGE1 2 /* H32MX Peripheral Bridge 1 */ +#define H32MX_SLAVE_EBI 3 /* External Bus Interface */ +#define H32MX_SLAVE_NFC_CMD 3 /* NFC command Register */ +#define H32MX_SLAVE_NFC_SRAM 4 /* NFC SRAM */ +#define H32MX_SLAVE_USB 5 /* USB Device & Host */ +#define H32MX_SLAVE_SMD 6 /* Soft Modem (SMD) */ + /* sama5d4 series chip id definitions */ #define ARCH_ID_SAMA5D4 0x8a5c07c0 #define ARCH_EXID_SAMA5D41 0x00000001 diff --git a/arch/arm/mach-at91/matrix.c b/arch/arm/mach-at91/matrix.c index cf36386..57d7270 100644 --- a/arch/arm/mach-at91/matrix.c +++ b/arch/arm/mach-at91/matrix.c @@ -15,37 +15,20 @@ 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++) { + /* DDR port 1 ~ port 7 */ + for (i = H64MX_SLAVE_DDRC_PORT1; i <= H64MX_SLAVE_DDRC_PORT7; i++) { writel(0x000f0f0f, &h64mx->ssr[i]); writel(0x0000ffff, &h64mx->sassr[i]); writel(0x0000000f, &h64mx->srtsr[i]); } - /* CS3 */ - writel(0x00c0c0c0, &h32mx->ssr[3]); - writel(0xff000000, &h32mx->sassr[3]); - writel(0xff000000, &h32mx->srtsr[3]); + /* EBI CS3 (NANDFlash 128M) and NFC Command Registers(128M) */ + writel(0x00c0c0c0, &h32mx->ssr[H32MX_SLAVE_EBI]); + writel(0xff000000, &h32mx->sassr[H32MX_SLAVE_EBI]); + writel(0xff000000, &h32mx->srtsr[H32MX_SLAVE_EBI]); /* NFC SRAM */ - writel(0x00010101, &h32mx->ssr[4]); - writel(0x00000001, &h32mx->sassr[4]); - writel(0x00000001, &h32mx->srtsr[4]); - - /* Configure Programmable Security peripherals on matrix 64 */ - writel(readl(&h64mx->spselr[0]) | 0x00080000, &h64mx->spselr[0]); - writel(readl(&h64mx->spselr[1]) | 0x00180000, &h64mx->spselr[1]); - writel(readl(&h64mx->spselr[2]) | 0x00000008, &h64mx->spselr[2]); - - /* 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); + writel(0x00010101, &h32mx->ssr[H32MX_SLAVE_NFC_SRAM]); + writel(0x00000001, &h32mx->sassr[H32MX_SLAVE_NFC_SRAM]); + writel(0x00000001, &h32mx->srtsr[H32MX_SLAVE_NFC_SRAM]); } -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [U-Boot] [PATCH 2/3] arm: at91/spl: matrix: improve implementation of matrix 2015-11-04 6:28 ` [U-Boot] [PATCH 2/3] arm: at91/spl: matrix: improve implementation of matrix Wenyou Yang @ 2015-11-05 2:54 ` Josh Wu 2015-11-05 7:57 ` Yang, Wenyou 0 siblings, 1 reply; 10+ messages in thread From: Josh Wu @ 2015-11-05 2:54 UTC (permalink / raw) To: u-boot Hi, Wenyou On 11/4/2015 2:28 PM, Wenyou Yang wrote: > To make matrix initialization code sharing with others, > use the matrix slave id macros, instead of hard-coding. it is better if you split the following 'removing code' as another patch. Best Regards, Josh Wu > Remove the write protection mode code, it is unneeded for > writing registers. > > Remove the security peripheral selecting code, it is > unneeded for SPL use-case. > > Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com> > --- > > arch/arm/mach-at91/include/mach/sama5d4.h | 25 +++++++++++++++++++++ > arch/arm/mach-at91/matrix.c | 35 ++++++++--------------------- > 2 files changed, 34 insertions(+), 26 deletions(-) > > diff --git a/arch/arm/mach-at91/include/mach/sama5d4.h b/arch/arm/mach-at91/include/mach/sama5d4.h > index 3da8aff..449cf0e 100644 > --- a/arch/arm/mach-at91/include/mach/sama5d4.h > +++ b/arch/arm/mach-at91/include/mach/sama5d4.h > @@ -179,6 +179,31 @@ > #define CPU_HAS_PCR > #define CPU_HAS_H32MXDIV > > +/* MATRIX0(H64MX) slave id definitions */ > +#define H64MX_SLAVE_AXIMX_BRIDGE 0 /* Bridge from H64MX to AXIMX */ > +#define H64MX_SLAVE_PERIPH_BRIDGE 1 /* H64MX Peripheral Bridge */ > +#define H64MX_SLAVE_VDEC 2 /* Video Decoder */ > +#define H64MX_SLAVE_DDRC_PORT0 3 /* DDR2 Port0-AESOTF */ > +#define H64MX_SLAVE_DDRC_PORT1 4 /* DDR2 Port1 */ > +#define H64MX_SLAVE_DDRC_PORT2 5 /* DDR2 Port2 */ > +#define H64MX_SLAVE_DDRC_PORT3 6 /* DDR2 Port3 */ > +#define H64MX_SLAVE_DDRC_PORT4 7 /* DDR2 Port4 */ > +#define H64MX_SLAVE_DDRC_PORT5 8 /* DDR2 Port5 */ > +#define H64MX_SLAVE_DDRC_PORT6 9 /* DDR2 Port6 */ > +#define H64MX_SLAVE_DDRC_PORT7 10 /* DDR2 Port7 */ > +#define H64MX_SLAVE_SRAM 11 /* Internal SRAM 128K */ > +#define H64MX_SLAVE_H32MX_BRIDGE 12 /* Bridge from H64MX to H32MX */ > + > +/* MATRIX1(H32MX) slave id definitions */ > +#define H32MX_SLAVE_H64MX_BRIDGE 0 /* Bridge from H32MX to H64MX */ > +#define H32MX_SLAVE_PERIPH_BRIDGE0 1 /* H32MX Peripheral Bridge 0 */ > +#define H32MX_SLAVE_PERIPH_BRIDGE1 2 /* H32MX Peripheral Bridge 1 */ > +#define H32MX_SLAVE_EBI 3 /* External Bus Interface */ > +#define H32MX_SLAVE_NFC_CMD 3 /* NFC command Register */ > +#define H32MX_SLAVE_NFC_SRAM 4 /* NFC SRAM */ > +#define H32MX_SLAVE_USB 5 /* USB Device & Host */ > +#define H32MX_SLAVE_SMD 6 /* Soft Modem (SMD) */ > + > /* sama5d4 series chip id definitions */ > #define ARCH_ID_SAMA5D4 0x8a5c07c0 > #define ARCH_EXID_SAMA5D41 0x00000001 > diff --git a/arch/arm/mach-at91/matrix.c b/arch/arm/mach-at91/matrix.c > index cf36386..57d7270 100644 > --- a/arch/arm/mach-at91/matrix.c > +++ b/arch/arm/mach-at91/matrix.c > @@ -15,37 +15,20 @@ 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++) { > + /* DDR port 1 ~ port 7 */ > + for (i = H64MX_SLAVE_DDRC_PORT1; i <= H64MX_SLAVE_DDRC_PORT7; i++) { > writel(0x000f0f0f, &h64mx->ssr[i]); > writel(0x0000ffff, &h64mx->sassr[i]); > writel(0x0000000f, &h64mx->srtsr[i]); > } > > - /* CS3 */ > - writel(0x00c0c0c0, &h32mx->ssr[3]); > - writel(0xff000000, &h32mx->sassr[3]); > - writel(0xff000000, &h32mx->srtsr[3]); > + /* EBI CS3 (NANDFlash 128M) and NFC Command Registers(128M) */ > + writel(0x00c0c0c0, &h32mx->ssr[H32MX_SLAVE_EBI]); > + writel(0xff000000, &h32mx->sassr[H32MX_SLAVE_EBI]); > + writel(0xff000000, &h32mx->srtsr[H32MX_SLAVE_EBI]); > > /* NFC SRAM */ > - writel(0x00010101, &h32mx->ssr[4]); > - writel(0x00000001, &h32mx->sassr[4]); > - writel(0x00000001, &h32mx->srtsr[4]); > - > - /* Configure Programmable Security peripherals on matrix 64 */ > - writel(readl(&h64mx->spselr[0]) | 0x00080000, &h64mx->spselr[0]); > - writel(readl(&h64mx->spselr[1]) | 0x00180000, &h64mx->spselr[1]); > - writel(readl(&h64mx->spselr[2]) | 0x00000008, &h64mx->spselr[2]); > - > - /* 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); > + writel(0x00010101, &h32mx->ssr[H32MX_SLAVE_NFC_SRAM]); > + writel(0x00000001, &h32mx->sassr[H32MX_SLAVE_NFC_SRAM]); > + writel(0x00000001, &h32mx->srtsr[H32MX_SLAVE_NFC_SRAM]); > } ^ permalink raw reply [flat|nested] 10+ messages in thread
* [U-Boot] [PATCH 2/3] arm: at91/spl: matrix: improve implementation of matrix 2015-11-05 2:54 ` Josh Wu @ 2015-11-05 7:57 ` Yang, Wenyou 0 siblings, 0 replies; 10+ messages in thread From: Yang, Wenyou @ 2015-11-05 7:57 UTC (permalink / raw) To: u-boot Hi Josh, Thank you for your review. > -----Original Message----- > From: Wu, Josh > Sent: 2015?11?5? 10:54 > To: Yang, Wenyou; U-Boot Mailing List > Subject: Re: [U-Boot] [PATCH 2/3] arm: at91/spl: matrix: improve implementation > of matrix > > Hi, Wenyou > > On 11/4/2015 2:28 PM, Wenyou Yang wrote: > > To make matrix initialization code sharing with others, use the matrix > > slave id macros, instead of hard-coding. > it is better if you split the following 'removing code' as another patch. Thank you for your advice, next version I will handle it. > > Best Regards, > Josh Wu > > Remove the write protection mode code, it is unneeded for writing > > registers. > > > > Remove the security peripheral selecting code, it is unneeded for SPL > > use-case. > > > > Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com> > > --- > > > > arch/arm/mach-at91/include/mach/sama5d4.h | 25 > +++++++++++++++++++++ > > arch/arm/mach-at91/matrix.c | 35 ++++++++--------------------- > > 2 files changed, 34 insertions(+), 26 deletions(-) > > > > diff --git a/arch/arm/mach-at91/include/mach/sama5d4.h > > b/arch/arm/mach-at91/include/mach/sama5d4.h > > index 3da8aff..449cf0e 100644 > > --- a/arch/arm/mach-at91/include/mach/sama5d4.h > > +++ b/arch/arm/mach-at91/include/mach/sama5d4.h > > @@ -179,6 +179,31 @@ > > #define CPU_HAS_PCR > > #define CPU_HAS_H32MXDIV > > > > +/* MATRIX0(H64MX) slave id definitions */ > > +#define H64MX_SLAVE_AXIMX_BRIDGE 0 /* Bridge from H64MX to > AXIMX */ > > +#define H64MX_SLAVE_PERIPH_BRIDGE 1 /* H64MX Peripheral > Bridge */ > > +#define H64MX_SLAVE_VDEC 2 /* Video Decoder */ > > +#define H64MX_SLAVE_DDRC_PORT0 3 /* DDR2 Port0- > AESOTF */ > > +#define H64MX_SLAVE_DDRC_PORT1 4 /* DDR2 Port1 */ > > +#define H64MX_SLAVE_DDRC_PORT2 5 /* DDR2 Port2 */ > > +#define H64MX_SLAVE_DDRC_PORT3 6 /* DDR2 Port3 */ > > +#define H64MX_SLAVE_DDRC_PORT4 7 /* DDR2 Port4 */ > > +#define H64MX_SLAVE_DDRC_PORT5 8 /* DDR2 Port5 */ > > +#define H64MX_SLAVE_DDRC_PORT6 9 /* DDR2 Port6 */ > > +#define H64MX_SLAVE_DDRC_PORT7 10 /* DDR2 Port7 */ > > +#define H64MX_SLAVE_SRAM 11 /* Internal SRAM 128K */ > > +#define H64MX_SLAVE_H32MX_BRIDGE 12 /* Bridge from H64MX to > H32MX */ > > + > > +/* MATRIX1(H32MX) slave id definitions */ > > +#define H32MX_SLAVE_H64MX_BRIDGE 0 /* Bridge from H32MX to > H64MX */ > > +#define H32MX_SLAVE_PERIPH_BRIDGE0 1 /* H32MX Peripheral > Bridge 0 */ > > +#define H32MX_SLAVE_PERIPH_BRIDGE1 2 /* H32MX Peripheral > Bridge 1 */ > > +#define H32MX_SLAVE_EBI 3 /* External Bus Interface > */ > > +#define H32MX_SLAVE_NFC_CMD 3 /* NFC command > Register */ > > +#define H32MX_SLAVE_NFC_SRAM 4 /* NFC SRAM */ > > +#define H32MX_SLAVE_USB 5 /* USB Device & > Host */ > > +#define H32MX_SLAVE_SMD 6 /* Soft Modem > (SMD) */ > > + > > /* sama5d4 series chip id definitions */ > > #define ARCH_ID_SAMA5D4 0x8a5c07c0 > > #define ARCH_EXID_SAMA5D41 0x00000001 > > diff --git a/arch/arm/mach-at91/matrix.c b/arch/arm/mach-at91/matrix.c > > index cf36386..57d7270 100644 > > --- a/arch/arm/mach-at91/matrix.c > > +++ b/arch/arm/mach-at91/matrix.c > > @@ -15,37 +15,20 @@ 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++) { > > + /* DDR port 1 ~ port 7 */ > > + for (i = H64MX_SLAVE_DDRC_PORT1; i <= > H64MX_SLAVE_DDRC_PORT7; i++) { > > writel(0x000f0f0f, &h64mx->ssr[i]); > > writel(0x0000ffff, &h64mx->sassr[i]); > > writel(0x0000000f, &h64mx->srtsr[i]); > > } > > > > - /* CS3 */ > > - writel(0x00c0c0c0, &h32mx->ssr[3]); > > - writel(0xff000000, &h32mx->sassr[3]); > > - writel(0xff000000, &h32mx->srtsr[3]); > > + /* EBI CS3 (NANDFlash 128M) and NFC Command Registers(128M) */ > > + writel(0x00c0c0c0, &h32mx->ssr[H32MX_SLAVE_EBI]); > > + writel(0xff000000, &h32mx->sassr[H32MX_SLAVE_EBI]); > > + writel(0xff000000, &h32mx->srtsr[H32MX_SLAVE_EBI]); > > > > /* NFC SRAM */ > > - writel(0x00010101, &h32mx->ssr[4]); > > - writel(0x00000001, &h32mx->sassr[4]); > > - writel(0x00000001, &h32mx->srtsr[4]); > > - > > - /* Configure Programmable Security peripherals on matrix 64 */ > > - writel(readl(&h64mx->spselr[0]) | 0x00080000, &h64mx->spselr[0]); > > - writel(readl(&h64mx->spselr[1]) | 0x00180000, &h64mx->spselr[1]); > > - writel(readl(&h64mx->spselr[2]) | 0x00000008, &h64mx->spselr[2]); > > - > > - /* 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); > > + writel(0x00010101, &h32mx->ssr[H32MX_SLAVE_NFC_SRAM]); > > + writel(0x00000001, &h32mx->sassr[H32MX_SLAVE_NFC_SRAM]); > > + writel(0x00000001, &h32mx->srtsr[H32MX_SLAVE_NFC_SRAM]); > > } Best Regards, Wenyou Yang ^ permalink raw reply [flat|nested] 10+ messages in thread
* [U-Boot] [PATCH 3/3] arm: at91: spl/atmel_sfr: move saic redirect to separate file 2015-11-04 6:28 [U-Boot] [PATCH 0/3] arm: at91/spl: make matrix and saic redirect sharing with others Wenyou Yang 2015-11-04 6:28 ` [U-Boot] [PATCH 1/3] arm: at91/spl: matrix: move matrix init to separate file Wenyou Yang 2015-11-04 6:28 ` [U-Boot] [PATCH 2/3] arm: at91/spl: matrix: improve implementation of matrix Wenyou Yang @ 2015-11-04 6:28 ` Wenyou Yang 2015-11-05 2:58 ` Josh Wu 2 siblings, 1 reply; 10+ messages in thread From: Wenyou Yang @ 2015-11-04 6:28 UTC (permalink / raw) To: u-boot To make saic redirect code sharing with other SoCs, move the saic redirect code from SAMA5D4 particular file, mach-at91/armv7/sama5d4_devices.c to a separate file, mach-at91/atmel_sfr.c Move ATMEL_SFR_AICREDIR_KEY definition to sama5d4.h, because each SoC has its own value. Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com> --- arch/arm/mach-at91/Makefile | 2 +- arch/arm/mach-at91/armv7/sama5d4_devices.c | 13 ------------- arch/arm/mach-at91/atmel_sfr.c | 21 +++++++++++++++++++++ arch/arm/mach-at91/include/mach/sama5_sfr.h | 1 - arch/arm/mach-at91/include/mach/sama5d4.h | 3 +++ 5 files changed, 25 insertions(+), 15 deletions(-) create mode 100644 arch/arm/mach-at91/atmel_sfr.c diff --git a/arch/arm/mach-at91/Makefile b/arch/arm/mach-at91/Makefile index 649aff2..ca60397 100644 --- a/arch/arm/mach-at91/Makefile +++ b/arch/arm/mach-at91/Makefile @@ -6,7 +6,7 @@ obj-$(CONFIG_AT91SAM9M10G45) += mpddrc.o spl_at91.o obj-$(CONFIG_AT91SAM9N12) += mpddrc.o spl_at91.o obj-$(CONFIG_AT91SAM9X5) += mpddrc.o spl_at91.o obj-$(CONFIG_SAMA5D3) += mpddrc.o spl_atmel.o -obj-$(CONFIG_SAMA5D4) += mpddrc.o spl_atmel.o matrix.o +obj-$(CONFIG_SAMA5D4) += mpddrc.o spl_atmel.o matrix.o atmel_sfr.o obj-y += spl.o endif diff --git a/arch/arm/mach-at91/armv7/sama5d4_devices.c b/arch/arm/mach-at91/armv7/sama5d4_devices.c index 52f4862..ce33cd4 100644 --- a/arch/arm/mach-at91/armv7/sama5d4_devices.c +++ b/arch/arm/mach-at91/armv7/sama5d4_devices.c @@ -45,16 +45,3 @@ void at91_udp_hw_init(void) at91_periph_clk_enable(ATMEL_ID_UDPHS); } #endif - -#ifdef CONFIG_SPL_BUILD -void redirect_int_from_saic_to_aic(void) -{ - struct atmel_sfr *sfr = (struct atmel_sfr *)ATMEL_BASE_SFR; - u32 key32; - - if (!(readl(&sfr->aicredir) & ATMEL_SFR_AICREDIR_NSAIC)) { - key32 = readl(&sfr->sn1) ^ ATMEL_SFR_AICREDIR_KEY; - writel((key32 | ATMEL_SFR_AICREDIR_NSAIC), &sfr->aicredir); - } -} -#endif diff --git a/arch/arm/mach-at91/atmel_sfr.c b/arch/arm/mach-at91/atmel_sfr.c new file mode 100644 index 0000000..2bccb84 --- /dev/null +++ b/arch/arm/mach-at91/atmel_sfr.c @@ -0,0 +1,21 @@ +/* + * Copyright (C) 2015 Atmel Corporation + * Wenyou Yang <wenyou.yang@atmel.com> + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#include <common.h> +#include <asm/io.h> +#include <asm/arch/sama5_sfr.h> + +void redirect_int_from_saic_to_aic(void) +{ + struct atmel_sfr *sfr = (struct atmel_sfr *)ATMEL_BASE_SFR; + u32 key32; + + if (!(readl(&sfr->aicredir) & ATMEL_SFR_AICREDIR_NSAIC)) { + key32 = readl(&sfr->sn1) ^ ATMEL_SFR_AICREDIR_KEY; + writel((key32 | ATMEL_SFR_AICREDIR_NSAIC), &sfr->aicredir); + } +} diff --git a/arch/arm/mach-at91/include/mach/sama5_sfr.h b/arch/arm/mach-at91/include/mach/sama5_sfr.h index 3081d37..7b19a20 100644 --- a/arch/arm/mach-at91/include/mach/sama5_sfr.h +++ b/arch/arm/mach-at91/include/mach/sama5_sfr.h @@ -32,7 +32,6 @@ struct atmel_sfr { #define ATMEL_SFR_DDRCFG_FDQSIEN 0x00020000 /* Bit field in AICREDIR */ -#define ATMEL_SFR_AICREDIR_KEY 0x5F67B102 #define ATMEL_SFR_AICREDIR_NSAIC 0x00000001 #endif diff --git a/arch/arm/mach-at91/include/mach/sama5d4.h b/arch/arm/mach-at91/include/mach/sama5d4.h index 449cf0e..90085da 100644 --- a/arch/arm/mach-at91/include/mach/sama5d4.h +++ b/arch/arm/mach-at91/include/mach/sama5d4.h @@ -204,6 +204,9 @@ #define H32MX_SLAVE_USB 5 /* USB Device & Host */ #define H32MX_SLAVE_SMD 6 /* Soft Modem (SMD) */ +/* AICREDIR Unlock Key */ +#define ATMEL_SFR_AICREDIR_KEY 0x5F67B102 + /* sama5d4 series chip id definitions */ #define ARCH_ID_SAMA5D4 0x8a5c07c0 #define ARCH_EXID_SAMA5D41 0x00000001 -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [U-Boot] [PATCH 3/3] arm: at91: spl/atmel_sfr: move saic redirect to separate file 2015-11-04 6:28 ` [U-Boot] [PATCH 3/3] arm: at91: spl/atmel_sfr: move saic redirect to separate file Wenyou Yang @ 2015-11-05 2:58 ` Josh Wu 2015-11-05 7:55 ` Yang, Wenyou 0 siblings, 1 reply; 10+ messages in thread From: Josh Wu @ 2015-11-05 2:58 UTC (permalink / raw) To: u-boot Hi, Wenyou On 11/4/2015 2:28 PM, Wenyou Yang wrote: > To make saic redirect code sharing with other SoCs, move the > saic redirect code from SAMA5D4 particular file, > mach-at91/armv7/sama5d4_devices.c to a separate file, > mach-at91/atmel_sfr.c maybe move it as mach-at91/armv7/atmel_sfr.c? Best Regards, Josh Wu > > Move ATMEL_SFR_AICREDIR_KEY definition to sama5d4.h, because each > SoC has its own value. > > Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com> > --- > > arch/arm/mach-at91/Makefile | 2 +- > arch/arm/mach-at91/armv7/sama5d4_devices.c | 13 ------------- > arch/arm/mach-at91/atmel_sfr.c | 21 +++++++++++++++++++++ > arch/arm/mach-at91/include/mach/sama5_sfr.h | 1 - > arch/arm/mach-at91/include/mach/sama5d4.h | 3 +++ > 5 files changed, 25 insertions(+), 15 deletions(-) > create mode 100644 arch/arm/mach-at91/atmel_sfr.c > > diff --git a/arch/arm/mach-at91/Makefile b/arch/arm/mach-at91/Makefile > index 649aff2..ca60397 100644 > --- a/arch/arm/mach-at91/Makefile > +++ b/arch/arm/mach-at91/Makefile > @@ -6,7 +6,7 @@ obj-$(CONFIG_AT91SAM9M10G45) += mpddrc.o spl_at91.o > obj-$(CONFIG_AT91SAM9N12) += mpddrc.o spl_at91.o > obj-$(CONFIG_AT91SAM9X5) += mpddrc.o spl_at91.o > obj-$(CONFIG_SAMA5D3) += mpddrc.o spl_atmel.o > -obj-$(CONFIG_SAMA5D4) += mpddrc.o spl_atmel.o matrix.o > +obj-$(CONFIG_SAMA5D4) += mpddrc.o spl_atmel.o matrix.o atmel_sfr.o > obj-y += spl.o > endif > > diff --git a/arch/arm/mach-at91/armv7/sama5d4_devices.c b/arch/arm/mach-at91/armv7/sama5d4_devices.c > index 52f4862..ce33cd4 100644 > --- a/arch/arm/mach-at91/armv7/sama5d4_devices.c > +++ b/arch/arm/mach-at91/armv7/sama5d4_devices.c > @@ -45,16 +45,3 @@ void at91_udp_hw_init(void) > at91_periph_clk_enable(ATMEL_ID_UDPHS); > } > #endif > - > -#ifdef CONFIG_SPL_BUILD > -void redirect_int_from_saic_to_aic(void) > -{ > - struct atmel_sfr *sfr = (struct atmel_sfr *)ATMEL_BASE_SFR; > - u32 key32; > - > - if (!(readl(&sfr->aicredir) & ATMEL_SFR_AICREDIR_NSAIC)) { > - key32 = readl(&sfr->sn1) ^ ATMEL_SFR_AICREDIR_KEY; > - writel((key32 | ATMEL_SFR_AICREDIR_NSAIC), &sfr->aicredir); > - } > -} > -#endif > diff --git a/arch/arm/mach-at91/atmel_sfr.c b/arch/arm/mach-at91/atmel_sfr.c > new file mode 100644 > index 0000000..2bccb84 > --- /dev/null > +++ b/arch/arm/mach-at91/atmel_sfr.c > @@ -0,0 +1,21 @@ > +/* > + * Copyright (C) 2015 Atmel Corporation > + * Wenyou Yang <wenyou.yang@atmel.com> > + * > + * SPDX-License-Identifier: GPL-2.0+ > + */ > + > +#include <common.h> > +#include <asm/io.h> > +#include <asm/arch/sama5_sfr.h> > + > +void redirect_int_from_saic_to_aic(void) > +{ > + struct atmel_sfr *sfr = (struct atmel_sfr *)ATMEL_BASE_SFR; > + u32 key32; > + > + if (!(readl(&sfr->aicredir) & ATMEL_SFR_AICREDIR_NSAIC)) { > + key32 = readl(&sfr->sn1) ^ ATMEL_SFR_AICREDIR_KEY; > + writel((key32 | ATMEL_SFR_AICREDIR_NSAIC), &sfr->aicredir); > + } > +} > diff --git a/arch/arm/mach-at91/include/mach/sama5_sfr.h b/arch/arm/mach-at91/include/mach/sama5_sfr.h > index 3081d37..7b19a20 100644 > --- a/arch/arm/mach-at91/include/mach/sama5_sfr.h > +++ b/arch/arm/mach-at91/include/mach/sama5_sfr.h > @@ -32,7 +32,6 @@ struct atmel_sfr { > #define ATMEL_SFR_DDRCFG_FDQSIEN 0x00020000 > > /* Bit field in AICREDIR */ > -#define ATMEL_SFR_AICREDIR_KEY 0x5F67B102 > #define ATMEL_SFR_AICREDIR_NSAIC 0x00000001 > > #endif > diff --git a/arch/arm/mach-at91/include/mach/sama5d4.h b/arch/arm/mach-at91/include/mach/sama5d4.h > index 449cf0e..90085da 100644 > --- a/arch/arm/mach-at91/include/mach/sama5d4.h > +++ b/arch/arm/mach-at91/include/mach/sama5d4.h > @@ -204,6 +204,9 @@ > #define H32MX_SLAVE_USB 5 /* USB Device & Host */ > #define H32MX_SLAVE_SMD 6 /* Soft Modem (SMD) */ > > +/* AICREDIR Unlock Key */ > +#define ATMEL_SFR_AICREDIR_KEY 0x5F67B102 > + > /* sama5d4 series chip id definitions */ > #define ARCH_ID_SAMA5D4 0x8a5c07c0 > #define ARCH_EXID_SAMA5D41 0x00000001 ^ permalink raw reply [flat|nested] 10+ messages in thread
* [U-Boot] [PATCH 3/3] arm: at91: spl/atmel_sfr: move saic redirect to separate file 2015-11-05 2:58 ` Josh Wu @ 2015-11-05 7:55 ` Yang, Wenyou 0 siblings, 0 replies; 10+ messages in thread From: Yang, Wenyou @ 2015-11-05 7:55 UTC (permalink / raw) To: u-boot Hi Josh, Thank you for your review. > -----Original Message----- > From: Wu, Josh > Sent: 2015?11?5? 10:59 > To: Yang, Wenyou; U-Boot Mailing List > Subject: Re: [U-Boot] [PATCH 3/3] arm: at91: spl/atmel_sfr: move saic redirect to > separate file > > Hi, Wenyou > > On 11/4/2015 2:28 PM, Wenyou Yang wrote: > > To make saic redirect code sharing with other SoCs, move the saic > > redirect code from SAMA5D4 particular file, > > mach-at91/armv7/sama5d4_devices.c to a separate file, > > mach-at91/atmel_sfr.c > > maybe move it as mach-at91/armv7/atmel_sfr.c? The explanation is given at the previous mail. > > Best Regards, > Josh Wu > > > > Move ATMEL_SFR_AICREDIR_KEY definition to sama5d4.h, because each > SoC > > has its own value. > > > > Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com> > > --- > > > > arch/arm/mach-at91/Makefile | 2 +- > > arch/arm/mach-at91/armv7/sama5d4_devices.c | 13 ------------- > > arch/arm/mach-at91/atmel_sfr.c | 21 +++++++++++++++++++++ > > arch/arm/mach-at91/include/mach/sama5_sfr.h | 1 - > > arch/arm/mach-at91/include/mach/sama5d4.h | 3 +++ > > 5 files changed, 25 insertions(+), 15 deletions(-) > > create mode 100644 arch/arm/mach-at91/atmel_sfr.c > > > > diff --git a/arch/arm/mach-at91/Makefile b/arch/arm/mach-at91/Makefile > > index 649aff2..ca60397 100644 > > --- a/arch/arm/mach-at91/Makefile > > +++ b/arch/arm/mach-at91/Makefile > > @@ -6,7 +6,7 @@ obj-$(CONFIG_AT91SAM9M10G45) += mpddrc.o > spl_at91.o > > obj-$(CONFIG_AT91SAM9N12) += mpddrc.o spl_at91.o > > obj-$(CONFIG_AT91SAM9X5) += mpddrc.o spl_at91.o > > obj-$(CONFIG_SAMA5D3) += mpddrc.o spl_atmel.o > > -obj-$(CONFIG_SAMA5D4) += mpddrc.o spl_atmel.o matrix.o > > +obj-$(CONFIG_SAMA5D4) += mpddrc.o spl_atmel.o matrix.o atmel_sfr.o > > obj-y += spl.o > > endif > > > > diff --git a/arch/arm/mach-at91/armv7/sama5d4_devices.c > > b/arch/arm/mach-at91/armv7/sama5d4_devices.c > > index 52f4862..ce33cd4 100644 > > --- a/arch/arm/mach-at91/armv7/sama5d4_devices.c > > +++ b/arch/arm/mach-at91/armv7/sama5d4_devices.c > > @@ -45,16 +45,3 @@ void at91_udp_hw_init(void) > > at91_periph_clk_enable(ATMEL_ID_UDPHS); > > } > > #endif > > - > > -#ifdef CONFIG_SPL_BUILD > > -void redirect_int_from_saic_to_aic(void) > > -{ > > - struct atmel_sfr *sfr = (struct atmel_sfr *)ATMEL_BASE_SFR; > > - u32 key32; > > - > > - if (!(readl(&sfr->aicredir) & ATMEL_SFR_AICREDIR_NSAIC)) { > > - key32 = readl(&sfr->sn1) ^ ATMEL_SFR_AICREDIR_KEY; > > - writel((key32 | ATMEL_SFR_AICREDIR_NSAIC), &sfr->aicredir); > > - } > > -} > > -#endif > > diff --git a/arch/arm/mach-at91/atmel_sfr.c > > b/arch/arm/mach-at91/atmel_sfr.c new file mode 100644 index > > 0000000..2bccb84 > > --- /dev/null > > +++ b/arch/arm/mach-at91/atmel_sfr.c > > @@ -0,0 +1,21 @@ > > +/* > > + * Copyright (C) 2015 Atmel Corporation > > + * Wenyou Yang <wenyou.yang@atmel.com> > > + * > > + * SPDX-License-Identifier: GPL-2.0+ > > + */ > > + > > +#include <common.h> > > +#include <asm/io.h> > > +#include <asm/arch/sama5_sfr.h> > > + > > +void redirect_int_from_saic_to_aic(void) > > +{ > > + struct atmel_sfr *sfr = (struct atmel_sfr *)ATMEL_BASE_SFR; > > + u32 key32; > > + > > + if (!(readl(&sfr->aicredir) & ATMEL_SFR_AICREDIR_NSAIC)) { > > + key32 = readl(&sfr->sn1) ^ ATMEL_SFR_AICREDIR_KEY; > > + writel((key32 | ATMEL_SFR_AICREDIR_NSAIC), &sfr->aicredir); > > + } > > +} > > diff --git a/arch/arm/mach-at91/include/mach/sama5_sfr.h > > b/arch/arm/mach-at91/include/mach/sama5_sfr.h > > index 3081d37..7b19a20 100644 > > --- a/arch/arm/mach-at91/include/mach/sama5_sfr.h > > +++ b/arch/arm/mach-at91/include/mach/sama5_sfr.h > > @@ -32,7 +32,6 @@ struct atmel_sfr { > > #define ATMEL_SFR_DDRCFG_FDQSIEN 0x00020000 > > > > /* Bit field in AICREDIR */ > > -#define ATMEL_SFR_AICREDIR_KEY 0x5F67B102 > > #define ATMEL_SFR_AICREDIR_NSAIC 0x00000001 > > > > #endif > > diff --git a/arch/arm/mach-at91/include/mach/sama5d4.h > > b/arch/arm/mach-at91/include/mach/sama5d4.h > > index 449cf0e..90085da 100644 > > --- a/arch/arm/mach-at91/include/mach/sama5d4.h > > +++ b/arch/arm/mach-at91/include/mach/sama5d4.h > > @@ -204,6 +204,9 @@ > > #define H32MX_SLAVE_USB 5 /* USB Device & > Host */ > > #define H32MX_SLAVE_SMD 6 /* Soft Modem > (SMD) */ > > > > +/* AICREDIR Unlock Key */ > > +#define ATMEL_SFR_AICREDIR_KEY 0x5F67B102 > > + > > /* sama5d4 series chip id definitions */ > > #define ARCH_ID_SAMA5D4 0x8a5c07c0 > > #define ARCH_EXID_SAMA5D41 0x00000001 Best Regards, Wenyou Yang ^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2015-11-05 7:57 UTC | newest] Thread overview: 10+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2015-11-04 6:28 [U-Boot] [PATCH 0/3] arm: at91/spl: make matrix and saic redirect sharing with others Wenyou Yang 2015-11-04 6:28 ` [U-Boot] [PATCH 1/3] arm: at91/spl: matrix: move matrix init to separate file Wenyou Yang 2015-11-05 2:52 ` Josh Wu 2015-11-05 7:54 ` Yang, Wenyou 2015-11-04 6:28 ` [U-Boot] [PATCH 2/3] arm: at91/spl: matrix: improve implementation of matrix Wenyou Yang 2015-11-05 2:54 ` Josh Wu 2015-11-05 7:57 ` Yang, Wenyou 2015-11-04 6:28 ` [U-Boot] [PATCH 3/3] arm: at91: spl/atmel_sfr: move saic redirect to separate file Wenyou Yang 2015-11-05 2:58 ` Josh Wu 2015-11-05 7:55 ` Yang, Wenyou
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox