sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

Merge branch 'for-next/at91'

This commit is contained in:
Sascha Hauer 2013-08-05 12:49:31 +02:00
parent e6c24f1e20 5956bd4b99
commit 9562f2f82e
52 changed files with 174 additions and 162 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
arch/arm/Makefile
View File

@ -81,38 +81,13 @@ machine-$(CONFIG_ARCH_ZYNQ) := zynq
# arch/arm/boards/Makefile aswell.
board-$(CONFIG_MACH_A9M2410) += a9m2410
board-$(CONFIG_MACH_A9M2440) += a9m2440
board-$(CONFIG_MACH_ANIMEO_IP) += animeo_ip
board-$(CONFIG_MACH_AT91RM9200EK) += at91rm9200ek
board-$(CONFIG_MACH_AT91SAM9260EK) += at91sam9260ek
board-$(CONFIG_MACH_AT91SAM9261EK) += at91sam9261ek
board-$(CONFIG_MACH_AT91SAM9263EK) += at91sam9263ek
board-$(CONFIG_MACH_AT91SAM9G10EK) += at91sam9261ek
board-$(CONFIG_MACH_AT91SAM9G20EK) += at91sam9260ek
board-$(CONFIG_MACH_AT91SAM9M10G45EK) += at91sam9m10g45ek
board-$(CONFIG_MACH_AT91SAM9M10IHD) += at91sam9m10ihd
board-$(CONFIG_MACH_AT91SAM9N12EK) += at91sam9n12ek
board-$(CONFIG_MACH_AT91SAM9X5EK) += at91sam9x5ek
board-$(CONFIG_MACH_DSS11) += dss11
board-$(CONFIG_MACH_GE863) += telit-evk-pro3
board-$(CONFIG_MACH_MINI2440) += friendlyarm-mini2440
board-$(CONFIG_MACH_MINI6410) += friendlyarm-mini6410
board-$(CONFIG_MACH_MMCCPU) += mmccpu
board-$(CONFIG_MACH_PCM027) += pcm027
board-$(CONFIG_MACH_PM9261) += pm9261
board-$(CONFIG_MACH_PM9263) += pm9263
board-$(CONFIG_MACH_PM9G45) += pm9g45
board-$(CONFIG_MACH_QIL_A9260) += qil-a926x
board-$(CONFIG_MACH_QIL_A9G20) += qil-a926x
board-$(CONFIG_MACH_SAMA5D3XEK) += sama5d3xek
board-$(CONFIG_MACH_SOLIDRUN_CUBOX) += solidrun-cubox
board-$(CONFIG_MACH_TINY210) += friendlyarm-tiny210
board-$(CONFIG_MACH_TINY6410) += friendlyarm-tiny6410
board-$(CONFIG_MACH_TNY_A9260) += tny-a926x
board-$(CONFIG_MACH_TNY_A9263) += tny-a926x
board-$(CONFIG_MACH_TNY_A9G20) += tny-a926x
board-$(CONFIG_MACH_USB_A9260) += usb-a926x
board-$(CONFIG_MACH_USB_A9263) += usb-a926x
board-$(CONFIG_MACH_USB_A9G20) += usb-a926x
machdirs := $(patsubst %,arch/arm/mach-%/,$(machine-y))

25
arch/arm/boards/Makefile
View File

