introduce support for Atmel Cortex-A5 devices
Subsystems (5)
v3 cover introduce support for Atmel Cortex-A5 devices
From: Ludovic Desroches <[email protected]>
Hello,
Updated set of patches for SAMA5D3 family support, based on Jean-Christophe ARM: at91: Kconfig cleanup for prepare add of Cortex-A5 Sama5 patches.
v3 changes:
- put device tree files and defconfig file in separate patches
v2 changes:
- remove ARM: at91: fix infinite loop in at91_irq_suspend/resume taken as 3.9 fix
- add missing patch: ARM: at91: change name template in AT91_SOC_START macro
- remove select HAVE_NET_MACB
Ludovic Desroches (6):
ARM: at91: change name template in AT91_SOC_START macro
ARM: at91: add AT91_SAM9_TIME entry to select at91sam926x_time.c
compilation
ARM: at91: introduce the core type choice to split ARMv4/5 and ARMv7
arch
ARM: at91: introduce SAMA5 support
ARM: at91: dt: add device tree files for SAMA5D3 family
ARM: at91: add defconfig for SAMA5
arch/arm/boot/dts/Makefile | 5 + arch/arm/boot/dts/sama5d3.dtsi | 1031 ++++++++++++++++++++++++++++ arch/arm/boot/dts/sama5d31ek.dts | 51 ++ arch/arm/boot/dts/sama5d33ek.dts | 44 ++ arch/arm/boot/dts/sama5d34ek.dts | 61 ++ arch/arm/boot/dts/sama5d35ek.dts | 56 ++ arch/arm/boot/dts/sama5d3xcm.dtsi | 91 +++ arch/arm/boot/dts/sama5d3xdm.dtsi | 42 ++ arch/arm/boot/dts/sama5d3xmb.dtsi | 166 +++++ arch/arm/configs/sama5_defconfig | 181 +++++ arch/arm/mach-at91/Kconfig | 59 +- arch/arm/mach-at91/Makefile | 7 +- arch/arm/mach-at91/at91rm9200.c | 2 +- arch/arm/mach-at91/at91sam9260.c | 2 +- arch/arm/mach-at91/at91sam9261.c | 2 +- arch/arm/mach-at91/at91sam9263.c | 2 +- arch/arm/mach-at91/at91sam9g45.c | 2 +- arch/arm/mach-at91/at91sam9n12.c | 2 +- arch/arm/mach-at91/at91sam9rl.c | 2 +- arch/arm/mach-at91/at91sam9x5.c | 2 +- arch/arm/mach-at91/board-dt-sama5.c | 86 +++ arch/arm/mach-at91/clock.c | 109 ++- arch/arm/mach-at91/clock.h | 2 + arch/arm/mach-at91/include/mach/at91_pmc.h | 18 +- arch/arm/mach-at91/include/mach/cpu.h | 20 + arch/arm/mach-at91/include/mach/sama5d3.h | 73 ++ arch/arm/mach-at91/sama5d3.c | 377 ++++++++++ arch/arm/mach-at91/setup.c | 27 + arch/arm/mach-at91/soc.h | 7 +- 29 files changed, 2486 insertions(+), 43 deletions(-) create mode 100644 arch/arm/boot/dts/sama5d3.dtsi create mode 100644 arch/arm/boot/dts/sama5d31ek.dts create mode 100644 arch/arm/boot/dts/sama5d33ek.dts create mode 100644 arch/arm/boot/dts/sama5d34ek.dts create mode 100644 arch/arm/boot/dts/sama5d35ek.dts create mode 100644 arch/arm/boot/dts/sama5d3xcm.dtsi create mode 100644 arch/arm/boot/dts/sama5d3xdm.dtsi create mode 100644 arch/arm/boot/dts/sama5d3xmb.dtsi create mode 100644 arch/arm/configs/sama5_defconfig create mode 100644 arch/arm/mach-at91/board-dt-sama5.c create mode 100644 arch/arm/mach-at91/include/mach/sama5d3.h create mode 100644 arch/arm/mach-at91/sama5d3.c
Signature · 1 line
1.7.11.3
PATCH v3 1/6 ARM: at91: change name template in AT91_SOC_START macro
From: Ludovic Desroches <[email protected]>
New devices are no more prefixed with at91 so remove the at91 and _name concatenation.
--- arch/arm/mach-at91/at91rm9200.c | 2 +- arch/arm/mach-at91/at91sam9260.c | 2 +- arch/arm/mach-at91/at91sam9261.c | 2 +- arch/arm/mach-at91/at91sam9263.c | 2 +- arch/arm/mach-at91/at91sam9g45.c | 2 +- arch/arm/mach-at91/at91sam9n12.c | 2 +- arch/arm/mach-at91/at91sam9rl.c | 2 +- arch/arm/mach-at91/at91sam9x5.c | 2 +- arch/arm/mach-at91/soc.h | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-)
arch/arm/mach-at91/at91rm9200.c +1 -1
@@ -384,7 +384,7 @@ static unsigned int at91rm9200_default_irq_priority[NR_AIC_IRQS] __initdata = { 0 /* Advanced Interrupt Controller (IRQ6) */ }; -AT91_SOC_START (rm9200) +AT91_SOC_START (at91rm9200) .map_io = at91rm9200_map_io, .default_irq_priority = at91rm9200_default_irq_priority, .ioremap_registers = at91rm9200_ioremap_registers,
arch/arm/mach-at91/at91sam9260.c +1 -1
@@ -395,7 +395,7 @@ static unsigned int at91sam9260_default_irq_priority[NR_AIC_IRQS] __initdata = {0 ,/* Advanced Interrupt Controller */ }; -AT91_SOC_START (sam9260) +AT91_SOC_START (at91sam9260) .map_io = at91sam9260_map_io, .default_irq_priority = at91sam9260_default_irq_priority, .ioremap_registers = at91sam9260_ioremap_registers,
arch/arm/mach-at91/at91sam9261.c +1 -1
@@ -337,7 +337,7 @@ static unsigned int at91sam9261_default_irq_priority[NR_AIC_IRQS] __initdata = {0 ,/* Advanced Interrupt Controller */ }; -AT91_SOC_START (sam9261) +AT91_SOC_START (at91sam9261) .map_io = at91sam9261_map_io, .default_irq_priority = at91sam9261_default_irq_priority, .ioremap_registers = at91sam9261_ioremap_registers,
arch/arm/mach-at91/at91sam9263.c +1 -1
@@ -374,7 +374,7 @@ static unsigned int at91sam9263_default_irq_priority[NR_AIC_IRQS] __initdata = {0 ,/* Advanced Interrupt Controller (IRQ1) */ }; -AT91_SOC_START (sam9263) +AT91_SOC_START (at91sam9263) .map_io = at91sam9263_map_io, .default_irq_priority = at91sam9263_default_irq_priority, .ioremap_registers = at91sam9263_ioremap_registers,
arch/arm/mach-at91/at91sam9g45.c +1 -1
@@ -418,7 +418,7 @@ static unsigned int at91sam9g45_default_irq_priority[NR_AIC_IRQS] __initdata = {0 ,/* Advanced Interrupt Controller (IRQ0) */ }; -AT91_SOC_START (sam9g45) +AT91_SOC_START (at91sam9g45) .map_io = at91sam9g45_map_io, .default_irq_priority = at91sam9g45_default_irq_priority, .ioremap_registers = at91sam9g45_ioremap_registers,
arch/arm/mach-at91/at91sam9n12.c +1 -1
@@ -226,7 +226,7 @@ void __init at91sam9n12_initialize(void) at91_extern_irq = (1 <<AT91SAM9N12_ID_IRQ0 ); } -AT91_SOC_START (sam9n12) +AT91_SOC_START (at91sam9n12) .map_io = at91sam9n12_map_io, .register_clocks = at91sam9n12_register_clocks, .init = at91sam9n12_initialize,
arch/arm/mach-at91/at91sam9rl.c +1 -1
@@ -340,7 +340,7 @@ static unsigned int at91sam9rl_default_irq_priority[NR_AIC_IRQS] __initdata = {0 ,/* Advanced Interrupt Controller */ }; -AT91_SOC_START (sam9rl) +AT91_SOC_START (at91sam9rl) .map_io = at91sam9rl_map_io, .default_irq_priority = at91sam9rl_default_irq_priority, .ioremap_registers = at91sam9rl_ioremap_registers,
arch/arm/mach-at91/at91sam9x5.c +1 -1
@@ -320,7 +320,7 @@ static void __init at91sam9x5_map_io(void)* Interrupt initialization * -------------------------------------------------------------------- */ -AT91_SOC_START (sam9x5) +AT91_SOC_START (at91sam9x5) .map_io = at91sam9x5_map_io, .register_clocks = at91sam9x5_register_clocks,AT91_SOC_END
arch/arm/mach-at91/soc.h +1 -1
@@ -24,7 +24,7 @@ extern struct at91_init_soc at91sam9x5_soc;extern struct at91_init_soc at91sam9n12_soc;#define AT91_SOC_START (_name) \ -struct at91_init_soc __initdata at91##_name##_soc \ +struct at91_init_soc __initdata _name##_soc \ __used \ = { \ .builtin = 1, \
Signature · 1 line
1.7.11.3
PATCH v3 2/6 ARM: at91: add AT91_SAM9_TIME entry to select at91sam926x_time.c compilation
In reply to ludovic.desroches at atmel.comFrom: Ludovic Desroches <[email protected]>
No more associate at91sam926x_time.c compilation with SOC_AT91SAM9 entry since SAMA5D3 devices will use this driver too.
--- arch/arm/mach-at91/Kconfig | 4 ++++ arch/arm/mach-at91/Makefile | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-)
arch/arm/mach-at91/Kconfig +4 -0
@@ -14,8 +14,12 @@ config AT91_SAM9G45_RESET bool default !ARCH_AT91X40 +config AT91_SAM9_TIME + bool + config SOC_AT91SAM9 bool + select AT91_SAM9_TIME select CPU_ARM926T select GENERIC_CLOCKEVENTS select MULTI_IRQ_HANDLER
arch/arm/mach-at91/Makefile +2 -1
@@ -10,7 +10,8 @@ obj- := obj-$(CONFIG_AT91_PMC_UNIT) += clock.o obj-$(CONFIG_AT91_SAM9_ALT_RESET) += at91sam9_alt_reset.o obj-$(CONFIG_AT91_SAM9G45_RESET) += at91sam9g45_reset.o -obj-$(CONFIG_SOC_AT91SAM9) += at91sam926x_time.o sam9_smc.o +obj-$(CONFIG_AT91_SAM9_TIME) += at91sam926x_time.o +obj-$(CONFIG_SOC_AT91SAM9) += sam9_smc.o # CPU-specific support obj-$(CONFIG_SOC_AT91RM9200) += at91rm9200.o at91rm9200_time.o
Signature · 1 line
1.7.11.3
PATCH v3 3/6 ARM: at91: introduce the core type choice to split ARMv4/5 and ARMv7 arch
In reply to ludovic.desroches at atmel.comFrom: Ludovic Desroches <[email protected]>
As we will introduce SAMA5, we need to distinguish the core architecture. It is useless to show ARMv4/5 entries if we are configuring a kernel for SAMA5 devices.
--- arch/arm/mach-at91/Kconfig | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-)
arch/arm/mach-at91/Kconfig +18 -4
@@ -6,6 +6,10 @@ config HAVE_AT91_DBGU0 config HAVE_AT91_DBGU1 bool +config AT91_PMC_UNIT + bool + default !ARCH_AT91X40 + config AT91_SAM9_ALT_RESET bool default !ARCH_AT91X40
@@ -27,8 +31,21 @@ config SOC_AT91SAM9 menu "Atmel AT91 System-on-Chip" +choice + + prompt "Core type" + +config SOC_SAM_V4_V5 + bool "ARM7/ARM9" + help + Select this if you are using one of Atmel's AT91SAM9, AT91RM9200 + or AT91X40 SoC. + +endchoice + comment "Atmel AT91 Processor" +if SOC_SAM_V4_V5 config SOC_AT91RM9200 bool "AT91RM9200" select CPU_ARM920T
@@ -94,13 +111,10 @@ config SOC_AT91SAM9N12 help Select this if you are using Atmel's AT91SAM9N12 SoC. -config AT91_PMC_UNIT - bool - default !ARCH_AT91X40 - # ---------------------------------------------------------- source arch/arm/mach-at91/Kconfig.non_dt +endif # SOC_SAM_V4_V5 comment "Generic Board Type"
Signature · 1 line
1.7.11.3
PATCH v3 4/6 ARM: at91: introduce SAMA5 support
In reply to ludovic.desroches at atmel.comFrom: Ludovic Desroches <[email protected]>
This patch introduces the SAMA5 support and a generic board file for SAMA5 devices. It also updates the PMC driver to manage clock division which is a requirement since some peripherals can't work at the bus frequency on SAMA5.
--- arch/arm/mach-at91/Kconfig | 33 +++ arch/arm/mach-at91/Makefile | 4 + arch/arm/mach-at91/board-dt-sama5.c | 86 +++++++ arch/arm/mach-at91/clock.c | 109 +++++++-- arch/arm/mach-at91/clock.h | 2 + arch/arm/mach-at91/include/mach/at91_pmc.h | 18 +- arch/arm/mach-at91/include/mach/cpu.h | 20 ++ arch/arm/mach-at91/include/mach/sama5d3.h | 73 ++++++ arch/arm/mach-at91/sama5d3.c | 377 +++++++++++++++++++++++++++++ arch/arm/mach-at91/setup.c | 27 +++ arch/arm/mach-at91/soc.h | 5 + 11 files changed, 725 insertions(+), 29 deletions(-) create mode 100644 arch/arm/mach-at91/board-dt-sama5.c create mode 100644 arch/arm/mach-at91/include/mach/sama5d3.h create mode 100644 arch/arm/mach-at91/sama5d3.c
arch/arm/mach-at91/Kconfig +33 -0
@@ -29,6 +29,14 @@ config SOC_AT91SAM9 select MULTI_IRQ_HANDLER select SPARSE_IRQ +config SOC_SAMA5 + bool + select AT91_SAM9_TIME + select CPU_V7 + select GENERIC_CLOCKEVENTS + select MULTI_IRQ_HANDLER + select SPARSE_IRQ + menu "Atmel AT91 System-on-Chip" choice
@@ -41,10 +49,27 @@ config SOC_SAM_V4_V5 Select this if you are using one of Atmel's AT91SAM9, AT91RM9200 or AT91X40 SoC. +config SOC_SAM_V7 + bool "Cortex A5" + help + Select this if you are using one of Atmel's SAMA5D3 SoC. + endchoice comment "Atmel AT91 Processor" +if SOC_SAM_V7 +config SOC_SAMA5D3 + bool "SAMA5D3 family" + depends on SOC_SAM_V7 + select SOC_SAMA5 + select HAVE_FB_ATMEL + select HAVE_AT91_DBGU1 + help + Select this if you are using one of Atmel's SAMA5D3 family SoC. + This support covers SAMA5D31, SAMA5D33, SAMA5D34, SAMA5D35. +endif + if SOC_SAM_V4_V5 config SOC_AT91RM9200 bool "AT91RM9200"
@@ -134,6 +159,14 @@ config MACH_AT91SAM9_DT Select this if you want to experiment device-tree with an Atmel Evaluation Kit. +config MACH_SAMA5_DT + bool "Atmel SAMA5 Evaluation Kits with device-tree support" + depends on SOC_SAMA5 + select USE_OF + help + Select this if you want to experiment device-tree with + an Atmel Evaluation Kit. + # ---------------------------------------------------------- comment "AT91 Feature Selections"
arch/arm/mach-at91/Makefile +4 -0
@@ -22,6 +22,7 @@ obj-$(CONFIG_SOC_AT91SAM9G45) += at91sam9g45.o obj-$(CONFIG_SOC_AT91SAM9N12) += at91sam9n12.o obj-$(CONFIG_SOC_AT91SAM9X5) += at91sam9x5.o obj-$(CONFIG_SOC_AT91SAM9RL) += at91sam9rl.o +obj-$(CONFIG_SOC_SAMA5D3) += sama5d3.o obj-$(CONFIG_ARCH_AT91RM9200) += at91rm9200_devices.o obj-$(CONFIG_ARCH_AT91SAM9260) += at91sam9260_devices.o
@@ -91,6 +92,9 @@ obj-$(CONFIG_MACH_AT91SAM9M10G45EK) += board-sam9m10g45ek.o obj-$(CONFIG_MACH_AT91RM9200_DT) += board-dt-rm9200.o obj-$(CONFIG_MACH_AT91SAM9_DT) += board-dt-sam9.o +# SAMA5 board with device-tree +obj-$(CONFIG_MACH_SAMA5_DT) += board-dt-sama5.o + # AT91X40 board-specific support obj-$(CONFIG_MACH_AT91EB01) += board-eb01.o
arch/arm/mach-at91/board-dt-sama5.c new file +86 -0
86 lines not on this page · raw message
arch/arm/mach-at91/clock.c +84 -25
207 lines not on this page · raw message
arch/arm/mach-at91/clock.h +2 -0
@@ -20,7 +20,9 @@ struct clk {const char *name;/* unique clock name */ struct clk_lookup cl;unsigned long rate_hz; +unsigned div;/* parent clock divider */ struct clk *parent; +unsigned pid;/* peripheral ID */ u32 pmc_mask;void (*mode)(struct clk *,int ); unsigned id:3; /* PCK0..4, or 32k/main/a/b */
arch/arm/mach-at91/include/mach/at91_pmc.h +14 -4
@@ -75,6 +75,9 @@ extern void __iomem *at91_pmc_base;#define AT91_PMC_PLLCOUNT (0x3f << 8)/* PLL Counter */ #define AT91_PMC_OUT (3 << 14)/* PLL Clock Frequency Range */ #define AT91_PMC_MUL (0x7ff << 16)/* PLL Multiplier */ +#define AT91_PMC_MUL_GET (n) ((n) >> 16 & 0x7ff) +#define AT91_PMC3_MUL (0x7f << 18)/* PLL Multiplier [SAMA5 only] */ +#define AT91_PMC3_MUL_GET (n) ((n) >> 18 & 0x7f)#define AT91_PMC_USBDIV (3 << 28)/* USB Divisor (PLLB only) */ #define AT91_PMC_USBDIV_1 (0 << 28)#define AT91_PMC_USBDIV_2 (1 << 28)
@@ -167,11 +170,18 @@ extern void __iomem *at91_pmc_base;#define AT91_PMC_WPVS (0x1 << 0)/* Write Protect Violation Status */ #define AT91_PMC_WPVSRC (0xffff << 8)/* Write Protect Violation Source */ -#define AT91_PMC_PCR 0x10c/* Peripheral Control Register [some SAM9] */ +#define AT91_PMC_PCER1 0x100/* Peripheral Clock Enable Register 1 [SAMA5 only]*/ +#define AT91_PMC_PCDR1 0x104/* Peripheral Clock Enable Register 1 */ +#define AT91_PMC_PCSR1 0x108/* Peripheral Clock Enable Register 1 */ + +#define AT91_PMC_PCR 0x10c/* Peripheral Control Register [some SAM9 and SAMA5] */ #define AT91_PMC_PCR_PID (0x3f << 0)/* Peripheral ID */ -#define AT91_PMC_PCR_CMD (0x1 << 12)/* Command */ -#define AT91_PMC_PCR_DIV (0x3 << 16)/* Divisor Value */ -#define AT91_PMC_PCRDIV (n) (((n) << 16) & AT91_PMC_PCR_DIV) +#define AT91_PMC_PCR_CMD (0x1 << 12)/* Command (read=0, write=1) */ +#define AT91_PMC_PCR_DIV (n) ((n) << 16)/* Divisor Value */ +#define AT91_PMC_PCR_DIV0 0x0/* Peripheral clock is MCK */ +#define AT91_PMC_PCR_DIV2 0x2/* Peripheral clock is MCK/2 */ +#define AT91_PMC_PCR_DIV4 0x4/* Peripheral clock is MCK/4 */ +#define AT91_PMC_PCR_DIV8 0x8/* Peripheral clock is MCK/8 */ #define AT91_PMC_PCR_EN (0x1 << 28)/* Enable */ #endif
arch/arm/mach-at91/include/mach/cpu.h +20 -0
@@ -36,6 +36,8 @@#define ARCH_ID_AT91M40807 0x14080745#define ARCH_ID_AT91R40008 0x44000840 +#define ARCH_ID_SAMA5D3 0x8A5C07C0 +#define ARCH_EXID_AT91SAM9M11 0x00000001#define ARCH_EXID_AT91SAM9M10 0x00000002#define ARCH_EXID_AT91SAM9G46 0x00000003
@@ -47,6 +49,11 @@#define ARCH_EXID_AT91SAM9G25 0x00000003#define ARCH_EXID_AT91SAM9X25 0x00000004 +#define ARCH_EXID_SAMA5D31 0x00444300 +#define ARCH_EXID_SAMA5D33 0x00414300 +#define ARCH_EXID_SAMA5D34 0x00414301 +#define ARCH_EXID_SAMA5D35 0x00584300 +#define ARCH_FAMILY_AT91X92 0x09200000#define ARCH_FAMILY_AT91SAM9 0x01900000#define ARCH_FAMILY_AT91SAM9XE 0x02900000
@@ -75,6 +82,9 @@ enum at91_soc_type {/* SAM9N12 */ AT91_SOC_SAM9N12 , +/* SAMA5D3 */ +AT91_SOC_SAMA5D3 , +/* Unknown type */ AT91_SOC_NONE };
@@ -93,6 +103,10 @@ enum at91_soc_subtype {AT91_SOC_SAM9G15 ,AT91_SOC_SAM9G35 ,AT91_SOC_SAM9X35 ,AT91_SOC_SAM9G25 ,AT91_SOC_SAM9X25 , +/* SAMA5D3 */ +AT91_SOC_SAMA5D31 ,AT91_SOC_SAMA5D33 ,AT91_SOC_SAMA5D34 , +AT91_SOC_SAMA5D35 , +/* Unknown subtype */ AT91_SOC_SUBTYPE_NONE };
@@ -187,6 +201,12 @@ static inline int at91_soc_is_detected(void)#define cpu_is_at91sam9n12 () (0)#endif +#ifdef CONFIG_SOC_SAMA5D3 +#define cpu_is_sama5d3 () (at91_soc_initdata.type == AT91_SOC_SAMA5D3) +#else +#define cpu_is_sama5d3 () (0) +#endif +/* * Since this is ARM, we will never run on any AVR32 CPU. But these * definitions may reduce clutter in common drivers.
arch/arm/mach-at91/include/mach/sama5d3.h new file +73 -0
73 lines not on this page · raw message
arch/arm/mach-at91/sama5d3.c new file +377 -0
377 lines not on this page · raw message
arch/arm/mach-at91/setup.c +27 -0
@@ -151,6 +151,11 @@ static void __init soc_detect(u32 dbgu_base) at91_soc_initdata.type =AT91_SOC_SAM9N12 ; at91_boot_soc = at91sam9n12_soc;break ; + +case ARCH_ID_SAMA5D3 : + at91_soc_initdata.type =AT91_SOC_SAMA5D3 ; + at91_boot_soc = sama5d3_soc; +break ; }/* at91sam9g10 */
@@ -206,6 +211,23 @@ static void __init soc_detect(u32 dbgu_base)break ; } } + +if (at91_soc_initdata.type ==AT91_SOC_SAMA5D3 ) { +switch (at91_soc_initdata.exid) { +case ARCH_EXID_SAMA5D31 : + at91_soc_initdata.subtype =AT91_SOC_SAMA5D31 ; +break ; +case ARCH_EXID_SAMA5D33 : + at91_soc_initdata.subtype =AT91_SOC_SAMA5D33 ; +break ; +case ARCH_EXID_SAMA5D34 : + at91_soc_initdata.subtype =AT91_SOC_SAMA5D34 ; +break ; +case ARCH_EXID_SAMA5D35 : + at91_soc_initdata.subtype =AT91_SOC_SAMA5D35 ; +break ; + } + } }static const char *soc_name[] = {
@@ -219,6 +241,7 @@ static const char *soc_name[] = { [AT91_SOC_SAM9RL] = "at91sam9rl", [AT91_SOC_SAM9X5] = "at91sam9x5", [AT91_SOC_SAM9N12] = "at91sam9n12", + [AT91_SOC_SAMA5D3] = "sama5d3", [AT91_SOC_NONE] = "Unknown" };
@@ -241,6 +264,10 @@ static const char *soc_subtype_name[] = { [AT91_SOC_SAM9X35] = "at91sam9x35", [AT91_SOC_SAM9G25] = "at91sam9g25", [AT91_SOC_SAM9X25] = "at91sam9x25", + [AT91_SOC_SAMA5D31] = "sama5d31", + [AT91_SOC_SAMA5D33] = "sama5d33", + [AT91_SOC_SAMA5D34] = "sama5d34", + [AT91_SOC_SAMA5D35] = "sama5d35", [AT91_SOC_SUBTYPE_NONE] = "Unknown" };
arch/arm/mach-at91/soc.h +5 -0
@@ -22,6 +22,7 @@ extern struct at91_init_soc at91sam9g45_soc;extern struct at91_init_soc at91sam9rl_soc;extern struct at91_init_soc at91sam9x5_soc;extern struct at91_init_soc at91sam9n12_soc; +extern struct at91_init_soc sama5d3_soc;#define AT91_SOC_START (_name) \ struct at91_init_soc __initdata _name##_soc \
@@ -68,3 +69,7 @@ static inline int at91_soc_is_enabled(void)#if !defined(CONFIG_SOC_AT91SAM9N12 )#define at91sam9n12_soc at91_boot_soc#endif + +#if !defined(CONFIG_SOC_SAMA5D3 ) +#define sama5d3_soc at91_boot_soc +#endif
Signature · 1 line
1.7.11.3
PATCH v3 5/6 ARM: at91: dt: add device tree files for SAMA5D3 family
In reply to ludovic.desroches at atmel.comFrom: Ludovic Desroches <[email protected]>
Add device tree files for the SAMA5D3 family (SAMA5D31, SAMA5D33, SAMA5D34 and SAMA5D35).
--- arch/arm/boot/dts/Makefile | 5 + arch/arm/boot/dts/sama5d3.dtsi | 1031 +++++++++++++++++++++++++++++++++++++ arch/arm/boot/dts/sama5d31ek.dts | 51 ++ arch/arm/boot/dts/sama5d33ek.dts | 44 ++ arch/arm/boot/dts/sama5d34ek.dts | 61 +++ arch/arm/boot/dts/sama5d35ek.dts | 56 ++ arch/arm/boot/dts/sama5d3xcm.dtsi | 91 ++++ arch/arm/boot/dts/sama5d3xdm.dtsi | 42 ++ arch/arm/boot/dts/sama5d3xmb.dtsi | 166 ++++++ 9 files changed, 1547 insertions(+) create mode 100644 arch/arm/boot/dts/sama5d3.dtsi create mode 100644 arch/arm/boot/dts/sama5d31ek.dts create mode 100644 arch/arm/boot/dts/sama5d33ek.dts create mode 100644 arch/arm/boot/dts/sama5d34ek.dts create mode 100644 arch/arm/boot/dts/sama5d35ek.dts create mode 100644 arch/arm/boot/dts/sama5d3xcm.dtsi create mode 100644 arch/arm/boot/dts/sama5d3xdm.dtsi create mode 100644 arch/arm/boot/dts/sama5d3xmb.dtsi
arch/arm/boot/dts/Makefile +5 -0
@@ -31,6 +31,11 @@ dtb-$(CONFIG_ARCH_AT91) += at91sam9g25ek.dtb dtb-$(CONFIG_ARCH_AT91) += at91sam9g35ek.dtb dtb-$(CONFIG_ARCH_AT91) += at91sam9x25ek.dtb dtb-$(CONFIG_ARCH_AT91) += at91sam9x35ek.dtb +# sama5d3 +dtb-$(CONFIG_ARCH_AT91) += sama5d31ek.dtb +dtb-$(CONFIG_ARCH_AT91) += sama5d33ek.dtb +dtb-$(CONFIG_ARCH_AT91) += sama5d34ek.dtb +dtb-$(CONFIG_ARCH_AT91) += sama5d35ek.dtb dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb dtb-$(CONFIG_ARCH_BCM) += bcm11351-brt.dtb
arch/arm/boot/dts/sama5d3.dtsi new file +1031 -0
1,031 lines not on this page · raw message
arch/arm/boot/dts/sama5d31ek.dts new file +51 -0
51 lines not on this page · raw message
arch/arm/boot/dts/sama5d33ek.dts new file +44 -0
44 lines not on this page · raw message
arch/arm/boot/dts/sama5d34ek.dts new file +61 -0
61 lines not on this page · raw message
arch/arm/boot/dts/sama5d35ek.dts new file +56 -0
56 lines not on this page · raw message
arch/arm/boot/dts/sama5d3xcm.dtsi new file +91 -0
91 lines not on this page · raw message
arch/arm/boot/dts/sama5d3xdm.dtsi new file +42 -0
42 lines not on this page · raw message
arch/arm/boot/dts/sama5d3xmb.dtsi new file +166 -0
166 lines not on this page · raw message
Signature · 1 line
1.7.11.3
PATCH v3 6/6 ARM: at91: add defconfig for SAMA5
In reply to ludovic.desroches at atmel.comFrom: Ludovic Desroches <[email protected]>
Defconfig file for SAMA5 devices. It covers the SAMA5D3 family.
--- arch/arm/configs/sama5_defconfig | 181 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 181 insertions(+) create mode 100644 arch/arm/configs/sama5_defconfig
arch/arm/configs/sama5_defconfig new file +181 -0
@@ -0,0 +1,181 @@ +# CONFIG_LOCALVERSION_AUTO is not set +# CONFIG_SWAP is not set +CONFIG_SYSVIPC=y +CONFIG_IRQ_DOMAIN_DEBUG=y +CONFIG_LOG_BUF_SHIFT=14 +CONFIG_SYSFS_DEPRECATED=y +CONFIG_SYSFS_DEPRECATED_V2=y +CONFIG_BLK_DEV_INITRD=y +CONFIG_EMBEDDED=y +CONFIG_SLAB=y +CONFIG_MODULES=y +CONFIG_MODULE_FORCE_LOAD=y +CONFIG_MODULE_UNLOAD=y +CONFIG_MODULE_FORCE_UNLOAD=y +# CONFIG_LBDAF is not set +# CONFIG_BLK_DEV_BSG is not set +# CONFIG_IOSCHED_DEADLINE is not set +# CONFIG_IOSCHED_CFQ is not set +CONFIG_ARCH_AT91=y +CONFIG_SOC_SAM_V7=y +CONFIG_SOC_SAMA5D3=y +CONFIG_MACH_SAMA5_DT=y +CONFIG_AT91_PROGRAMMABLE_CLOCKS=y +CONFIG_AEABI=y +# CONFIG_OABI_COMPAT is not set +CONFIG_UACCESS_WITH_MEMCPY=y +CONFIG_ZBOOT_ROM_TEXT=0x0 +CONFIG_ZBOOT_ROM_BSS=0x0 +CONFIG_CMDLINE="console=ttyS0,115200 initrd=0x21100000,25165824 root=/dev/ram0 rw" +CONFIG_AUTO_ZRELADDR=y +CONFIG_VFP=y +# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set +CONFIG_PM_RUNTIME=y +CONFIG_PM_DEBUG=y +CONFIG_PM_ADVANCED_DEBUG=y +CONFIG_NET=y +CONFIG_PACKET=y +CONFIG_UNIX=y +CONFIG_INET=y +CONFIG_IP_MULTICAST=y +CONFIG_IP_PNP=y +# CONFIG_INET_XFRM_MODE_TRANSPORT is not set +# CONFIG_INET_XFRM_MODE_TUNNEL is not set +# CONFIG_INET_XFRM_MODE_BEET is not set +# CONFIG_INET_LRO is not set +# CONFIG_INET_DIAG is not set +CONFIG_IPV6=y +# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set +# CONFIG_INET6_XFRM_MODE_TUNNEL is not set +# CONFIG_INET6_XFRM_MODE_BEET is not set +CONFIG_IPV6_SIT_6RD=y +CONFIG_CAN=y +CONFIG_CAN_AT91=y +CONFIG_CFG80211=y +CONFIG_MAC80211=y +CONFIG_MAC80211_LEDS=y +CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" +CONFIG_DEVTMPFS=y +CONFIG_DEVTMPFS_MOUNT=y +# CONFIG_STANDALONE is not set +# CONFIG_PREVENT_FIRMWARE_BUILD is not set +CONFIG_MTD=y +CONFIG_MTD_CMDLINE_PARTS=y +CONFIG_MTD_CHAR=y +CONFIG_MTD_BLOCK=y +CONFIG_MTD_CFI=y +CONFIG_MTD_M25P80=y +CONFIG_MTD_NAND=y +CONFIG_MTD_NAND_ATMEL=y +CONFIG_MTD_UBI=y +CONFIG_BLK_DEV_LOOP=y +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_COUNT=4 +CONFIG_BLK_DEV_RAM_SIZE=8192 +CONFIG_ATMEL_TCLIB=y +CONFIG_ATMEL_SSC=y +CONFIG_EEPROM_AT24=y +CONFIG_SCSI=y +CONFIG_BLK_DEV_SD=y +CONFIG_SCSI_MULTI_LUN=y +# CONFIG_SCSI_LOWLEVEL is not set +CONFIG_NETDEVICES=y +CONFIG_MII=y +CONFIG_MACB=y +# CONFIG_NET_VENDOR_BROADCOM is not set +# CONFIG_NET_VENDOR_CIRRUS is not set +# CONFIG_NET_VENDOR_FARADAY is not set +# CONFIG_NET_VENDOR_INTEL is not set +# CONFIG_NET_VENDOR_MARVELL is not set +# CONFIG_NET_VENDOR_MICREL is not set +# CONFIG_NET_VENDOR_MICROCHIP is not set +# CONFIG_NET_VENDOR_NATSEMI is not set +# CONFIG_NET_VENDOR_SEEQ is not set +# CONFIG_NET_VENDOR_SMSC is not set +# CONFIG_NET_VENDOR_STMICRO is not set +# CONFIG_NET_VENDOR_WIZNET is not set +CONFIG_MICREL_PHY=y +# CONFIG_WLAN is not set +# CONFIG_INPUT_MOUSEDEV is not set +CONFIG_INPUT_EVDEV=y +# CONFIG_KEYBOARD_ATKBD is not set +CONFIG_KEYBOARD_QT1070=y +CONFIG_KEYBOARD_GPIO=y +# CONFIG_INPUT_MOUSE is not set +CONFIG_INPUT_TOUCHSCREEN=y +CONFIG_TOUCHSCREEN_ATMEL_MXT=y +CONFIG_TOUCHSCREEN_ATMEL_TSADCC=y +# CONFIG_SERIO is not set +CONFIG_LEGACY_PTY_COUNT=4 +CONFIG_SERIAL_ATMEL=y +CONFIG_SERIAL_ATMEL_CONSOLE=y +CONFIG_HW_RANDOM=y +CONFIG_I2C=y +CONFIG_I2C_CHARDEV=y +CONFIG_I2C_AT91=y +CONFIG_I2C_GPIO=y +CONFIG_SPI=y +CONFIG_SPI_ATMEL=y +CONFIG_SPI_GPIO=y +CONFIG_GPIO_SYSFS=y +# CONFIG_HWMON is not set +CONFIG_SSB=m +CONFIG_FB=y +CONFIG_BACKLIGHT_LCD_SUPPORT=y +# CONFIG_LCD_CLASS_DEVICE is not set +CONFIG_BACKLIGHT_CLASS_DEVICE=y +# CONFIG_BACKLIGHT_GENERIC is not set +CONFIG_FRAMEBUFFER_CONSOLE=y +# CONFIG_HID_GENERIC is not set +CONFIG_USB=y +CONFIG_USB_ANNOUNCE_NEW_DEVICES=y +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_OHCI_HCD=y +CONFIG_USB_ACM=y +CONFIG_USB_STORAGE=y +CONFIG_USB_GADGET=y +CONFIG_USB_AT91=y +CONFIG_USB_MASS_STORAGE=m +CONFIG_MMC=y +# CONFIG_MMC_BLOCK_BOUNCE is not set +CONFIG_MMC_ATMELMCI=y +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=y +CONFIG_LEDS_GPIO=y +CONFIG_LEDS_TRIGGER_TIMER=y +CONFIG_LEDS_TRIGGER_HEARTBEAT=y +CONFIG_LEDS_TRIGGER_GPIO=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_DRV_AT91RM9200=y +CONFIG_DMADEVICES=y +# CONFIG_IOMMU_SUPPORT is not set +CONFIG_IIO=y +CONFIG_AT91_ADC=y +CONFIG_EXT2_FS=y +CONFIG_FANOTIFY=y +CONFIG_VFAT_FS=y +CONFIG_TMPFS=y +CONFIG_JFFS2_FS=y +CONFIG_JFFS2_SUMMARY=y +CONFIG_UBIFS_FS=y +CONFIG_NFS_FS=y +CONFIG_ROOT_NFS=y +CONFIG_NLS_CODEPAGE_437=y +CONFIG_NLS_CODEPAGE_850=y +CONFIG_NLS_ISO8859_1=y +CONFIG_STRIP_ASM_SYMS=y +CONFIG_DEBUG_FS=y +# CONFIG_SCHED_DEBUG is not set +CONFIG_DEBUG_MEMORY_INIT=y +# CONFIG_FTRACE is not set +CONFIG_DEBUG_USER=y +CONFIG_DEBUG_LL=y +CONFIG_EARLY_PRINTK=y +# CONFIG_CRYPTO_ANSI_CPRNG is not set +CONFIG_CRYPTO_USER_API_HASH=m +CONFIG_CRYPTO_USER_API_SKCIPHER=m +CONFIG_CRYPTO_DEV_ATMEL_AES=y +CONFIG_CRYPTO_DEV_ATMEL_TDES=y +CONFIG_CRYPTO_DEV_ATMEL_SHA=y +CONFIG_CRC_CCITT=m +CONFIG_CRC_ITU_T=m
Signature · 1 line
1.7.11.3
v3 cover introduce support for Atmel Cortex-A5 devices
In reply to ludovic.desroches at atmel.comOn 03/22/2013 02:24 PM, ludovic.desroches at atmel.com :
Quoted 10 lines
From: Ludovic Desroches <[email protected]>
Hello,
Updated set of patches for SAMA5D3 family support, based on Jean-Christophe ARM: at91:
Kconfigcleanup for prepare add of Cortex-A5 Sama5 patches.v3 changes:
- put device tree files and defconfig file in separate patches
For the whole series:
I add the series on top of at91-3.10-soc branch.
Thanks.
Quoted 59 lines
v2 changes:
- remove ARM: at91: fix infinite loop in at91_irq_suspend/resume taken as 3.9 fix
- add missing patch: ARM: at91: change name template inAT91_SOC_STARTmacro
- remove selectHAVE_NET_MACBLudovic Desroches (6):
ARM: at91: change name template inAT91_SOC_STARTmacro
ARM: at91: addAT91_SAM9_TIMEentry to selectat91sam926x_time.c
compilation
ARM: at91: introduce the core type choice to split ARMv4/5 and ARMv7
arch
ARM: at91: introduce SAMA5 support
ARM: at91: dt: add device tree files for SAMA5D3 family
ARM: at91: add defconfig for SAMA5arch/arm/boot/dts/Makefile | 5 + arch/arm/boot/dts/sama5d3.dtsi | 1031 ++++++++++++++++++++++++++++ arch/arm/boot/dts/sama5d31ek.dts | 51 ++ arch/arm/boot/dts/sama5d33ek.dts | 44 ++ arch/arm/boot/dts/sama5d34ek.dts | 61 ++ arch/arm/boot/dts/sama5d35ek.dts | 56 ++ arch/arm/boot/dts/sama5d3xcm.dtsi | 91 +++ arch/arm/boot/dts/sama5d3xdm.dtsi | 42 ++ arch/arm/boot/dts/sama5d3xmb.dtsi | 166 +++++ arch/arm/configs/sama5_defconfig | 181 +++++ arch/arm/mach-at91/Kconfig | 59 +- arch/arm/mach-at91/Makefile | 7 +- arch/arm/mach-at91/at91rm9200.c | 2 +- arch/arm/mach-at91/at91sam9260.c | 2 +- arch/arm/mach-at91/at91sam9261.c | 2 +- arch/arm/mach-at91/at91sam9263.c | 2 +- arch/arm/mach-at91/at91sam9g45.c | 2 +- arch/arm/mach-at91/at91sam9n12.c | 2 +- arch/arm/mach-at91/at91sam9rl.c | 2 +- arch/arm/mach-at91/at91sam9x5.c | 2 +- arch/arm/mach-at91/board-dt-sama5.c | 86 +++ arch/arm/mach-at91/clock.c | 109 ++- arch/arm/mach-at91/clock.h | 2 + arch/arm/mach-at91/include/mach/at91_pmc.h | 18 +- arch/arm/mach-at91/include/mach/cpu.h | 20 + arch/arm/mach-at91/include/mach/sama5d3.h | 73 ++ arch/arm/mach-at91/sama5d3.c | 377 ++++++++++ arch/arm/mach-at91/setup.c | 27 + arch/arm/mach-at91/soc.h | 7 +- 29 files changed, 2486 insertions(+), 43 deletions(-) create mode 100644 arch/arm/boot/dts/sama5d3.dtsi create mode 100644 arch/arm/boot/dts/sama5d31ek.dts create mode 100644 arch/arm/boot/dts/sama5d33ek.dts create mode 100644 arch/arm/boot/dts/sama5d34ek.dts create mode 100644 arch/arm/boot/dts/sama5d35ek.dts create mode 100644 arch/arm/boot/dts/sama5d3xcm.dtsi create mode 100644 arch/arm/boot/dts/sama5d3xdm.dtsi create mode 100644 arch/arm/boot/dts/sama5d3xmb.dtsi create mode 100644 arch/arm/configs/sama5_defconfig create mode 100644 arch/arm/mach-at91/board-dt-sama5.c create mode 100644 arch/arm/mach-at91/include/mach/sama5d3.h create mode 100644 arch/arm/mach-at91/sama5d3.c
Signature · 1 line
Nicolas Ferre