* [PULL PATCH 0/3] ARM: at91: Kconfig cleanup for prepare add of Cortex-A5 Sama5
@ 2013-03-07 13:08 Jean-Christophe PLAGNIOL-VILLARD
2013-03-07 14:21 ` [PATCH 1/3] ARM: at91: move non DT Kconfig to Kconfig.non_dt Jean-Christophe PLAGNIOL-VILLARD
0 siblings, 1 reply; 8+ messages in thread
From: Jean-Christophe PLAGNIOL-VILLARD @ 2013-03-07 13:08 UTC (permalink / raw)
To: linux-arm-kernel
HI,
The folowing patch serie
move the non dt Kconfig to Kconfig.non_dt as they are plan for removal
and update the Kconfig scheme to simplify the adding of the up comming
Cortex-A5 SAMA5D3x series
please pull
The following changes since commit 6dbe51c251a327e012439c4772097a13df43c5b8:
Linux 3.9-rc1 (2013-03-03 15:11:05 -0800)
are available in the git repository at:
git://github.com/at91linux/linux-at91.git delivery/at91_3.9_dt_cleanup
for you to fetch changes up to 8ca98913f4b4e0b38d4442551d63681f4fdd0224:
ARM: at91: renamme rm9200 dt file (2013-03-07 20:20:41 +0800)
----------------------------------------------------------------
Jean-Christophe PLAGNIOL-VILLARD (3):
ARM: at91: move non DT Kconfig to Kconfig.non_dt
ARM: at91: rename board-dt to more specific name board-dt-sam9
ARM: at91: renamme rm9200 dt file
arch/arm/configs/at91_dt_defconfig | 2 +-
arch/arm/configs/at91sam9260_defconfig | 2 +-
arch/arm/configs/at91sam9g20_defconfig | 2 +-
arch/arm/configs/at91sam9g45_defconfig | 2 +-
arch/arm/mach-at91/Kconfig | 398 ++-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
arch/arm/mach-at91/Kconfig.non_dt | 399 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
arch/arm/mach-at91/Makefile | 4 +--
arch/arm/mach-at91/{board-rm9200-dt.c => board-dt-rm9200.c} | 0
arch/arm/mach-at91/{board-dt.c => board-dt-sam9.c} | 0
9 files changed, 407 insertions(+), 402 deletions(-)
create mode 100644 arch/arm/mach-at91/Kconfig.non_dt
rename arch/arm/mach-at91/{board-rm9200-dt.c => board-dt-rm9200.c} (100%)
rename arch/arm/mach-at91/{board-dt.c => board-dt-sam9.c} (100%)
Best Regards,
J.
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 1/3] ARM: at91: move non DT Kconfig to Kconfig.non_dt
2013-03-07 13:08 [PULL PATCH 0/3] ARM: at91: Kconfig cleanup for prepare add of Cortex-A5 Sama5 Jean-Christophe PLAGNIOL-VILLARD
@ 2013-03-07 14:21 ` Jean-Christophe PLAGNIOL-VILLARD
2013-03-07 14:21 ` [PATCH 2/3] ARM: at91: rename board-dt to more specific name board-dt-sam9 Jean-Christophe PLAGNIOL-VILLARD
2013-03-07 14:21 ` [PATCH 3/3] ARM: at91: renamme rm9200 dt file Jean-Christophe PLAGNIOL-VILLARD
0 siblings, 2 replies; 8+ messages in thread
From: Jean-Christophe PLAGNIOL-VILLARD @ 2013-03-07 14:21 UTC (permalink / raw)
To: linux-arm-kernel
This is the legacy platform support
Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
Cc: Ludovic Desroches <ludovic.desroches@atmel.com>
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
arch/arm/mach-at91/Kconfig | 714 ++++++------------------
arch/arm/mach-at91/{Kconfig => Kconfig.non_dt} | 157 +-----
2 files changed, 161 insertions(+), 710 deletions(-)
rewrite arch/arm/mach-at91/Kconfig (71%)
rename arch/arm/mach-at91/{Kconfig => Kconfig.non_dt} (71%)
diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
dissimilarity index 71%
index 6071f4c..98c2e05 100644
--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
@@ -1,554 +1,160 @@
-if ARCH_AT91
-
-config HAVE_AT91_DATAFLASH_CARD
- bool
-
-config HAVE_AT91_DBGU0
- bool
-
-config HAVE_AT91_DBGU1
- bool
-
-config AT91_SAM9_ALT_RESET
- bool
- default !ARCH_AT91X40
-
-config AT91_SAM9G45_RESET
- bool
- default !ARCH_AT91X40
-
-config SOC_AT91SAM9
- bool
- select CPU_ARM926T
- select GENERIC_CLOCKEVENTS
- select MULTI_IRQ_HANDLER
- select SPARSE_IRQ
-
-menu "Atmel AT91 System-on-Chip"
-
-comment "Atmel AT91 Processor"
-
-config SOC_AT91RM9200
- bool "AT91RM9200"
- select CPU_ARM920T
- select GENERIC_CLOCKEVENTS
- select HAVE_AT91_DBGU0
- select MULTI_IRQ_HANDLER
- select SPARSE_IRQ
-
-config SOC_AT91SAM9260
- bool "AT91SAM9260, AT91SAM9XE or AT91SAM9G20"
- select HAVE_AT91_DBGU0
- select SOC_AT91SAM9
- help
- Select this if you are using one of Atmel's AT91SAM9260, AT91SAM9XE
- or AT91SAM9G20 SoC.
-
-config SOC_AT91SAM9261
- bool "AT91SAM9261 or AT91SAM9G10"
- select HAVE_AT91_DBGU0
- select HAVE_FB_ATMEL
- select SOC_AT91SAM9
- help
- Select this if you are using one of Atmel's AT91SAM9261 or AT91SAM9G10 SoC.
-
-config SOC_AT91SAM9263
- bool "AT91SAM9263"
- select HAVE_AT91_DBGU1
- select HAVE_FB_ATMEL
- select SOC_AT91SAM9
-
-config SOC_AT91SAM9RL
- bool "AT91SAM9RL"
- select HAVE_AT91_DBGU0
- select HAVE_FB_ATMEL
- select SOC_AT91SAM9
-
-config SOC_AT91SAM9G45
- bool "AT91SAM9G45 or AT91SAM9M10 families"
- select HAVE_AT91_DBGU1
- select HAVE_FB_ATMEL
- select SOC_AT91SAM9
- help
- Select this if you are using one of Atmel's AT91SAM9G45 family SoC.
- This support covers AT91SAM9G45, AT91SAM9G46, AT91SAM9M10 and AT91SAM9M11.
-
-config SOC_AT91SAM9X5
- bool "AT91SAM9x5 family"
- select HAVE_AT91_DBGU0
- select HAVE_FB_ATMEL
- select SOC_AT91SAM9
- help
- Select this if you are using one of Atmel's AT91SAM9x5 family SoC.
- This means that your SAM9 name finishes with a '5' (except if it is
- AT91SAM9G45!).
- This support covers AT91SAM9G15, AT91SAM9G25, AT91SAM9X25, AT91SAM9G35
- and AT91SAM9X35.
-
-config SOC_AT91SAM9N12
- bool "AT91SAM9N12 family"
- select HAVE_AT91_DBGU0
- select HAVE_FB_ATMEL
- select SOC_AT91SAM9
- help
- Select this if you are using Atmel's AT91SAM9N12 SoC.
-
-choice
- prompt "Atmel AT91 Processor Devices for non DT boards"
-
-config ARCH_AT91_NONE
- bool "None"
-
-config ARCH_AT91RM9200
- bool "AT91RM9200"
- select SOC_AT91RM9200
-
-config ARCH_AT91SAM9260
- bool "AT91SAM9260 or AT91SAM9XE"
- select SOC_AT91SAM9260
-
-config ARCH_AT91SAM9261
- bool "AT91SAM9261"
- select SOC_AT91SAM9261
-
-config ARCH_AT91SAM9G10
- bool "AT91SAM9G10"
- select SOC_AT91SAM9261
-
-config ARCH_AT91SAM9263
- bool "AT91SAM9263"
- select SOC_AT91SAM9263
-
-config ARCH_AT91SAM9RL
- bool "AT91SAM9RL"
- select SOC_AT91SAM9RL
-
-config ARCH_AT91SAM9G20
- bool "AT91SAM9G20"
- select SOC_AT91SAM9260
-
-config ARCH_AT91SAM9G45
- bool "AT91SAM9G45"
- select SOC_AT91SAM9G45
-
-config ARCH_AT91X40
- bool "AT91x40"
- depends on !MMU
- select ARCH_USES_GETTIMEOFFSET
- select MULTI_IRQ_HANDLER
- select SPARSE_IRQ
-
-endchoice
-
-config AT91_PMC_UNIT
- bool
- default !ARCH_AT91X40
-
-# ----------------------------------------------------------
-
-if ARCH_AT91RM9200
-
-comment "AT91RM9200 Board Type"
-
-config MACH_ONEARM
- bool "Ajeco 1ARM Single Board Computer"
- help
- Select this if you are using Ajeco's 1ARM Single Board Computer.
- <http://www.ajeco.fi/>
-
-config ARCH_AT91RM9200DK
- bool "Atmel AT91RM9200-DK Development board"
- select HAVE_AT91_DATAFLASH_CARD
- help
- Select this if you are using Atmel's AT91RM9200-DK Development board.
- (Discontinued)
-
-config MACH_AT91RM9200EK
- bool "Atmel AT91RM9200-EK Evaluation Kit"
- select HAVE_AT91_DATAFLASH_CARD
- help
- Select this if you are using Atmel's AT91RM9200-EK Evaluation Kit.
- <http://www.atmel.com/dyn/products/tools_card.asp?tool_id=3507>
-
-config MACH_CSB337
- bool "Cogent CSB337"
- help
- Select this if you are using Cogent's CSB337 board.
- <http://www.cogcomp.com/csb_csb337.htm>
-
-config MACH_CSB637
- bool "Cogent CSB637"
- help
- Select this if you are using Cogent's CSB637 board.
- <http://www.cogcomp.com/csb_csb637.htm>
-
-config MACH_CARMEVA
- bool "Conitec ARM&EVA"
- help
- Select this if you are using Conitec's AT91RM9200-MCU-Module.
- <http://www.conitec.net/english/linuxboard.php>
-
-config MACH_ATEB9200
- bool "Embest ATEB9200"
- help
- Select this if you are using Embest's ATEB9200 board.
- <http://www.embedinfo.com/english/product/ATEB9200.asp>
-
-config MACH_KB9200
- bool "KwikByte KB920x"
- help
- Select this if you are using KwikByte's KB920x board.
- <http://www.kwikbyte.com/KB9202.html>
-
-config MACH_PICOTUX2XX
- bool "picotux 200"
- help
- Select this if you are using a picotux 200.
- <http://www.picotux.com/>
-
-config MACH_KAFA
- bool "Sperry-Sun KAFA board"
- help
- Select this if you are using Sperry-Sun's KAFA board.
-
-config MACH_ECBAT91
- bool "emQbit ECB_AT91 SBC"
- select HAVE_AT91_DATAFLASH_CARD
- help
- Select this if you are using emQbit's ECB_AT91 board.
- <http://wiki.emqbit.com/free-ecb-at91>
-
-config MACH_YL9200
- bool "ucDragon YL-9200"
- help
- Select this if you are using the ucDragon YL-9200 board.
-
-config MACH_CPUAT91
- bool "Eukrea CPUAT91"
- help
- Select this if you are using the Eukrea Electromatique's
- CPUAT91 board <http://www.eukrea.com/>.
-
-config MACH_ECO920
- bool "eco920"
- help
- Select this if you are using the eco920 board
-
-config MACH_RSI_EWS
- bool "RSI Embedded Webserver"
- depends on ARCH_AT91RM9200
- help
- Select this if you are using RSIs EWS board.
-endif
-
-# ----------------------------------------------------------
-
-if ARCH_AT91SAM9260
-
-comment "AT91SAM9260 Variants"
-
-comment "AT91SAM9260 / AT91SAM9XE Board Type"
-
-config MACH_AT91SAM9260EK
- bool "Atmel AT91SAM9260-EK / AT91SAM9XE Evaluation Kit"
- select HAVE_AT91_DATAFLASH_CARD
- help
- Select this if you are using Atmel's AT91SAM9260-EK or AT91SAM9XE Evaluation Kit
- <http://www.atmel.com/dyn/products/tools_card.asp?tool_id=3933>
-
-config MACH_CAM60
- bool "KwikByte KB9260 (CAM60) board"
- help
- Select this if you are using KwikByte's KB9260 (CAM60) board based on the Atmel AT91SAM9260.
- <http://www.kwikbyte.com/KB9260.html>
-
-config MACH_SAM9_L9260
- bool "Olimex SAM9-L9260 board"
- select HAVE_AT91_DATAFLASH_CARD
- help
- Select this if you are using Olimex's SAM9-L9260 board based on the Atmel AT91SAM9260.
- <http://www.olimex.com/dev/sam9-L9260.html>
-
-config MACH_AFEB9260
- bool "Custom afeb9260 board v1"
- help
- Select this if you are using custom afeb9260 board based on
- open hardware design. Select this for revision 1 of the board.
- <svn://194.85.238.22/home/users/george/svn/arm9eb>
- <http://groups.google.com/group/arm9fpga-evolution-board>
-
-config MACH_USB_A9260
- bool "CALAO USB-A9260"
- help
- Select this if you are using a Calao Systems USB-A9260.
- <http://www.calao-systems.com>
-
-config MACH_QIL_A9260
- bool "CALAO QIL-A9260 board"
- help
- Select this if you are using a Calao Systems QIL-A9260 Board.
- <http://www.calao-systems.com>
-
-config MACH_CPU9260
- bool "Eukrea CPU9260 board"
- help
- Select this if you are using a Eukrea Electromatique's
- CPU9260 Board <http://www.eukrea.com/>
-
-config MACH_FLEXIBITY
- bool "Flexibity Connect board"
- help
- Select this if you are using Flexibity Connect board
- <http://www.flexibity.com>
-
-endif
-
-# ----------------------------------------------------------
-
-if ARCH_AT91SAM9261
-
-comment "AT91SAM9261 Board Type"
-
-config MACH_AT91SAM9261EK
- bool "Atmel AT91SAM9261-EK Evaluation Kit"
- select HAVE_AT91_DATAFLASH_CARD
- help
- Select this if you are using Atmel's AT91SAM9261-EK Evaluation Kit.
- <http://www.atmel.com/dyn/products/tools_card.asp?tool_id=3820>
-
-endif
-
-# ----------------------------------------------------------
-
-if ARCH_AT91SAM9G10
-
-comment "AT91SAM9G10 Board Type"
-
-config MACH_AT91SAM9G10EK
- bool "Atmel AT91SAM9G10-EK Evaluation Kit"
- select HAVE_AT91_DATAFLASH_CARD
- help
- Select this if you are using Atmel's AT91SAM9G10-EK Evaluation Kit.
- <http://www.atmel.com/dyn/products/tools_card.asp?tool_id=4588>
-
-endif
-
-# ----------------------------------------------------------
-
-if ARCH_AT91SAM9263
-
-comment "AT91SAM9263 Board Type"
-
-config MACH_AT91SAM9263EK
- bool "Atmel AT91SAM9263-EK Evaluation Kit"
- select HAVE_AT91_DATAFLASH_CARD
- help
- Select this if you are using Atmel's AT91SAM9263-EK Evaluation Kit.
- <http://www.atmel.com/dyn/products/tools_card.asp?tool_id=4057>
-
-config MACH_USB_A9263
- bool "CALAO USB-A9263"
- help
- Select this if you are using a Calao Systems USB-A9263.
- <http://www.calao-systems.com>
-
-endif
-
-# ----------------------------------------------------------
-
-if ARCH_AT91SAM9RL
-
-comment "AT91SAM9RL Board Type"
-
-config MACH_AT91SAM9RLEK
- bool "Atmel AT91SAM9RL-EK Evaluation Kit"
- help
- Select this if you are using Atmel's AT91SAM9RL-EK Evaluation Kit.
-
-endif
-
-# ----------------------------------------------------------
-
-if ARCH_AT91SAM9G20
-
-comment "AT91SAM9G20 Board Type"
-
-config MACH_AT91SAM9G20EK
- bool "Atmel AT91SAM9G20-EK Evaluation Kit"
- select HAVE_AT91_DATAFLASH_CARD
- help
- Select this if you are using Atmel's AT91SAM9G20-EK Evaluation Kit
- that embeds only one SD/MMC slot.
-
-config MACH_AT91SAM9G20EK_2MMC
- depends on MACH_AT91SAM9G20EK
- bool "Atmel AT91SAM9G20-EK Evaluation Kit with 2 SD/MMC Slots"
- help
- Select this if you are using an Atmel AT91SAM9G20-EK Evaluation Kit
- with 2 SD/MMC Slots. This is the case for AT91SAM9G20-EK rev. C and
- onwards.
- <http://www.atmel.com/tools/SAM9G20-EK.aspx>
-
-config MACH_CPU9G20
- bool "Eukrea CPU9G20 board"
- help
- Select this if you are using a Eukrea Electromatique's
- CPU9G20 Board <http://www.eukrea.com/>
-
-config MACH_ACMENETUSFOXG20
- bool "Acme Systems srl FOX Board G20"
- help
- Select this if you are using Acme Systems
- FOX Board G20 <http://www.acmesystems.it>
-
-config MACH_PORTUXG20
- bool "taskit PortuxG20"
- help
- Select this if you are using taskit's PortuxG20.
- <http://www.taskit.de/en/>
-
-config MACH_STAMP9G20
- bool "taskit Stamp9G20 CPU module"
- help
- Select this if you are using taskit's Stamp9G20 CPU module on its
- evaluation board.
- <http://www.taskit.de/en/>
-
-config MACH_PCONTROL_G20
- bool "PControl G20 CPU module"
- help
- Select this if you are using taskit's Stamp9G20 CPU module on this
- carrier board, beeing the decentralized unit of a building automation
- system; featuring nvram, eth-switch, iso-rs485, display, io
-
-config MACH_GSIA18S
- bool "GS_IA18_S board"
- help
- This enables support for the GS_IA18_S board
- produced by GeoSIG Ltd company. This is an internet accelerograph.
- <http://www.geosig.com>
-
-config MACH_USB_A9G20
- bool "CALAO USB-A9G20"
- depends on ARCH_AT91SAM9G20
- help
- Select this if you are using a Calao Systems USB-A9G20.
- <http://www.calao-systems.com>
-
-endif
-
-if (ARCH_AT91SAM9260 || ARCH_AT91SAM9G20)
-comment "AT91SAM9260/AT91SAM9G20 boards"
-
-config MACH_SNAPPER_9260
- bool "Bluewater Systems Snapper 9260/9G20 module"
- help
- Select this if you are using the Bluewater Systems Snapper 9260 or
- Snapper 9G20 modules.
- <http://www.bluewatersys.com/>
-endif
-
-# ----------------------------------------------------------
-
-if ARCH_AT91SAM9G45
-
-comment "AT91SAM9G45 Board Type"
-
-config MACH_AT91SAM9M10G45EK
- bool "Atmel AT91SAM9M10G45-EK Evaluation Kits"
- help
- Select this if you are using Atmel's AT91SAM9M10G45-EK Evaluation Kit.
- Those boards can be populated with any SoC of AT91SAM9G45 or AT91SAM9M10
- families: AT91SAM9G45, AT91SAM9G46, AT91SAM9M10 and AT91SAM9M11.
- <http://www.atmel.com/tools/SAM9M10-G45-EK.aspx>
-
-endif
-
-# ----------------------------------------------------------
-
-if ARCH_AT91X40
-
-comment "AT91X40 Board Type"
-
-config MACH_AT91EB01
- bool "Atmel AT91EB01 Evaluation Kit"
- help
- Select this if you are using Atmel's AT91EB01 Evaluation Kit.
- It is also a popular target for simulators such as GDB's
- ARM simulator (commonly known as the ARMulator) and the
- Skyeye simulator.
-
-endif
-
-# ----------------------------------------------------------
-
-comment "Generic Board Type"
-
-config MACH_AT91RM9200_DT
- bool "Atmel AT91RM9200 Evaluation Kits with device-tree support"
- depends on SOC_AT91RM9200
- select USE_OF
- help
- Select this if you want to experiment device-tree with
- an Atmel RM9200 Evaluation Kit.
-
-config MACH_AT91SAM_DT
- bool "Atmel AT91SAM Evaluation Kits with device-tree support"
- depends on SOC_AT91SAM9
- select USE_OF
- help
- Select this if you want to experiment device-tree with
- an Atmel Evaluation Kit.
-
-# ----------------------------------------------------------
-
-comment "AT91 Board Options"
-
-config MTD_AT91_DATAFLASH_CARD
- bool "Enable DataFlash Card support"
- depends on HAVE_AT91_DATAFLASH_CARD
- help
- Enable support for the DataFlash card.
-
-# ----------------------------------------------------------
-
-comment "AT91 Feature Selections"
-
-config AT91_PROGRAMMABLE_CLOCKS
- bool "Programmable Clocks"
- help
- Select this if you need to program one or more of the PCK0..PCK3
- programmable clock outputs.
-
-config AT91_SLOW_CLOCK
- bool "Suspend-to-RAM disables main oscillator"
- depends on SUSPEND
- help
- Select this if you want Suspend-to-RAM to save the most power
- possible (without powering off the CPU) by disabling the PLLs
- and main oscillator so that only the 32 KiHz clock is available.
-
- When only that slow-clock is available, some peripherals lose
- functionality. Many can't issue wakeup events unless faster
- clocks are available. Some lose their operating state and
- need to be completely re-initialized.
-
-config AT91_TIMER_HZ
- int "Kernel HZ (jiffies per second)"
- range 32 1024
- depends on ARCH_AT91
- default "128" if ARCH_AT91RM9200
- default "100"
- help
- On AT91rm9200 chips where you're using a system clock derived
- from the 32768 Hz hardware clock, this tick rate should divide
- it exactly: use a power-of-two value, such as 128 or 256, to
- reduce timing errors caused by rounding.
-
- On AT91sam926x chips, or otherwise when using a higher precision
- system clock (of at least several MHz), rounding is less of a
- problem so it can be safer to use a decimal values like 100.
-
-endmenu
-
-endif
+if ARCH_AT91
+
+config HAVE_AT91_DBGU0
+ bool
+
+config HAVE_AT91_DBGU1
+ bool
+
+config AT91_SAM9_ALT_RESET
+ bool
+ default !ARCH_AT91X40
+
+config AT91_SAM9G45_RESET
+ bool
+ default !ARCH_AT91X40
+
+config SOC_AT91SAM9
+ bool
+ select CPU_ARM926T
+ select GENERIC_CLOCKEVENTS
+ select MULTI_IRQ_HANDLER
+ select SPARSE_IRQ
+
+menu "Atmel AT91 System-on-Chip"
+
+comment "Atmel AT91 Processor"
+
+config SOC_AT91RM9200
+ bool "AT91RM9200"
+ select CPU_ARM920T
+ select GENERIC_CLOCKEVENTS
+ select HAVE_AT91_DBGU0
+ select MULTI_IRQ_HANDLER
+ select SPARSE_IRQ
+
+config SOC_AT91SAM9260
+ bool "AT91SAM9260, AT91SAM9XE or AT91SAM9G20"
+ select HAVE_AT91_DBGU0
+ select SOC_AT91SAM9
+ help
+ Select this if you are using one of Atmel's AT91SAM9260, AT91SAM9XE
+ or AT91SAM9G20 SoC.
+
+config SOC_AT91SAM9261
+ bool "AT91SAM9261 or AT91SAM9G10"
+ select HAVE_AT91_DBGU0
+ select HAVE_FB_ATMEL
+ select SOC_AT91SAM9
+ help
+ Select this if you are using one of Atmel's AT91SAM9261 or AT91SAM9G10 SoC.
+
+config SOC_AT91SAM9263
+ bool "AT91SAM9263"
+ select HAVE_AT91_DBGU1
+ select HAVE_FB_ATMEL
+ select SOC_AT91SAM9
+
+config SOC_AT91SAM9RL
+ bool "AT91SAM9RL"
+ select HAVE_AT91_DBGU0
+ select HAVE_FB_ATMEL
+ select SOC_AT91SAM9
+
+config SOC_AT91SAM9G45
+ bool "AT91SAM9G45 or AT91SAM9M10 families"
+ select HAVE_AT91_DBGU1
+ select HAVE_FB_ATMEL
+ select SOC_AT91SAM9
+ help
+ Select this if you are using one of Atmel's AT91SAM9G45 family SoC.
+ This support covers AT91SAM9G45, AT91SAM9G46, AT91SAM9M10 and AT91SAM9M11.
+
+config SOC_AT91SAM9X5
+ bool "AT91SAM9x5 family"
+ select HAVE_AT91_DBGU0
+ select HAVE_FB_ATMEL
+ select SOC_AT91SAM9
+ help
+ Select this if you are using one of Atmel's AT91SAM9x5 family SoC.
+ This means that your SAM9 name finishes with a '5' (except if it is
+ AT91SAM9G45!).
+ This support covers AT91SAM9G15, AT91SAM9G25, AT91SAM9X25, AT91SAM9G35
+ and AT91SAM9X35.
+
+config SOC_AT91SAM9N12
+ bool "AT91SAM9N12 family"
+ select HAVE_AT91_DBGU0
+ select HAVE_FB_ATMEL
+ select SOC_AT91SAM9
+ 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
+
+comment "Generic Board Type"
+
+config MACH_AT91RM9200_DT
+ bool "Atmel AT91RM9200 Evaluation Kits with device-tree support"
+ depends on SOC_AT91RM9200
+ select USE_OF
+ help
+ Select this if you want to experiment device-tree with
+ an Atmel RM9200 Evaluation Kit.
+
+config MACH_AT91SAM_DT
+ bool "Atmel AT91SAM Evaluation Kits with device-tree support"
+ depends on SOC_AT91SAM9
+ select USE_OF
+ help
+ Select this if you want to experiment device-tree with
+ an Atmel Evaluation Kit.
+
+# ----------------------------------------------------------
+
+comment "AT91 Feature Selections"
+
+config AT91_PROGRAMMABLE_CLOCKS
+ bool "Programmable Clocks"
+ help
+ Select this if you need to program one or more of the PCK0..PCK3
+ programmable clock outputs.
+
+config AT91_SLOW_CLOCK
+ bool "Suspend-to-RAM disables main oscillator"
+ depends on SUSPEND
+ help
+ Select this if you want Suspend-to-RAM to save the most power
+ possible (without powering off the CPU) by disabling the PLLs
+ and main oscillator so that only the 32 KiHz clock is available.
+
+ When only that slow-clock is available, some peripherals lose
+ functionality. Many can't issue wakeup events unless faster
+ clocks are available. Some lose their operating state and
+ need to be completely re-initialized.
+
+config AT91_TIMER_HZ
+ int "Kernel HZ (jiffies per second)"
+ range 32 1024
+ depends on ARCH_AT91
+ default "128" if ARCH_AT91RM9200
+ default "100"
+ help
+ On AT91rm9200 chips where you're using a system clock derived
+ from the 32768 Hz hardware clock, this tick rate should divide
+ it exactly: use a power-of-two value, such as 128 or 256, to
+ reduce timing errors caused by rounding.
+
+ On AT91sam926x chips, or otherwise when using a higher precision
+ system clock (of at least several MHz), rounding is less of a
+ problem so it can be safer to use a decimal values like 100.
+
+endmenu
+
+endif
diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig.non_dt
similarity index 71%
rename from arch/arm/mach-at91/Kconfig
rename to arch/arm/mach-at91/Kconfig.non_dt
index 6071f4c..6c24985 100644
--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig.non_dt
@@ -1,98 +1,8 @@
-if ARCH_AT91
+menu "Atmel Non-DT world"
config HAVE_AT91_DATAFLASH_CARD
bool
-config HAVE_AT91_DBGU0
- bool
-
-config HAVE_AT91_DBGU1
- bool
-
-config AT91_SAM9_ALT_RESET
- bool
- default !ARCH_AT91X40
-
-config AT91_SAM9G45_RESET
- bool
- default !ARCH_AT91X40
-
-config SOC_AT91SAM9
- bool
- select CPU_ARM926T
- select GENERIC_CLOCKEVENTS
- select MULTI_IRQ_HANDLER
- select SPARSE_IRQ
-
-menu "Atmel AT91 System-on-Chip"
-
-comment "Atmel AT91 Processor"
-
-config SOC_AT91RM9200
- bool "AT91RM9200"
- select CPU_ARM920T
- select GENERIC_CLOCKEVENTS
- select HAVE_AT91_DBGU0
- select MULTI_IRQ_HANDLER
- select SPARSE_IRQ
-
-config SOC_AT91SAM9260
- bool "AT91SAM9260, AT91SAM9XE or AT91SAM9G20"
- select HAVE_AT91_DBGU0
- select SOC_AT91SAM9
- help
- Select this if you are using one of Atmel's AT91SAM9260, AT91SAM9XE
- or AT91SAM9G20 SoC.
-
-config SOC_AT91SAM9261
- bool "AT91SAM9261 or AT91SAM9G10"
- select HAVE_AT91_DBGU0
- select HAVE_FB_ATMEL
- select SOC_AT91SAM9
- help
- Select this if you are using one of Atmel's AT91SAM9261 or AT91SAM9G10 SoC.
-
-config SOC_AT91SAM9263
- bool "AT91SAM9263"
- select HAVE_AT91_DBGU1
- select HAVE_FB_ATMEL
- select SOC_AT91SAM9
-
-config SOC_AT91SAM9RL
- bool "AT91SAM9RL"
- select HAVE_AT91_DBGU0
- select HAVE_FB_ATMEL
- select SOC_AT91SAM9
-
-config SOC_AT91SAM9G45
- bool "AT91SAM9G45 or AT91SAM9M10 families"
- select HAVE_AT91_DBGU1
- select HAVE_FB_ATMEL
- select SOC_AT91SAM9
- help
- Select this if you are using one of Atmel's AT91SAM9G45 family SoC.
- This support covers AT91SAM9G45, AT91SAM9G46, AT91SAM9M10 and AT91SAM9M11.
-
-config SOC_AT91SAM9X5
- bool "AT91SAM9x5 family"
- select HAVE_AT91_DBGU0
- select HAVE_FB_ATMEL
- select SOC_AT91SAM9
- help
- Select this if you are using one of Atmel's AT91SAM9x5 family SoC.
- This means that your SAM9 name finishes with a '5' (except if it is
- AT91SAM9G45!).
- This support covers AT91SAM9G15, AT91SAM9G25, AT91SAM9X25, AT91SAM9G35
- and AT91SAM9X35.
-
-config SOC_AT91SAM9N12
- bool "AT91SAM9N12 family"
- select HAVE_AT91_DBGU0
- select HAVE_FB_ATMEL
- select SOC_AT91SAM9
- help
- Select this if you are using Atmel's AT91SAM9N12 SoC.
-
choice
prompt "Atmel AT91 Processor Devices for non DT boards"
@@ -140,10 +50,6 @@ config ARCH_AT91X40
endchoice
-config AT91_PMC_UNIT
- bool
- default !ARCH_AT91X40
-
# ----------------------------------------------------------
if ARCH_AT91RM9200
@@ -482,26 +388,6 @@ endif
# ----------------------------------------------------------
-comment "Generic Board Type"
-
-config MACH_AT91RM9200_DT
- bool "Atmel AT91RM9200 Evaluation Kits with device-tree support"
- depends on SOC_AT91RM9200
- select USE_OF
- help
- Select this if you want to experiment device-tree with
- an Atmel RM9200 Evaluation Kit.
-
-config MACH_AT91SAM_DT
- bool "Atmel AT91SAM Evaluation Kits with device-tree support"
- depends on SOC_AT91SAM9
- select USE_OF
- help
- Select this if you want to experiment device-tree with
- an Atmel Evaluation Kit.
-
-# ----------------------------------------------------------
-
comment "AT91 Board Options"
config MTD_AT91_DATAFLASH_CARD
@@ -510,45 +396,4 @@ config MTD_AT91_DATAFLASH_CARD
help
Enable support for the DataFlash card.
-# ----------------------------------------------------------
-
-comment "AT91 Feature Selections"
-
-config AT91_PROGRAMMABLE_CLOCKS
- bool "Programmable Clocks"
- help
- Select this if you need to program one or more of the PCK0..PCK3
- programmable clock outputs.
-
-config AT91_SLOW_CLOCK
- bool "Suspend-to-RAM disables main oscillator"
- depends on SUSPEND
- help
- Select this if you want Suspend-to-RAM to save the most power
- possible (without powering off the CPU) by disabling the PLLs
- and main oscillator so that only the 32 KiHz clock is available.
-
- When only that slow-clock is available, some peripherals lose
- functionality. Many can't issue wakeup events unless faster
- clocks are available. Some lose their operating state and
- need to be completely re-initialized.
-
-config AT91_TIMER_HZ
- int "Kernel HZ (jiffies per second)"
- range 32 1024
- depends on ARCH_AT91
- default "128" if ARCH_AT91RM9200
- default "100"
- help
- On AT91rm9200 chips where you're using a system clock derived
- from the 32768 Hz hardware clock, this tick rate should divide
- it exactly: use a power-of-two value, such as 128 or 256, to
- reduce timing errors caused by rounding.
-
- On AT91sam926x chips, or otherwise when using a higher precision
- system clock (of at least several MHz), rounding is less of a
- problem so it can be safer to use a decimal values like 100.
-
endmenu
-
-endif
--
1.7.10.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 2/3] ARM: at91: rename board-dt to more specific name board-dt-sam9
2013-03-07 14:21 ` [PATCH 1/3] ARM: at91: move non DT Kconfig to Kconfig.non_dt Jean-Christophe PLAGNIOL-VILLARD
@ 2013-03-07 14:21 ` Jean-Christophe PLAGNIOL-VILLARD
2013-03-13 14:17 ` Nicolas Ferre
2013-03-07 14:21 ` [PATCH 3/3] ARM: at91: renamme rm9200 dt file Jean-Christophe PLAGNIOL-VILLARD
1 sibling, 1 reply; 8+ messages in thread
From: Jean-Christophe PLAGNIOL-VILLARD @ 2013-03-07 14:21 UTC (permalink / raw)
To: linux-arm-kernel
as we will introduce the Cortex-A5 sama5 support
Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
Cc: Ludovic Desroches <ludovic.desroches@atmel.com>
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
arch/arm/configs/at91_dt_defconfig | 2 +-
arch/arm/configs/at91sam9260_defconfig | 2 +-
arch/arm/configs/at91sam9g20_defconfig | 2 +-
arch/arm/configs/at91sam9g45_defconfig | 2 +-
arch/arm/mach-at91/Kconfig | 2 +-
arch/arm/mach-at91/Makefile | 2 +-
arch/arm/mach-at91/{board-dt.c => board-dt-sam9.c} | 0
7 files changed, 6 insertions(+), 6 deletions(-)
rename arch/arm/mach-at91/{board-dt.c => board-dt-sam9.c} (100%)
diff --git a/arch/arm/configs/at91_dt_defconfig b/arch/arm/configs/at91_dt_defconfig
index 1ea9590..047f2a4 100644
--- a/arch/arm/configs/at91_dt_defconfig
+++ b/arch/arm/configs/at91_dt_defconfig
@@ -20,7 +20,7 @@ CONFIG_SOC_AT91SAM9263=y
CONFIG_SOC_AT91SAM9G45=y
CONFIG_SOC_AT91SAM9X5=y
CONFIG_SOC_AT91SAM9N12=y
-CONFIG_MACH_AT91SAM_DT=y
+CONFIG_MACH_AT91SAM9_DT=y
CONFIG_AT91_PROGRAMMABLE_CLOCKS=y
CONFIG_AT91_TIMER_HZ=128
CONFIG_AEABI=y
diff --git a/arch/arm/configs/at91sam9260_defconfig b/arch/arm/configs/at91sam9260_defconfig
index 0ea5d2c..05618eb 100644
--- a/arch/arm/configs/at91sam9260_defconfig
+++ b/arch/arm/configs/at91sam9260_defconfig
@@ -22,7 +22,7 @@ CONFIG_MACH_QIL_A9260=y
CONFIG_MACH_CPU9260=y
CONFIG_MACH_FLEXIBITY=y
CONFIG_MACH_SNAPPER_9260=y
-CONFIG_MACH_AT91SAM_DT=y
+CONFIG_MACH_AT91SAM9_DT=y
CONFIG_AT91_PROGRAMMABLE_CLOCKS=y
# CONFIG_ARM_THUMB is not set
CONFIG_ZBOOT_ROM_TEXT=0x0
diff --git a/arch/arm/configs/at91sam9g20_defconfig b/arch/arm/configs/at91sam9g20_defconfig
index 3b18810..892e828 100644
--- a/arch/arm/configs/at91sam9g20_defconfig
+++ b/arch/arm/configs/at91sam9g20_defconfig
@@ -22,7 +22,7 @@ CONFIG_MACH_PCONTROL_G20=y
CONFIG_MACH_GSIA18S=y
CONFIG_MACH_USB_A9G20=y
CONFIG_MACH_SNAPPER_9260=y
-CONFIG_MACH_AT91SAM_DT=y
+CONFIG_MACH_AT91SAM9_DT=y
CONFIG_AT91_PROGRAMMABLE_CLOCKS=y
# CONFIG_ARM_THUMB is not set
CONFIG_AEABI=y
diff --git a/arch/arm/configs/at91sam9g45_defconfig b/arch/arm/configs/at91sam9g45_defconfig
index 606d48f..5f551b7 100644
--- a/arch/arm/configs/at91sam9g45_defconfig
+++ b/arch/arm/configs/at91sam9g45_defconfig
@@ -18,7 +18,7 @@ CONFIG_MODULE_UNLOAD=y
CONFIG_ARCH_AT91=y
CONFIG_ARCH_AT91SAM9G45=y
CONFIG_MACH_AT91SAM9M10G45EK=y
-CONFIG_MACH_AT91SAM_DT=y
+CONFIG_MACH_AT91SAM9_DT=y
CONFIG_AT91_PROGRAMMABLE_CLOCKS=y
CONFIG_AT91_SLOW_CLOCK=y
CONFIG_AEABI=y
diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
index 98c2e05..440682b 100644
--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
@@ -108,7 +108,7 @@ config MACH_AT91RM9200_DT
Select this if you want to experiment device-tree with
an Atmel RM9200 Evaluation Kit.
-config MACH_AT91SAM_DT
+config MACH_AT91SAM9_DT
bool "Atmel AT91SAM Evaluation Kits with device-tree support"
depends on SOC_AT91SAM9
select USE_OF
diff --git a/arch/arm/mach-at91/Makefile b/arch/arm/mach-at91/Makefile
index 39218ca..5eca35a 100644
--- a/arch/arm/mach-at91/Makefile
+++ b/arch/arm/mach-at91/Makefile
@@ -88,7 +88,7 @@ obj-$(CONFIG_MACH_AT91SAM9M10G45EK) += board-sam9m10g45ek.o
# AT91SAM board with device-tree
obj-$(CONFIG_MACH_AT91RM9200_DT) += board-rm9200-dt.o
-obj-$(CONFIG_MACH_AT91SAM_DT) += board-dt.o
+obj-$(CONFIG_MACH_AT91SAM9_DT) += board-dt-sam9.o
# AT91X40 board-specific support
obj-$(CONFIG_MACH_AT91EB01) += board-eb01.o
diff --git a/arch/arm/mach-at91/board-dt.c b/arch/arm/mach-at91/board-dt-sam9.c
similarity index 100%
rename from arch/arm/mach-at91/board-dt.c
rename to arch/arm/mach-at91/board-dt-sam9.c
--
1.7.10.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 3/3] ARM: at91: renamme rm9200 dt file
2013-03-07 14:21 ` [PATCH 1/3] ARM: at91: move non DT Kconfig to Kconfig.non_dt Jean-Christophe PLAGNIOL-VILLARD
2013-03-07 14:21 ` [PATCH 2/3] ARM: at91: rename board-dt to more specific name board-dt-sam9 Jean-Christophe PLAGNIOL-VILLARD
@ 2013-03-07 14:21 ` Jean-Christophe PLAGNIOL-VILLARD
2013-03-13 14:22 ` Nicolas Ferre
1 sibling, 1 reply; 8+ messages in thread
From: Jean-Christophe PLAGNIOL-VILLARD @ 2013-03-07 14:21 UTC (permalink / raw)
To: linux-arm-kernel
to follow the same scheme board-dt-<socs>.c
Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
Cc: Ludovic Desroches <ludovic.desroches@atmel.com>
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
arch/arm/mach-at91/Makefile | 2 +-
arch/arm/mach-at91/{board-rm9200-dt.c => board-dt-rm9200.c} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
rename arch/arm/mach-at91/{board-rm9200-dt.c => board-dt-rm9200.c} (100%)
diff --git a/arch/arm/mach-at91/Makefile b/arch/arm/mach-at91/Makefile
index 5eca35a..505fed9 100644
--- a/arch/arm/mach-at91/Makefile
+++ b/arch/arm/mach-at91/Makefile
@@ -87,7 +87,7 @@ obj-$(CONFIG_MACH_SNAPPER_9260) += board-snapper9260.o
obj-$(CONFIG_MACH_AT91SAM9M10G45EK) += board-sam9m10g45ek.o
# AT91SAM board with device-tree
-obj-$(CONFIG_MACH_AT91RM9200_DT) += board-rm9200-dt.o
+obj-$(CONFIG_MACH_AT91RM9200_DT) += board-dt-rm9200.o
obj-$(CONFIG_MACH_AT91SAM9_DT) += board-dt-sam9.o
# AT91X40 board-specific support
diff --git a/arch/arm/mach-at91/board-rm9200-dt.c b/arch/arm/mach-at91/board-dt-rm9200.c
similarity index 100%
rename from arch/arm/mach-at91/board-rm9200-dt.c
rename to arch/arm/mach-at91/board-dt-rm9200.c
--
1.7.10.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 2/3] ARM: at91: rename board-dt to more specific name board-dt-sam9
2013-03-07 14:21 ` [PATCH 2/3] ARM: at91: rename board-dt to more specific name board-dt-sam9 Jean-Christophe PLAGNIOL-VILLARD
@ 2013-03-13 14:17 ` Nicolas Ferre
2013-03-13 16:32 ` Nicolas Ferre
0 siblings, 1 reply; 8+ messages in thread
From: Nicolas Ferre @ 2013-03-13 14:17 UTC (permalink / raw)
To: linux-arm-kernel
On 03/07/2013 03:21 PM, Jean-Christophe PLAGNIOL-VILLARD :
> as we will introduce the Cortex-A5 sama5 support
We may need more arguments here (Cf. discussion about the sama5d3
support). Let's discuss this and modify this commit message quickly.
Bye,
> Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
> Cc: Ludovic Desroches <ludovic.desroches@atmel.com>
> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
> ---
> arch/arm/configs/at91_dt_defconfig | 2 +-
> arch/arm/configs/at91sam9260_defconfig | 2 +-
> arch/arm/configs/at91sam9g20_defconfig | 2 +-
> arch/arm/configs/at91sam9g45_defconfig | 2 +-
> arch/arm/mach-at91/Kconfig | 2 +-
> arch/arm/mach-at91/Makefile | 2 +-
> arch/arm/mach-at91/{board-dt.c => board-dt-sam9.c} | 0
> 7 files changed, 6 insertions(+), 6 deletions(-)
> rename arch/arm/mach-at91/{board-dt.c => board-dt-sam9.c} (100%)
>
> diff --git a/arch/arm/configs/at91_dt_defconfig b/arch/arm/configs/at91_dt_defconfig
> index 1ea9590..047f2a4 100644
> --- a/arch/arm/configs/at91_dt_defconfig
> +++ b/arch/arm/configs/at91_dt_defconfig
> @@ -20,7 +20,7 @@ CONFIG_SOC_AT91SAM9263=y
> CONFIG_SOC_AT91SAM9G45=y
> CONFIG_SOC_AT91SAM9X5=y
> CONFIG_SOC_AT91SAM9N12=y
> -CONFIG_MACH_AT91SAM_DT=y
> +CONFIG_MACH_AT91SAM9_DT=y
> CONFIG_AT91_PROGRAMMABLE_CLOCKS=y
> CONFIG_AT91_TIMER_HZ=128
> CONFIG_AEABI=y
> diff --git a/arch/arm/configs/at91sam9260_defconfig b/arch/arm/configs/at91sam9260_defconfig
> index 0ea5d2c..05618eb 100644
> --- a/arch/arm/configs/at91sam9260_defconfig
> +++ b/arch/arm/configs/at91sam9260_defconfig
> @@ -22,7 +22,7 @@ CONFIG_MACH_QIL_A9260=y
> CONFIG_MACH_CPU9260=y
> CONFIG_MACH_FLEXIBITY=y
> CONFIG_MACH_SNAPPER_9260=y
> -CONFIG_MACH_AT91SAM_DT=y
> +CONFIG_MACH_AT91SAM9_DT=y
> CONFIG_AT91_PROGRAMMABLE_CLOCKS=y
> # CONFIG_ARM_THUMB is not set
> CONFIG_ZBOOT_ROM_TEXT=0x0
> diff --git a/arch/arm/configs/at91sam9g20_defconfig b/arch/arm/configs/at91sam9g20_defconfig
> index 3b18810..892e828 100644
> --- a/arch/arm/configs/at91sam9g20_defconfig
> +++ b/arch/arm/configs/at91sam9g20_defconfig
> @@ -22,7 +22,7 @@ CONFIG_MACH_PCONTROL_G20=y
> CONFIG_MACH_GSIA18S=y
> CONFIG_MACH_USB_A9G20=y
> CONFIG_MACH_SNAPPER_9260=y
> -CONFIG_MACH_AT91SAM_DT=y
> +CONFIG_MACH_AT91SAM9_DT=y
> CONFIG_AT91_PROGRAMMABLE_CLOCKS=y
> # CONFIG_ARM_THUMB is not set
> CONFIG_AEABI=y
> diff --git a/arch/arm/configs/at91sam9g45_defconfig b/arch/arm/configs/at91sam9g45_defconfig
> index 606d48f..5f551b7 100644
> --- a/arch/arm/configs/at91sam9g45_defconfig
> +++ b/arch/arm/configs/at91sam9g45_defconfig
> @@ -18,7 +18,7 @@ CONFIG_MODULE_UNLOAD=y
> CONFIG_ARCH_AT91=y
> CONFIG_ARCH_AT91SAM9G45=y
> CONFIG_MACH_AT91SAM9M10G45EK=y
> -CONFIG_MACH_AT91SAM_DT=y
> +CONFIG_MACH_AT91SAM9_DT=y
> CONFIG_AT91_PROGRAMMABLE_CLOCKS=y
> CONFIG_AT91_SLOW_CLOCK=y
> CONFIG_AEABI=y
> diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
> index 98c2e05..440682b 100644
> --- a/arch/arm/mach-at91/Kconfig
> +++ b/arch/arm/mach-at91/Kconfig
> @@ -108,7 +108,7 @@ config MACH_AT91RM9200_DT
> Select this if you want to experiment device-tree with
> an Atmel RM9200 Evaluation Kit.
>
> -config MACH_AT91SAM_DT
> +config MACH_AT91SAM9_DT
> bool "Atmel AT91SAM Evaluation Kits with device-tree support"
> depends on SOC_AT91SAM9
> select USE_OF
> diff --git a/arch/arm/mach-at91/Makefile b/arch/arm/mach-at91/Makefile
> index 39218ca..5eca35a 100644
> --- a/arch/arm/mach-at91/Makefile
> +++ b/arch/arm/mach-at91/Makefile
> @@ -88,7 +88,7 @@ obj-$(CONFIG_MACH_AT91SAM9M10G45EK) += board-sam9m10g45ek.o
>
> # AT91SAM board with device-tree
> obj-$(CONFIG_MACH_AT91RM9200_DT) += board-rm9200-dt.o
> -obj-$(CONFIG_MACH_AT91SAM_DT) += board-dt.o
> +obj-$(CONFIG_MACH_AT91SAM9_DT) += board-dt-sam9.o
>
> # AT91X40 board-specific support
> obj-$(CONFIG_MACH_AT91EB01) += board-eb01.o
> diff --git a/arch/arm/mach-at91/board-dt.c b/arch/arm/mach-at91/board-dt-sam9.c
> similarity index 100%
> rename from arch/arm/mach-at91/board-dt.c
> rename to arch/arm/mach-at91/board-dt-sam9.c
>
--
Nicolas Ferre
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 3/3] ARM: at91: renamme rm9200 dt file
2013-03-07 14:21 ` [PATCH 3/3] ARM: at91: renamme rm9200 dt file Jean-Christophe PLAGNIOL-VILLARD
@ 2013-03-13 14:22 ` Nicolas Ferre
2013-03-13 16:30 ` Nicolas Ferre
0 siblings, 1 reply; 8+ messages in thread
From: Nicolas Ferre @ 2013-03-13 14:22 UTC (permalink / raw)
To: linux-arm-kernel
On 03/07/2013 03:21 PM, Jean-Christophe PLAGNIOL-VILLARD :
> to follow the same scheme board-dt-<socs>.c
Well not <socs> as each and every SoC will not have its own board file.
I confess that finding a proper name is not easy, what about:
Rename the board-rm9200-dt.c file so that we follow the pattern for
Device Tree board files: board-dt-<name of SoC sharing same core>.c
Best regards,
> Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
> Cc: Ludovic Desroches <ludovic.desroches@atmel.com>
> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
> ---
> arch/arm/mach-at91/Makefile | 2 +-
> arch/arm/mach-at91/{board-rm9200-dt.c => board-dt-rm9200.c} | 0
> 2 files changed, 1 insertion(+), 1 deletion(-)
> rename arch/arm/mach-at91/{board-rm9200-dt.c => board-dt-rm9200.c} (100%)
>
> diff --git a/arch/arm/mach-at91/Makefile b/arch/arm/mach-at91/Makefile
> index 5eca35a..505fed9 100644
> --- a/arch/arm/mach-at91/Makefile
> +++ b/arch/arm/mach-at91/Makefile
> @@ -87,7 +87,7 @@ obj-$(CONFIG_MACH_SNAPPER_9260) += board-snapper9260.o
> obj-$(CONFIG_MACH_AT91SAM9M10G45EK) += board-sam9m10g45ek.o
>
> # AT91SAM board with device-tree
> -obj-$(CONFIG_MACH_AT91RM9200_DT) += board-rm9200-dt.o
> +obj-$(CONFIG_MACH_AT91RM9200_DT) += board-dt-rm9200.o
> obj-$(CONFIG_MACH_AT91SAM9_DT) += board-dt-sam9.o
>
> # AT91X40 board-specific support
> diff --git a/arch/arm/mach-at91/board-rm9200-dt.c b/arch/arm/mach-at91/board-dt-rm9200.c
> similarity index 100%
> rename from arch/arm/mach-at91/board-rm9200-dt.c
> rename to arch/arm/mach-at91/board-dt-rm9200.c
>
--
Nicolas Ferre
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 3/3] ARM: at91: renamme rm9200 dt file
2013-03-13 14:22 ` Nicolas Ferre
@ 2013-03-13 16:30 ` Nicolas Ferre
0 siblings, 0 replies; 8+ messages in thread
From: Nicolas Ferre @ 2013-03-13 16:30 UTC (permalink / raw)
To: linux-arm-kernel
On 03/13/2013 03:22 PM, Nicolas Ferre :
> On 03/07/2013 03:21 PM, Jean-Christophe PLAGNIOL-VILLARD :
>> to follow the same scheme board-dt-<socs>.c
>
> Well not <socs> as each and every SoC will not have its own board file.
> I confess that finding a proper name is not easy, what about:
>
> Rename the board-rm9200-dt.c file so that we follow the pattern for
> Device Tree board files: board-dt-<name of SoC sharing same core>.c
Queued in at91-3.10-soc with this modified commit message.
Thanks, best regards,
> Best regards,
>
>> Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
>> Cc: Ludovic Desroches <ludovic.desroches@atmel.com>
>> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
>> ---
>> arch/arm/mach-at91/Makefile | 2 +-
>> arch/arm/mach-at91/{board-rm9200-dt.c => board-dt-rm9200.c} | 0
>> 2 files changed, 1 insertion(+), 1 deletion(-)
>> rename arch/arm/mach-at91/{board-rm9200-dt.c => board-dt-rm9200.c} (100%)
>>
>> diff --git a/arch/arm/mach-at91/Makefile b/arch/arm/mach-at91/Makefile
>> index 5eca35a..505fed9 100644
>> --- a/arch/arm/mach-at91/Makefile
>> +++ b/arch/arm/mach-at91/Makefile
>> @@ -87,7 +87,7 @@ obj-$(CONFIG_MACH_SNAPPER_9260) += board-snapper9260.o
>> obj-$(CONFIG_MACH_AT91SAM9M10G45EK) += board-sam9m10g45ek.o
>>
>> # AT91SAM board with device-tree
>> -obj-$(CONFIG_MACH_AT91RM9200_DT) += board-rm9200-dt.o
>> +obj-$(CONFIG_MACH_AT91RM9200_DT) += board-dt-rm9200.o
>> obj-$(CONFIG_MACH_AT91SAM9_DT) += board-dt-sam9.o
>>
>> # AT91X40 board-specific support
>> diff --git a/arch/arm/mach-at91/board-rm9200-dt.c b/arch/arm/mach-at91/board-dt-rm9200.c
>> similarity index 100%
>> rename from arch/arm/mach-at91/board-rm9200-dt.c
>> rename to arch/arm/mach-at91/board-dt-rm9200.c
>>
>
>
--
Nicolas Ferre
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 2/3] ARM: at91: rename board-dt to more specific name board-dt-sam9
2013-03-13 14:17 ` Nicolas Ferre
@ 2013-03-13 16:32 ` Nicolas Ferre
0 siblings, 0 replies; 8+ messages in thread
From: Nicolas Ferre @ 2013-03-13 16:32 UTC (permalink / raw)
To: linux-arm-kernel
On 03/13/2013 03:17 PM, Nicolas Ferre :
> On 03/07/2013 03:21 PM, Jean-Christophe PLAGNIOL-VILLARD :
>> as we will introduce the Cortex-A5 sama5 support
>
> We may need more arguments here (Cf. discussion about the sama5d3
> support). Let's discuss this and modify this commit message quickly.
Queued to at91-3.10-soc with following commit message:
"
We will produce a board-dt file per SoC core type. That will ease code
readability and will prevent from including superfluous code for supporting
machines that will never be compiled together (particularly the ARM9 and C-A5
upcoming SoCs).
"
Thanks, best regards,
>> Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
>> Cc: Ludovic Desroches <ludovic.desroches@atmel.com>
>> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
>> ---
>> arch/arm/configs/at91_dt_defconfig | 2 +-
>> arch/arm/configs/at91sam9260_defconfig | 2 +-
>> arch/arm/configs/at91sam9g20_defconfig | 2 +-
>> arch/arm/configs/at91sam9g45_defconfig | 2 +-
>> arch/arm/mach-at91/Kconfig | 2 +-
>> arch/arm/mach-at91/Makefile | 2 +-
>> arch/arm/mach-at91/{board-dt.c => board-dt-sam9.c} | 0
>> 7 files changed, 6 insertions(+), 6 deletions(-)
>> rename arch/arm/mach-at91/{board-dt.c => board-dt-sam9.c} (100%)
>>
>> diff --git a/arch/arm/configs/at91_dt_defconfig b/arch/arm/configs/at91_dt_defconfig
>> index 1ea9590..047f2a4 100644
>> --- a/arch/arm/configs/at91_dt_defconfig
>> +++ b/arch/arm/configs/at91_dt_defconfig
>> @@ -20,7 +20,7 @@ CONFIG_SOC_AT91SAM9263=y
>> CONFIG_SOC_AT91SAM9G45=y
>> CONFIG_SOC_AT91SAM9X5=y
>> CONFIG_SOC_AT91SAM9N12=y
>> -CONFIG_MACH_AT91SAM_DT=y
>> +CONFIG_MACH_AT91SAM9_DT=y
>> CONFIG_AT91_PROGRAMMABLE_CLOCKS=y
>> CONFIG_AT91_TIMER_HZ=128
>> CONFIG_AEABI=y
>> diff --git a/arch/arm/configs/at91sam9260_defconfig b/arch/arm/configs/at91sam9260_defconfig
>> index 0ea5d2c..05618eb 100644
>> --- a/arch/arm/configs/at91sam9260_defconfig
>> +++ b/arch/arm/configs/at91sam9260_defconfig
>> @@ -22,7 +22,7 @@ CONFIG_MACH_QIL_A9260=y
>> CONFIG_MACH_CPU9260=y
>> CONFIG_MACH_FLEXIBITY=y
>> CONFIG_MACH_SNAPPER_9260=y
>> -CONFIG_MACH_AT91SAM_DT=y
>> +CONFIG_MACH_AT91SAM9_DT=y
>> CONFIG_AT91_PROGRAMMABLE_CLOCKS=y
>> # CONFIG_ARM_THUMB is not set
>> CONFIG_ZBOOT_ROM_TEXT=0x0
>> diff --git a/arch/arm/configs/at91sam9g20_defconfig b/arch/arm/configs/at91sam9g20_defconfig
>> index 3b18810..892e828 100644
>> --- a/arch/arm/configs/at91sam9g20_defconfig
>> +++ b/arch/arm/configs/at91sam9g20_defconfig
>> @@ -22,7 +22,7 @@ CONFIG_MACH_PCONTROL_G20=y
>> CONFIG_MACH_GSIA18S=y
>> CONFIG_MACH_USB_A9G20=y
>> CONFIG_MACH_SNAPPER_9260=y
>> -CONFIG_MACH_AT91SAM_DT=y
>> +CONFIG_MACH_AT91SAM9_DT=y
>> CONFIG_AT91_PROGRAMMABLE_CLOCKS=y
>> # CONFIG_ARM_THUMB is not set
>> CONFIG_AEABI=y
>> diff --git a/arch/arm/configs/at91sam9g45_defconfig b/arch/arm/configs/at91sam9g45_defconfig
>> index 606d48f..5f551b7 100644
>> --- a/arch/arm/configs/at91sam9g45_defconfig
>> +++ b/arch/arm/configs/at91sam9g45_defconfig
>> @@ -18,7 +18,7 @@ CONFIG_MODULE_UNLOAD=y
>> CONFIG_ARCH_AT91=y
>> CONFIG_ARCH_AT91SAM9G45=y
>> CONFIG_MACH_AT91SAM9M10G45EK=y
>> -CONFIG_MACH_AT91SAM_DT=y
>> +CONFIG_MACH_AT91SAM9_DT=y
>> CONFIG_AT91_PROGRAMMABLE_CLOCKS=y
>> CONFIG_AT91_SLOW_CLOCK=y
>> CONFIG_AEABI=y
>> diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
>> index 98c2e05..440682b 100644
>> --- a/arch/arm/mach-at91/Kconfig
>> +++ b/arch/arm/mach-at91/Kconfig
>> @@ -108,7 +108,7 @@ config MACH_AT91RM9200_DT
>> Select this if you want to experiment device-tree with
>> an Atmel RM9200 Evaluation Kit.
>>
>> -config MACH_AT91SAM_DT
>> +config MACH_AT91SAM9_DT
>> bool "Atmel AT91SAM Evaluation Kits with device-tree support"
>> depends on SOC_AT91SAM9
>> select USE_OF
>> diff --git a/arch/arm/mach-at91/Makefile b/arch/arm/mach-at91/Makefile
>> index 39218ca..5eca35a 100644
>> --- a/arch/arm/mach-at91/Makefile
>> +++ b/arch/arm/mach-at91/Makefile
>> @@ -88,7 +88,7 @@ obj-$(CONFIG_MACH_AT91SAM9M10G45EK) += board-sam9m10g45ek.o
>>
>> # AT91SAM board with device-tree
>> obj-$(CONFIG_MACH_AT91RM9200_DT) += board-rm9200-dt.o
>> -obj-$(CONFIG_MACH_AT91SAM_DT) += board-dt.o
>> +obj-$(CONFIG_MACH_AT91SAM9_DT) += board-dt-sam9.o
>>
>> # AT91X40 board-specific support
>> obj-$(CONFIG_MACH_AT91EB01) += board-eb01.o
>> diff --git a/arch/arm/mach-at91/board-dt.c b/arch/arm/mach-at91/board-dt-sam9.c
>> similarity index 100%
>> rename from arch/arm/mach-at91/board-dt.c
>> rename to arch/arm/mach-at91/board-dt-sam9.c
>>
>
>
--
Nicolas Ferre
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2013-03-13 16:32 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-03-07 13:08 [PULL PATCH 0/3] ARM: at91: Kconfig cleanup for prepare add of Cortex-A5 Sama5 Jean-Christophe PLAGNIOL-VILLARD
2013-03-07 14:21 ` [PATCH 1/3] ARM: at91: move non DT Kconfig to Kconfig.non_dt Jean-Christophe PLAGNIOL-VILLARD
2013-03-07 14:21 ` [PATCH 2/3] ARM: at91: rename board-dt to more specific name board-dt-sam9 Jean-Christophe PLAGNIOL-VILLARD
2013-03-13 14:17 ` Nicolas Ferre
2013-03-13 16:32 ` Nicolas Ferre
2013-03-07 14:21 ` [PATCH 3/3] ARM: at91: renamme rm9200 dt file Jean-Christophe PLAGNIOL-VILLARD
2013-03-13 14:22 ` Nicolas Ferre
2013-03-13 16:30 ` Nicolas Ferre
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).