@ -1,11 +1,22 @@
# keep sorted by CONFIG_* macro name.
obj-$(CONFIG_MACH_ANIMEO_IP) += animeo_ip/
obj-$(CONFIG_MACH_ARCHOSG9) += archosg9/
obj-$(CONFIG_MACH_AT91SAM9260EK) += at91sam9260ek/
obj-$(CONFIG_MACH_AT91SAM9261EK) += at91sam9261ek/
obj-$(CONFIG_MACH_AT91SAM9263EK) += at91sam9263ek/
obj-$(CONFIG_MACH_AT91SAM9G10EK) += at91sam9261ek/
obj-$(CONFIG_MACH_AT91SAM9G20EK) += at91sam9260ek/
obj-$(CONFIG_MACH_AT91SAM9M10G45EK) += at91sam9m10g45ek/
obj-$(CONFIG_MACH_AT91SAM9M10IHD) += at91sam9m10ihd/
obj-$(CONFIG_MACH_AT91SAM9N12EK) += at91sam9n12ek/
obj-$(CONFIG_MACH_AT91SAM9X5EK) += at91sam9x5ek/
obj-$(CONFIG_MACH_BEAGLE) += beagle/
obj-$(CONFIG_MACH_BEAGLEBONE) += beaglebone/
obj-$(CONFIG_MACH_CCMX51) += ccxmx51/
obj-$(CONFIG_MACH_CFA10036) += crystalfontz-cfa10036/
obj-$(CONFIG_MACH_CHUMBY) += chumby_falconwing/
obj-$(CONFIG_MACH_CLEP7212) += clep7212/
obj-$(CONFIG_MACH_DSS11) += dss11/
obj-$(CONFIG_MACH_EDB93012) += edb93xx/
obj-$(CONFIG_MACH_EDB9301) += edb93xx/
obj-$(CONFIG_MACH_EDB9302A) += edb93xx/
@ -24,6 +35,7 @@ obj-$(CONFIG_MACH_FREESCALE_MX35_3STACK) += freescale-mx35-3-stack/
obj-$(CONFIG_MACH_FREESCALE_MX51_PDK) += freescale-mx51-pdk/
obj-$(CONFIG_MACH_FREESCALE_MX53_LOCO) += freescale-mx53-loco/
obj-$(CONFIG_MACH_FREESCALE_MX53_SMD) += freescale-mx53-smd/
obj-$(CONFIG_MACH_GE863) += telit-evk-pro3/
obj-$(CONFIG_MACH_GLOBALSCALE_GURUPLUG) += globalscale-guruplug/
obj-$(CONFIG_MACH_GLOBALSCALE_MIRABOX) += globalscale-mirabox/
obj-$(CONFIG_MACH_GUF_CUPID) += guf-cupid/
@ -34,6 +46,7 @@ obj-$(CONFIG_MACH_IMX233_OLINUXINO) += imx233-olinuxino/
obj-$(CONFIG_MACH_IMX27ADS) += imx27ads/
obj-$(CONFIG_MACH_MARVELL_ARMADA_XP_GP) += marvell-armada-xp-gp/
obj-$(CONFIG_MACH_MIOA701) += mioa701/
obj-$(CONFIG_MACH_MMCCPU) += mmccpu/
obj-$(CONFIG_MACH_MX23EVK) += freescale-mx23-evk/
obj-$(CONFIG_MACH_MX28EVK) += freescale-mx28-evk/
obj-$(CONFIG_MACH_MX6Q_ARM2) += freescale-mx6-arm2/
@ -52,17 +65,29 @@ obj-$(CONFIG_MACH_PCM043) += pcm043/
obj-$(CONFIG_MACH_PCM049) += pcm049/
obj-$(CONFIG_MACH_PCM051) += pcm051/
obj-$(CONFIG_MACH_PLATHOME_OPENBLOCKS_AX3) += plathome-openblocks-ax3/
obj-$(CONFIG_MACH_PM9261) += pm9261/
obj-$(CONFIG_MACH_PM9263) += pm9263/
obj-$(CONFIG_MACH_PM9G45) += pm9g45/
obj-$(CONFIG_MACH_QIL_A9260) += qil-a926x/
obj-$(CONFIG_MACH_QIL_A9G20) += qil-a926x/
obj-$(CONFIG_MACH_REALQ7) += dmo-mx6-realq7/
obj-$(CONFIG_MACH_RPI) += raspberry-pi/
obj-$(CONFIG_MACH_SABRELITE) += freescale-mx6-sabrelite/
obj-$(CONFIG_MACH_SABRESD) += freescale-mx6-sabresd/
obj-$(CONFIG_MACH_SAMA5D3XEK) += sama5d3xek/
obj-$(CONFIG_MACH_SCB9328) += scb9328/
obj-$(CONFIG_MACH_TNY_A9260) += tny-a926x/
obj-$(CONFIG_MACH_TNY_A9263) += tny-a926x/
obj-$(CONFIG_MACH_TNY_A9G20) += tny-a926x/
obj-$(CONFIG_MACH_TOSHIBA_AC100) += toshiba-ac100/
obj-$(CONFIG_MACH_TQMA53) += tqma53/
obj-$(CONFIG_MACH_TX25) += karo-tx25/
obj-$(CONFIG_MACH_TX28) += karo-tx28/
obj-$(CONFIG_MACH_TX51) += karo-tx51/
obj-$(CONFIG_MACH_TX53) += karo-tx53/
obj-$(CONFIG_MACH_USB_A9260) += usb-a926x/
obj-$(CONFIG_MACH_USB_A9263) += usb-a926x/
obj-$(CONFIG_MACH_USB_A9G20) += usb-a926x/
obj-$(CONFIG_MACH_VERSATILEPB) += versatile/
obj-$(CONFIG_MACH_VEXPRESS) += vexpress/
obj-$(CONFIG_MACH_ZEDBOARD) += avnet-zedboard/

