aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-at91
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-06-02 19:34:00 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2014-06-02 19:34:00 -0400
commit755a9ba7bf24a45b6dbf8bb15a5a56c8ed12461a (patch)
treead98ee0f336630144e571c9499453c571c6b02c7 /arch/arm/mach-at91
parent7477838f2e481256a40e0c44b92f9bccb065bc51 (diff)
parent0f16aa3c24a216d14d7f0587e1cbd2c1b51a38f3 (diff)
Merge tag 'dt-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc into next
Pull ARM SoC devicetree updates from Olof Johansson: "As with previous release, this continues to be among the largest branches we merge, with lots of new contents. New things for this release are among other things: - DTSI contents for the new SoCs supported in 3.16 (see SoC pull request) - Qualcomm APQ8064 and APQ8084 SoCs and eval boards - Nvidia Jetson TK1 development board (Tegra T124-based) Two new SoCs that didn't need enough new platform code to stand out enough for me to notice when writing the SoC tag, but that adds new DT contents are: - TI DRA72 - Marvell Berlin 2Q" * tag 'dt-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (500 commits) ARM: dts: add secure firmware support for exynos5420-arndale-octa ARM: dts: add pmu sysreg node to exynos3250 ARM: dts: correct the usb phy node in exynos5800-peach-pi ARM: dts: correct the usb phy node in exynos5420-peach-pit ARM: dts: add dts files for exynos5410 and exynos5410-smdk5410 ARM: dts: add dts files for exynos3250 SoC ARM: dts: add mfc node for exynos5800 ARM: dts: add Vbus regulator for USB 3.0 on exynos5800-peach-pi ARM: dts: enable fimd for exynos5800-peach-pi ARM: dts: enable display controller for exynos5800-peach-pi ARM: dts: enable hdmi for exynos5800-peach-pi ARM: dts: add dts file for exynos5800-peach-pi board ARM: dts: add dts file for exynos5800 SoC ARM: dts: add dts file for exynos5260-xyref5260 board ARM: dts: add dts files for exynos5260 SoC ARM: dts: update watchdog node name in exynos5440 ARM: dts: use key code macros on Origen and Arndale boards ARM: dts: enable RTC and WDT nodes on Origen boards ARM: dts: qcom: Add APQ8084-MTP board support ARM: dts: qcom: Add APQ8084 SoC support ...
Diffstat (limited to 'arch/arm/mach-at91')
-rw-r--r--arch/arm/mach-at91/Kconfig2
-rw-r--r--arch/arm/mach-at91/at91sam9n12.c6
-rw-r--r--arch/arm/mach-at91/at91sam9x5.c6
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
generated by cgit v1.2.2 (git 2.25.0) at 2025-03-19 19:47:04 -0400