diff options
| author | yagi <yagi@ke66.alps.lineo.co.jp> | 2012-06-01 13:51:42 +0900 |
|---|---|---|
| committer | Justin Waters <justin.waters@timesys.com> | 2012-07-03 17:15:04 -0400 |
| commit | 791f781d42d6039f89ffd516d1fd90fb33d97d77 (patch) | |
| tree | c2816805d6f1be497bdd477bee745ca77211d8f0 | |
| parent | 303d272518e78cba565224686560bc6980536a96 (diff) | |
2012.06.01: Add CONFIG_IOMUX_PRIMARY/CONFIG_IOMUX_SECONDARY support
| -rw-r--r-- | arch/arm/mach-mvf/Kconfig | 21 | ||||
| -rw-r--r-- | arch/arm/mach-mvf/board-twr_vf600.h | 4 |
2 files changed, 25 insertions, 0 deletions
diff --git a/arch/arm/mach-mvf/Kconfig b/arch/arm/mach-mvf/Kconfig index f6f237f7a389..38c3acd19659 100644 --- a/arch/arm/mach-mvf/Kconfig +++ b/arch/arm/mach-mvf/Kconfig @@ -61,6 +61,27 @@ config MACH_TWR_VF600 comment "MVF Options:" +menu "IOMUX Setting" + +choice + prompt "TWR-VF600 IOMUX Setting" + default IOMUX_PRIMARY + depends on MACH_TWR_VF600 + +config IOMUX_PRIMARY + bool "Primary" + help + Setup IOMUX as Primary Function + +config IOMUX_SECONDARY + bool "Secondary" + help + Setup IOMUX as Secondary Function + +endchoice + +endmenu + config IMX_PCIE bool "PCI Express support" select PCI diff --git a/arch/arm/mach-mvf/board-twr_vf600.h b/arch/arm/mach-mvf/board-twr_vf600.h index 25d50ef1f980..45188a065070 100644 --- a/arch/arm/mach-mvf/board-twr_vf600.h +++ b/arch/arm/mach-mvf/board-twr_vf600.h @@ -19,6 +19,7 @@ #include <mach/iomux-vf6xx.h> static iomux_vmvf_cfg_t twr_vf6xx_pads[] = { +#if defined(CONFIG_IOMUX_PRIMARY) /* primary function */ VF6XX_PAD_PAD_0__CCM_RMII_CLKIN, VF6XX_PAD_PAD_1__DEBUG_TCLK, @@ -155,6 +156,9 @@ static iomux_vmvf_cfg_t twr_vf6xx_pads[] = { VF6XX_PAD_PAD_132__TCON0_DATA_OUT8, VF6XX_PAD_PAD_133__TCON0_DATA_OUT9, VF6XX_PAD_PAD_134__RGPIOC_GPIO134 +#elif defined(CONFIG_IOMUX_SECONDARY) + /* Secondary function */ +#endif }; |