6
arch/arm/boards/animeo_ip/config.h
View File

@ -1,6 +0,0 @@
#ifndef __CONFIG_H
#define __CONFIG_H
#define AT91_MAIN_CLOCK 18432000 /* 18.432 MHz crystal */
#endif /* __CONFIG_H */

7
arch/arm/boards/animeo_ip/init.c
View File

@ -249,3 +249,10 @@ static int animeo_ip_console_init(void)
return 0;
}
console_initcall(animeo_ip_console_init);
static int animeo_ip_main_clock(void)
{
at91_set_main_clock(18432000);
return 0;
}
pure_initcall(animeo_ip_main_clock);

2
arch/arm/boards/at91rm9200ek/config.h
View File

@ -1,8 +1,6 @@
#ifndef __CONFIG_H
#define __CONFIG_H
#define AT91_MAIN_CLOCK 18432000 /* 18.432 MHz crystal */
#define MASTER_PLL_MUL 39
#define MASTER_PLL_DIV 4

7
arch/arm/boards/at91rm9200ek/init.c
View File

@ -187,3 +187,10 @@ static int at91rm9200ek_console_init(void)
return 0;
}
console_initcall(at91rm9200ek_console_init);
static int at91rm9200ek_main_clock(void)
{
at91_set_main_clock(18432000);
return 0;
}
pure_initcall(at91rm9200ek_main_clock);

6
arch/arm/boards/at91sam9260ek/config.h
View File

@ -1,6 +0,0 @@
#ifndef __CONFIG_H
#define __CONFIG_H
#define AT91_MAIN_CLOCK 18432000 /* 18.432 MHz crystal */
#endif /* __CONFIG_H */

7
arch/arm/boards/at91sam9260ek/init.c
View File

@ -269,3 +269,10 @@ static int at91sam9260ek_console_init(void)
return 0;
}
console_initcall(at91sam9260ek_console_init);
static int at91sam9260ek_main_clock(void)
{
at91_set_main_clock(18432000);
return 0;
}
pure_initcall(at91sam9260ek_main_clock);

6
arch/arm/boards/at91sam9261ek/config.h
View File

@ -1,6 +0,0 @@
#ifndef __CONFIG_H
#define __CONFIG_H
#define AT91_MAIN_CLOCK 18432000 /* 18.432 MHz crystal */
#endif /* __CONFIG_H */

7
arch/arm/boards/at91sam9261ek/init.c
View File

@ -406,3 +406,10 @@ static int at91sam9261ek_console_init(void)
}
console_initcall(at91sam9261ek_console_init);
static int at91sam9261ek_main_clock(void)
{
at91_set_main_clock(18432000);
return 0;
}
pure_initcall(at91sam9261ek_main_clock);

6
arch/arm/boards/at91sam9263ek/config.h
View File

@ -1,6 +0,0 @@
#ifndef __CONFIG_H
#define __CONFIG_H
#define AT91_MAIN_CLOCK 16367660 /* 16.367 MHz crystal */
#endif /* __CONFIG_H */

7
arch/arm/boards/at91sam9263ek/init.c
View File

@ -284,3 +284,10 @@ static int at91sam9263ek_console_init(void)
}
console_initcall(at91sam9263ek_console_init);
static int at91sam9263ek_main_clock(void)
{
at91_set_main_clock(16367660);
return 0;
}
pure_initcall(at91sam9263ek_main_clock);

6
arch/arm/boards/at91sam9m10g45ek/config.h
View File

@ -1,6 +0,0 @@
#ifndef __CONFIG_H
#define __CONFIG_H
#define AT91_MAIN_CLOCK 12000000 /* from 12 MHz crystal */
#endif /* __CONFIG_H */

7
arch/arm/boards/at91sam9m10g45ek/init.c
View File

@ -329,3 +329,10 @@ static int at91sam9m10g45ek_console_init(void)
return 0;
}
console_initcall(at91sam9m10g45ek_console_init);
static int at91sam9m10g45ek_main_clock(void)
{
at91_set_main_clock(12000000);
return 0;
}
pure_initcall(at91sam9m10g45ek_main_clock);

