diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2013-11-29 09:02:08 +0100 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2013-11-29 09:02:08 +0100 |
| commit | 7d161df98671d3816875bfeccab527e3d8ab5dda (patch) | |
| tree | 6b6eb7651de87cc10c183f1af5fbc7a740eb3596 /arch | |
| parent | f7931050d576ffa31a94300e6ce1c7e3e04c2288 (diff) | |
colibri_vf: fix ifdefs
Various ifdefs still use CONFIG_MACH_COLIBRI_VF50. Migrate them to
using the hidden CONFIG_COLIBRI_VF define active for both Colibri VF50
as well as Colibri VF61.
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-mvf/clock.c | 4 | ||||
| -rw-r--r-- | arch/arm/mach-mvf/mvf_fec.c | 2 | ||||
| -rw-r--r-- | arch/arm/plat-mxc/include/mach/iomux-mvf.h | 3 |
3 files changed, 5 insertions, 4 deletions
diff --git a/arch/arm/mach-mvf/clock.c b/arch/arm/mach-mvf/clock.c index 3b514d61002b..8ccfce7678a5 100644 --- a/arch/arm/mach-mvf/clock.c +++ b/arch/arm/mach-mvf/clock.c @@ -1973,7 +1973,7 @@ int __init mvf_clocks_init(unsigned long ckil, unsigned long osc, clk_set_parent(&dcu0_clk, &pll1_pfd2_452M); //480 MHz // clk_set_parent(&dcu0_clk, &pll3_usb_otg_main_clk); -#if !defined(CONFIG_MACH_COLIBRI_VF50) +#if !defined(CONFIG_COLIBRI_VF) clk_set_rate(&dcu0_clk, 113000000); #else clk_set_rate(&dcu0_clk, 452000000); @@ -1982,7 +1982,7 @@ int __init mvf_clocks_init(unsigned long ckil, unsigned long osc, clk_set_parent(&sai2_clk, &audio_external_clk); clk_set_rate(&sai2_clk, 24576000); -#if !defined(CONFIG_MACH_COLIBRI_VF50) +#if !defined(CONFIG_COLIBRI_VF) clk_set_parent(&qspi0_clk, &pll1_pfd4_528M); clk_set_rate(&qspi0_clk, 66000000); #endif diff --git a/arch/arm/mach-mvf/mvf_fec.c b/arch/arm/mach-mvf/mvf_fec.c index 437ba538d583..55ba44bf73f0 100644 --- a/arch/arm/mach-mvf/mvf_fec.c +++ b/arch/arm/mach-mvf/mvf_fec.c @@ -52,7 +52,7 @@ void __init mvf_init_fec(struct fec_platform_data fec_data) if (!is_valid_ether_addr(fec_data.mac)) memcpy(fec_data.mac, default_mac, ETH_ALEN); -#if !defined(CONFIG_MACH_COLIBRI_VF50) +#if !defined(CONFIG_COLIBRI_VF) mvf_add_fec(0, &fec_data); #endif #ifdef CONFIG_FEC1 diff --git a/arch/arm/plat-mxc/include/mach/iomux-mvf.h b/arch/arm/plat-mxc/include/mach/iomux-mvf.h index cfbc24b8fa8e..b9ba094fbd7a 100644 --- a/arch/arm/plat-mxc/include/mach/iomux-mvf.h +++ b/arch/arm/plat-mxc/include/mach/iomux-mvf.h @@ -64,7 +64,7 @@ typedef enum iomux_config { #define MVF600_HIGH_DRV PAD_CTL_DSE_150ohm -#if defined(CONFIG_MACH_COLIBRI_VF50) +#if defined(CONFIG_COLIBRI_VF) #define MVF600_DCU_PAD_CTRL (PAD_CTL_DSE_75ohm | PAD_CTL_OBE_ENABLE) #else #define MVF600_DCU_PAD_CTRL (MVF600_HIGH_DRV | PAD_CTL_OBE_ENABLE) @@ -73,6 +73,7 @@ typedef enum iomux_config { #define MVF600_UART_PAD_CTRL (PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_MED | \ PAD_CTL_DSE_25ohm) +//why PKE? #define MVF600_GPIO_GENERAL_CTRL (PAD_CTL_PKE | PAD_CTL_PUE | PAD_CTL_SPEED_MED | PAD_CTL_PUS_47K_UP | \ PAD_CTL_DSE_25ohm) |