diff options
author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2013-11-21 09:35:58 +0100 |
---|---|---|
committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2013-11-21 09:35:58 +0100 |
commit | f7931050d576ffa31a94300e6ce1c7e3e04c2288 (patch) | |
tree | 36cf95a529583941ce081b579b3877757780b603 | |
parent | 0b7ef9306f41b57e3bf2fae345dacad769657d86 (diff) |
colibri_vf: rename colibri_vf50 to colibri_vf
Now as the colibri_vf50 configuration allows for 500 MHz A5 core
frequency as well rename it to colibri_vf to be universally used for
Colibri VF50 as well as VF61.
While at it actually add the Colibri VF61 machine id and its
corresponding machine definition.
-rw-r--r-- | arch/arm/configs/colibri_vf_defconfig (renamed from arch/arm/configs/colibri_vf50_defconfig) | 4 | ||||
-rw-r--r-- | arch/arm/mach-mvf/Kconfig | 17 | ||||
-rw-r--r-- | arch/arm/mach-mvf/Makefile | 2 | ||||
-rw-r--r-- | arch/arm/mach-mvf/board-colibri_vf.c (renamed from arch/arm/mach-mvf/board-colibri_vf50.c) | 9 | ||||
-rw-r--r-- | arch/arm/tools/mach-types | 1 |
5 files changed, 28 insertions, 5 deletions
diff --git a/arch/arm/configs/colibri_vf50_defconfig b/arch/arm/configs/colibri_vf_defconfig index 6490de553c6f..e5422b7e2fb5 100644 --- a/arch/arm/configs/colibri_vf50_defconfig +++ b/arch/arm/configs/colibri_vf_defconfig @@ -34,6 +34,7 @@ CONFIG_MODULE_FORCE_UNLOAD=y CONFIG_ARCH_MXC=y CONFIG_ARCH_MVF=y CONFIG_MACH_COLIBRI_VF50=y +CONFIG_MACH_COLIBRI_VF61=y CONFIG_MXC_PWM=y CONFIG_MXC_USE_PIT=y CONFIG_DMA_ZONE_SIZE=16 @@ -227,7 +228,8 @@ CONFIG_SND_USB=y CONFIG_SND_USB_AUDIO=y CONFIG_SND_SOC=y CONFIG_SND_MVF_SOC=y -CONFIG_SND_MVF_SOC_COLIBRI_VF61=y +# CONFIG_SND_SOC_MVF_SGTL5000 is not set +CONFIG_SND_SOC_MVF_COLIBRI_VF61=y CONFIG_HIDRAW=y CONFIG_USB_HIDDEV=y CONFIG_USB=y diff --git a/arch/arm/mach-mvf/Kconfig b/arch/arm/mach-mvf/Kconfig index d82873ce80e5..a19fa1bae723 100644 --- a/arch/arm/mach-mvf/Kconfig +++ b/arch/arm/mach-mvf/Kconfig @@ -27,6 +27,20 @@ config SOC_MVFA5 config MACH_COLIBRI_VF50 bool "Support Toradex Colibri VF50 module" + select COLIBRI_VF + help + Include support for Toradex Colibri VF50 module on Iris carrier board. This + includes specific configurations for the board and its peripherals. + +config MACH_COLIBRI_VF61 + bool "Support Toradex Colibri VF61 module" + select COLIBRI_VF + help + Include support for Toradex Colibri VF61 module on Iris carrier board. This + includes specific configurations for the board and its peripherals. + +config COLIBRI_VF + bool select ARCH_MVFA5 select SOC_MVFA5 select IMX_HAVE_PLATFORM_IMX_UART @@ -55,9 +69,6 @@ config MACH_COLIBRI_VF50 select IMX_HAVE_PLATFORM_MVF_SAI select IMX_HAVE_PLATFORM_MXC_NAND select IMX_HAVE_PLATFORM_MVF_CAAM - help - Include support for Toradex Colibri VF50 module on Iris carrier board. This - includes specific configurations for the board and its peripherals. config MACH_MVFA5_TWR_VF700 bool "Support MVF CORTEX-A5 TWR-VF700 platform" diff --git a/arch/arm/mach-mvf/Makefile b/arch/arm/mach-mvf/Makefile index ce577e9bea2c..373166a97adc 100644 --- a/arch/arm/mach-mvf/Makefile +++ b/arch/arm/mach-mvf/Makefile @@ -7,5 +7,5 @@ obj-y := cpu.o mm.o system.o devices.o dummy_gpio.o irq.o bus_freq.o mvf_fec.o obj-y += l2switch.o obj-$(CONFIG_ARCH_MVFA5) += clock.o mvf_suspend.o -obj-$(CONFIG_MACH_COLIBRI_VF50) += board-colibri_vf50.o +obj-$(CONFIG_COLIBRI_VF) += board-colibri_vf.o obj-$(CONFIG_MACH_MVFA5_TWR_VF700) += board-twr-vf700.o diff --git a/arch/arm/mach-mvf/board-colibri_vf50.c b/arch/arm/mach-mvf/board-colibri_vf.c index 5ff7717a1d31..a407c49af96f 100644 --- a/arch/arm/mach-mvf/board-colibri_vf50.c +++ b/arch/arm/mach-mvf/board-colibri_vf.c @@ -601,3 +601,12 @@ MACHINE_START(COLIBRI_VF50, "Toradex Colibri VF50 Module") .map_io = mvf_map_io, .timer = &mxc_timer, MACHINE_END + +MACHINE_START(COLIBRI_VF61, "Toradex Colibri VF61 Module") + .boot_params = MVF_PHYS_OFFSET + 0x100, + .fixup = fixup_mxc_board, + .init_irq = mvf_init_irq, + .init_machine = mvf_board_init, + .map_io = mvf_map_io, + .timer = &mxc_timer, +MACHINE_END diff --git a/arch/arm/tools/mach-types b/arch/arm/tools/mach-types index 18915e9b90ac..287cd75bc69c 100644 --- a/arch/arm/tools/mach-types +++ b/arch/arm/tools/mach-types @@ -1122,3 +1122,4 @@ mvf_twr_vf500 MACH_MVFA5_TWR_VF500 MVFA5_TWR_VF500 4147 mvf_twr_vf600 MACH_MVFA5_TWR_VF600 MVFA5_TWR_VF600 4146 mvf_twr_vf700 MACH_MVFA5_TWR_VF700 MVFA5_TWR_VF700 2125 colibri_vf50 MACH_COLIBRI_VF50 COLIBRI_VF50 4749 +colibri_vf61 MACH_COLIBRI_VF61 COLIBRI_VF61 4750 |