6
arch/arm/boards/at91sam9m10ihd/config.h
View File

@ -1,6 +0,0 @@
#ifndef __CONFIG_H
#define __CONFIG_H
#define AT91_MAIN_CLOCK 12000000 /* from 12 MHz crystal */
#endif /* __CONFIG_H */

7
arch/arm/boards/at91sam9m10ihd/init.c
View File

@ -286,3 +286,10 @@ static int at91sam9m10ihd_console_init(void)
return 0;
}
console_initcall(at91sam9m10ihd_console_init);
static int at91sam9m10ihd_main_clock(void)
{
at91_set_main_clock(12000000);
return 0;
}
pure_initcall(at91sam9m10ihd_main_clock);

6
arch/arm/boards/at91sam9n12ek/config.h
View File

@ -1,6 +0,0 @@
#ifndef __CONFIG_H
#define __CONFIG_H
#define AT91_MAIN_CLOCK 16000000 /* 16 MHz crystal */
#endif /* __CONFIG_H */

7
arch/arm/boards/at91sam9n12ek/init.c
View File

@ -337,3 +337,10 @@ static int at91sam9n12ek_console_init(void)
return 0;
}
console_initcall(at91sam9n12ek_console_init);
static int at91sam9n12ek_main_clock(void)
{
at91_set_main_clock(16000000);
return 0;
}
pure_initcall(at91sam9n12ek_main_clock);

6
arch/arm/boards/at91sam9x5ek/config.h
View File

@ -1,6 +0,0 @@
#ifndef __CONFIG_H
#define __CONFIG_H
#define AT91_MAIN_CLOCK 12000000 /* 12 MHz crystal */
#endif /* __CONFIG_H */

7
arch/arm/boards/at91sam9x5ek/init.c
View File

@ -331,3 +331,10 @@ static int at91sam9x5ek_console_init(void)
return 0;
}
console_initcall(at91sam9x5ek_console_init);
static int at91sam9x5ek_main_clock(void)
{
at91_set_main_clock(12000000);
return 0;
}
pure_initcall(at91sam9x5ek_main_clock);

6
arch/arm/boards/dss11/config.h
View File

@ -1,6 +0,0 @@
#ifndef __CONFIG_H
#define __CONFIG_H
#define AT91_MAIN_CLOCK 18432000 /* 18.432 MHz crystal */
#endif /* __CONFIG_H */

7
arch/arm/boards/dss11/init.c
View File

@ -158,3 +158,10 @@ static int dss11_console_init(void)
return 0;
}
console_initcall(dss11_console_init);
static int dss11_main_clock(void)
{
at91_set_main_clock(18432000);
return 0;
}
pure_initcall(dss11_main_clock);

6
arch/arm/boards/mmccpu/config.h
View File

@ -1,6 +0,0 @@
#ifndef __CONFIG_H
#define __CONFIG_H
#define AT91_MAIN_CLOCK 18432000
#endif /* __CONFIG_H */

7
arch/arm/boards/mmccpu/init.c
View File

@ -77,3 +77,10 @@ static int mmccpu_console_init(void)
}
console_initcall(mmccpu_console_init);
static int mmccpu_main_clock(void)
{
at91_set_main_clock(18432000);
return 0;
}
pure_initcall(mmccpu_main_clock);

6
arch/arm/boards/pm9261/config.h
View File

@ -1,6 +0,0 @@
#ifndef __CONFIG_H
#define __CONFIG_H
#define AT91_MAIN_CLOCK 18432000 /* 18.432 MHz crystal */
#endif /* __CONFIG_H */

7
arch/arm/boards/pm9261/init.c
View File

@ -161,3 +161,10 @@ static int pm9261_console_init(void)
return 0;
}
console_initcall(pm9261_console_init);
static int pm9261_main_clock(void)
{
at91_set_main_clock(18432000);
return 0;
}
pure_initcall(pm9261_main_clock);

6
arch/arm/boards/pm9263/config.h
View File

@ -1,6 +0,0 @@
#ifndef __CONFIG_H
#define __CONFIG_H
#define AT91_MAIN_CLOCK 18432000
#endif /* __CONFIG_H */

7
arch/arm/boards/pm9263/init.c
View File

