Message ID | 1383635266-15780-1-git-send-email-josh.wu@atmel.com |
---|---|
State | Accepted, archived |
Delegated to: | Andreas Bießmann |
Headers | show |
Hi Josh, On 11/5/2013 15:07, Josh Wu wrote: > The SAMA5D36 chip is the superset product of SAMA5D3x family. > > For detail information please refer to: > http://www.atmel.com/Microsite/sama5d3/default.aspx > > Signed-off-by: Josh Wu <josh.wu@atmel.com> > --- > arch/arm/cpu/armv7/at91/sama5d3_devices.c | 4 +++- > arch/arm/include/asm/arch-at91/sama5d3.h | 3 +++ > 2 files changed, 6 insertions(+), 1 deletion(-) Acked-by: Bo Shen <voice.shen@atmel.com> > diff --git a/arch/arm/cpu/armv7/at91/sama5d3_devices.c b/arch/arm/cpu/armv7/at91/sama5d3_devices.c > index 51f0a6d..7ebee87 100644 > --- a/arch/arm/cpu/armv7/at91/sama5d3_devices.c > +++ b/arch/arm/cpu/armv7/at91/sama5d3_devices.c > @@ -15,7 +15,7 @@ > > unsigned int has_emac() > { > - return cpu_is_sama5d31() || cpu_is_sama5d35(); > + return cpu_is_sama5d31() || cpu_is_sama5d35() || cpu_is_sama5d36(); > } > > unsigned int has_gmac() > @@ -42,6 +42,8 @@ char *get_cpu_name() > return "SAMA5D34"; > case ARCH_EXID_SAMA5D35: > return "SAMA5D35"; > + case ARCH_EXID_SAMA5D36: > + return "SAMA5D36"; > default: > return "Unknown CPU type"; > } > diff --git a/arch/arm/include/asm/arch-at91/sama5d3.h b/arch/arm/include/asm/arch-at91/sama5d3.h > index 123a627..6d936f4 100644 > --- a/arch/arm/include/asm/arch-at91/sama5d3.h > +++ b/arch/arm/include/asm/arch-at91/sama5d3.h > @@ -79,6 +79,7 @@ > #define ARCH_EXID_SAMA5D33 0x00414300 > #define ARCH_EXID_SAMA5D34 0x00414301 > #define ARCH_EXID_SAMA5D35 0x00584300 > +#define ARCH_EXID_SAMA5D36 0x00004301 > > #define cpu_is_sama5d3() (get_chip_id() == ARCH_ID_SAMA5D3) > #define cpu_is_sama5d31() (cpu_is_sama5d3() && \ > @@ -89,6 +90,8 @@ > (get_extension_chip_id() == ARCH_EXID_SAMA5D34)) > #define cpu_is_sama5d35() (cpu_is_sama5d3() && \ > (get_extension_chip_id() == ARCH_EXID_SAMA5D35)) > +#define cpu_is_sama5d36() (cpu_is_sama5d3() && \ > + (get_extension_chip_id() == ARCH_EXID_SAMA5D36)) > > /* > * User Peripherals physical base addresses. > Best Regards, Bo Shen
Dear Josh Wu, Josh Wu <Josh.wu@atmel.com> writes: >The SAMA5D36 chip is the superset product of SAMA5D3x family. > >For detail information please refer to: > http://www.atmel.com/Microsite/sama5d3/default.aspx > >Signed-off-by: Josh Wu <josh.wu@atmel.com> >Acked-by: Bo Shen <voice.shen@atmel.com> > >--- >arch/arm/cpu/armv7/at91/sama5d3_devices.c | 4 +++- > arch/arm/include/asm/arch-at91/sama5d3.h | 3 +++ > 2 files changed, 6 insertions(+), 1 deletion(-) applied to u-boot-atmel/master, thanks! Best regards, Andreas Bießmann
diff --git a/arch/arm/cpu/armv7/at91/sama5d3_devices.c b/arch/arm/cpu/armv7/at91/sama5d3_devices.c index 51f0a6d..7ebee87 100644 --- a/arch/arm/cpu/armv7/at91/sama5d3_devices.c +++ b/arch/arm/cpu/armv7/at91/sama5d3_devices.c @@ -15,7 +15,7 @@ unsigned int has_emac() { - return cpu_is_sama5d31() || cpu_is_sama5d35(); + return cpu_is_sama5d31() || cpu_is_sama5d35() || cpu_is_sama5d36(); } unsigned int has_gmac() @@ -42,6 +42,8 @@ char *get_cpu_name() return "SAMA5D34"; case ARCH_EXID_SAMA5D35: return "SAMA5D35"; + case ARCH_EXID_SAMA5D36: + return "SAMA5D36"; default: return "Unknown CPU type"; } diff --git a/arch/arm/include/asm/arch-at91/sama5d3.h b/arch/arm/include/asm/arch-at91/sama5d3.h index 123a627..6d936f4 100644 --- a/arch/arm/include/asm/arch-at91/sama5d3.h +++ b/arch/arm/include/asm/arch-at91/sama5d3.h @@ -79,6 +79,7 @@ #define ARCH_EXID_SAMA5D33 0x00414300 #define ARCH_EXID_SAMA5D34 0x00414301 #define ARCH_EXID_SAMA5D35 0x00584300 +#define ARCH_EXID_SAMA5D36 0x00004301 #define cpu_is_sama5d3() (get_chip_id() == ARCH_ID_SAMA5D3) #define cpu_is_sama5d31() (cpu_is_sama5d3() && \ @@ -89,6 +90,8 @@ (get_extension_chip_id() == ARCH_EXID_SAMA5D34)) #define cpu_is_sama5d35() (cpu_is_sama5d3() && \ (get_extension_chip_id() == ARCH_EXID_SAMA5D35)) +#define cpu_is_sama5d36() (cpu_is_sama5d3() && \ + (get_extension_chip_id() == ARCH_EXID_SAMA5D36)) /* * User Peripherals physical base addresses.
The SAMA5D36 chip is the superset product of SAMA5D3x family. For detail information please refer to: http://www.atmel.com/Microsite/sama5d3/default.aspx Signed-off-by: Josh Wu <josh.wu@atmel.com> --- arch/arm/cpu/armv7/at91/sama5d3_devices.c | 4 +++- arch/arm/include/asm/arch-at91/sama5d3.h | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-)