diff options
Diffstat (limited to 'arch/arm/mach-at91')
| -rw-r--r-- | arch/arm/mach-at91/Kconfig | 2 | ||||
| -rw-r--r-- | arch/arm/mach-at91/at91sam9n12.c | 6 | ||||
| -rw-r--r-- | arch/arm/mach-at91/at91sam9x5.c | 6 |
3 files changed, 10 insertions, 4 deletions
diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig index b2d2cf4dc052..45b55e0f0db6 100644 --- a/arch/arm/mach-at91/Kconfig +++ b/arch/arm/mach-at91/Kconfig | |||
| @@ -167,7 +167,6 @@ config SOC_AT91SAM9X5 | |||
| 167 | select HAVE_AT91_DBGU0 | 167 | select HAVE_AT91_DBGU0 |
| 168 | select HAVE_FB_ATMEL | 168 | select HAVE_FB_ATMEL |
| 169 | select SOC_AT91SAM9 | 169 | select SOC_AT91SAM9 |
| 170 | select AT91_USE_OLD_CLK | ||
| 171 | select HAVE_AT91_UTMI | 170 | select HAVE_AT91_UTMI |
| 172 | select HAVE_AT91_SMD | 171 | select HAVE_AT91_SMD |
| 173 | select HAVE_AT91_USB_CLK | 172 | select HAVE_AT91_USB_CLK |
| @@ -183,7 +182,6 @@ config SOC_AT91SAM9N12 | |||
| 183 | select HAVE_AT91_DBGU0 | 182 | select HAVE_AT91_DBGU0 |
| 184 | select HAVE_FB_ATMEL | 183 | select HAVE_FB_ATMEL |
| 185 | select SOC_AT91SAM9 | 184 | select SOC_AT91SAM9 |
| 186 | select AT91_USE_OLD_CLK | ||
| 187 | select HAVE_AT91_USB_CLK | 185 | select HAVE_AT91_USB_CLK |
| 188 | help | 186 | help |
| 189 | Select this if you are using Atmel's AT91SAM9N12 SoC. | 187 | Select this if you are using Atmel's AT91SAM9N12 SoC. |
diff --git a/arch/arm/mach-at91/at91sam9n12.c b/arch/arm/mach-at91/at91sam9n12.c index f2ea7b0a02da..c8988fe5ff70 100644 --- a/arch/arm/mach-at91/at91sam9n12.c +++ b/arch/arm/mach-at91/at91sam9n12.c | |||
| @@ -19,9 +19,10 @@ | |||
| 19 | #include "board.h" | 19 | #include "board.h" |
| 20 | #include "soc.h" | 20 | #include "soc.h" |
| 21 | #include "generic.h" | 21 | #include "generic.h" |
| 22 | #include "clock.h" | ||
| 23 | #include "sam9_smc.h" | 22 | #include "sam9_smc.h" |
| 24 | 23 | ||
| 24 | #if defined(CONFIG_OLD_CLK_AT91) | ||
| 25 | #include "clock.h" | ||
| 25 | /* -------------------------------------------------------------------- | 26 | /* -------------------------------------------------------------------- |
| 26 | * Clocks | 27 | * Clocks |
| 27 | * -------------------------------------------------------------------- */ | 28 | * -------------------------------------------------------------------- */ |
| @@ -215,6 +216,9 @@ static void __init at91sam9n12_register_clocks(void) | |||
| 215 | ARRAY_SIZE(periph_clocks_lookups)); | 216 | ARRAY_SIZE(periph_clocks_lookups)); |
| 216 | 217 | ||
| 217 | } | 218 | } |
| 219 | #else | ||
| 220 | #define at91sam9n12_register_clocks NULL | ||
| 221 | #endif | ||
| 218 | 222 | ||
| 219 | /* -------------------------------------------------------------------- | 223 | /* -------------------------------------------------------------------- |
| 220 | * AT91SAM9N12 processor initialization | 224 | * AT91SAM9N12 processor initialization |
diff --git a/arch/arm/mach-at91/at91sam9x5.c b/arch/arm/mach-at91/at91sam9x5.c index 9ad781d5ee7c..028268ff3722 100644 --- a/arch/arm/mach-at91/at91sam9x5.c +++ b/arch/arm/mach-at91/at91sam9x5.c | |||
| @@ -19,9 +19,10 @@ | |||
| 19 | #include "board.h" | 19 | #include "board.h" |
| 20 | #include "soc.h" | 20 | #include "soc.h" |
| 21 | #include "generic.h" | 21 | #include "generic.h" |
| 22 | #include "clock.h" | ||
| 23 | #include "sam9_smc.h" | 22 | #include "sam9_smc.h" |
| 24 | 23 | ||
| 24 | #if defined(CONFIG_OLD_CLK_AT91) | ||
| 25 | #include "clock.h" | ||
| 25 | /* -------------------------------------------------------------------- | 26 | /* -------------------------------------------------------------------- |
| 26 | * Clocks | 27 | * Clocks |
| 27 | * -------------------------------------------------------------------- */ | 28 | * -------------------------------------------------------------------- */ |
| @@ -313,6 +314,9 @@ static void __init at91sam9x5_register_clocks(void) | |||
| 313 | clk_register(&pck0); | 314 | clk_register(&pck0); |
| 314 | clk_register(&pck1); | 315 | clk_register(&pck1); |
| 315 | } | 316 | } |
| 317 | #else | ||
| 318 | #define at91sam9x5_register_clocks NULL | ||
| 319 | #endif | ||
| 316 | 320 | ||
| 317 | /* -------------------------------------------------------------------- | 321 | /* -------------------------------------------------------------------- |
| 318 | * AT91SAM9x5 processor initialization | 322 | * AT91SAM9x5 processor initialization |