@ -146,3 +146,10 @@ static int pm9263_console_init(void)
}
console_initcall(pm9263_console_init);
static int pm9263_main_clock(void)
{
at91_set_main_clock(18432000);
return 0;
}
pure_initcall(pm9263_main_clock);

6
arch/arm/boards/pm9g45/config.h
View File

@ -1,6 +0,0 @@
#ifndef __CONFIG_H
#define __CONFIG_H
#define AT91_MAIN_CLOCK 12000000 /* from 12 MHz crystal */
#endif /* __CONFIG_H */

7
arch/arm/boards/pm9g45/init.c
View File

@ -173,3 +173,10 @@ static int pm9g45_console_init(void)
return 0;
}
console_initcall(pm9g45_console_init);
static int pm9g45_main_clock(void)
{
at91_set_main_clock(12000000);
return 0;
}
pure_initcall(pm9g45_main_clock);

6
arch/arm/boards/qil-a926x/config.h
View File

@ -1,6 +0,0 @@
#ifndef __CONFIG_H
#define __CONFIG_H
#define AT91_MAIN_CLOCK 12000000 /* 12 MHz crystal */
#endif /* __CONFIG_H */

7
arch/arm/boards/qil-a926x/init.c
View File

@ -238,3 +238,10 @@ static int qil_a9260_console_init(void)
}
console_initcall(qil_a9260_console_init);
#endif
static int qil_a9260_main_clock(void)
{
at91_set_main_clock(12000000);
return 0;
}
pure_initcall(qil_a9260_main_clock);

6
arch/arm/boards/sama5d3xek/config.h
View File

@ -1,6 +0,0 @@
#ifndef __CONFIG_H
#define __CONFIG_H
#define AT91_MAIN_CLOCK 12000000 /* 12 MHz crystal */
#endif /* __CONFIG_H */

7
arch/arm/boards/sama5d3xek/init.c
View File

@ -432,3 +432,10 @@ static int at91sama5d3xek_console_init(void)
return 0;
}
console_initcall(at91sama5d3xek_console_init);
static int at91sama5d3xek_main_clock(void)
{
at91_set_main_clock(12000000);
return 0;
}
pure_initcall(at91sama5d3xek_main_clock);

6
arch/arm/boards/telit-evk-pro3/config.h
View File

@ -1,6 +0,0 @@
#ifndef __CONFIG_H
#define __CONFIG_H
#define AT91_MAIN_CLOCK 6000000 /* 6.000 MHz crystal */
#endif /* __CONFIG_H */

7
arch/arm/boards/telit-evk-pro3/init.c
View File

@ -174,3 +174,10 @@ static int evk_console_init(void)
return 0;
}
console_initcall(evk_console_init);
static int evk_main_clock(void)
{
at91_set_main_clock(6000000);
return 0;
}
pure_initcall(evk_main_clock);

6
arch/arm/boards/tny-a926x/config.h
View File

@ -1,6 +0,0 @@
#ifndef __CONFIG_H
#define __CONFIG_H
#define AT91_MAIN_CLOCK 12000000 /* 12 MHz crystal */
#endif /* __CONFIG_H */

7
arch/arm/boards/tny-a926x/init.c
View File

@ -252,3 +252,10 @@ static int tny_a9260_console_init(void)
return 0;
}
console_initcall(tny_a9260_console_init);
static int tny_a9260_main_clock(void)
{
at91_set_main_clock(12000000);
return 0;
}
pure_initcall(tny_a9260_main_clock);

6
arch/arm/boards/usb-a926x/config.h
View File

@ -1,6 +0,0 @@
#ifndef __CONFIG_H
#define __CONFIG_H
#define AT91_MAIN_CLOCK 12000000 /* 12 MHz crystal */
#endif /* __CONFIG_H */

7
arch/arm/boards/usb-a926x/init.c
View File

@ -436,3 +436,10 @@ static int usb_a9260_console_init(void)
}
console_initcall(usb_a9260_console_init);
#endif
static int usb_a9260_main_clock(void)
{
at91_set_main_clock(12000000);
return 0;
}
pure_initcall(usb_a9260_main_clock);

3
arch/arm/mach-at91/at91rm9200.c
View File

@ -225,9 +225,6 @@ static void __init at91rm9200_register_clocks(void)
* -------------------------------------------------------------------- */
static void __init at91rm9200_initialize(void)
{
/* Init clock subsystem */
at91_clock_init(AT91_MAIN_CLOCK);
/* Register the processor-specific clocks */
at91rm9200_register_clocks();

3
arch/arm/mach-at91/at91sam9260.c
View File

@ -224,9 +224,6 @@ static void __init at91sam9260_register_clocks(void)
static void at91sam9260_initialize(void)
{
/* Init clock subsystem */
at91_clock_init(AT91_MAIN_CLOCK);
/* Register the processor-specific clocks */
at91sam9260_register_clocks();

3
arch/arm/mach-at91/at91sam9261.c
View File

@ -216,9 +216,6 @@ static void at91sam9261_register_clocks(void)
static void at91sam9261_initialize(void)
{
/* Init clock subsystem */
at91_clock_init(AT91_MAIN_CLOCK);
/* Register the processor-specific clocks */
at91sam9261_register_clocks();

3
arch/arm/mach-at91/at91sam9263.c
View File

@ -234,9 +234,6 @@ static void __init at91sam9263_register_clocks(void)
static void at91sam9263_initialize(void)
{
/* Init clock subsystem */
at91_clock_init(AT91_MAIN_CLOCK);
/* Register the processor-specific clocks */
at91sam9263_register_clocks();

3
arch/arm/mach-at91/at91sam9g45.c
View File

@ -247,9 +247,6 @@ static void __init at91sam9g45_register_clocks(void)
static void at91sam9g45_initialize(void)
{
/* Init clock subsystem */
at91_clock_init(AT91_MAIN_CLOCK);
/* Register the processor-specific clocks */
at91sam9g45_register_clocks();

3
arch/arm/mach-at91/at91sam9n12.c
View File

@ -207,9 +207,6 @@ static void __init at91sam9n12_register_clocks(void)
static void at91sam9n12_initialize(void)
{
/* Init clock subsystem */
at91_clock_init(AT91_MAIN_CLOCK);
/* Register the processor-specific clocks */
at91sam9n12_register_clocks();

3
arch/arm/mach-at91/at91sam9x5.c
View File

@ -293,9 +293,6 @@ static void __init at91sam9x5_register_clocks(void)
static void at91sam9x5_initialize(void)
{
/* Init clock subsystem */
at91_clock_init(AT91_MAIN_CLOCK);
/* Register the processor-specific clocks */
at91sam9x5_register_clocks();

11
arch/arm/mach-at91/clock.c
View File

@ -616,13 +616,20 @@ static void at91_upll_usbfs_clock_init(unsigned long main_clock)
static int pll_overclock = 0;
static u32 cpu_freq = 0;
static unsigned long at91_main_clock = 0;
int at91_clock_init(unsigned long main_clock)
void at91_set_main_clock(unsigned long rate)
{
at91_main_clock = rate;
}
int at91_clock_init(void)
{
unsigned tmp, freq, mckr;
int i;
unsigned long main_clock;
main_clock = at91_main_clock;
/*
* When the bootloader initialized the main oscillator correctly,

2
arch/arm/mach-at91/generic.h
View File

@ -9,7 +9,7 @@
*/
/* Clocks */
extern int __init at91_clock_init(unsigned long main_clock);
extern int __init at91_clock_init(void);
static inline struct device_d *at91_add_rm9200_gpio(int id, resource_size_t start)
{

2
arch/arm/mach-at91/include/mach/board.h
View File

@ -30,6 +30,8 @@
#include <linux/phy.h>
#include <platform_data/macb.h>
void at91_set_main_clock(unsigned long rate);
/* USB Host */
struct at91_usbh_data {
u8 ports; /* number of ports on root hub */

3
arch/arm/mach-at91/sama5d3.c
View File

@ -375,9 +375,6 @@ static void __init sama5d3_register_clocks(void)
static void sama5d3_initialize(void)
{
/* Init clock subsystem */
at91_clock_init(AT91_MAIN_CLOCK);
/* Register the processor-specific clocks */
sama5d3_register_clocks();

4
arch/arm/mach-at91/setup.c
View File

@ -14,6 +14,7 @@
#include <mach/at91_dbgu.h>
#include "soc.h"
#include "generic.h"
struct at91_init_soc __initdata at91_boot_soc;
@ -233,6 +234,9 @@ static int at91_detect(void)
if (!at91_soc_is_enabled())
panic("AT91: Soc not enabled");
/* Init clock subsystem */
at91_clock_init();
if (at91_boot_soc.init)
at91_boot_soc.init();