diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-06-17 11:11:26 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-06-18 09:02:08 +0200 |
| commit | 6ce708895cd141a428aab34c2615e22756fb82e5 (patch) | |
| tree | 5624e2c05a0b2e4c119fd338210b0c998e80900b /arch/arm/mach-imx | |
| parent | dac1ff16bcc0491076e120620bec0f03a943c28b (diff) | |
| download | barebox-6ce708895cd141a428aab34c2615e22756fb82e5.tar.gz barebox-6ce708895cd141a428aab34c2615e22756fb82e5.tar.xz | |
ARM: i.MX51: Make imx51_init_lowlevel callable from early init
imx_silicon_revision() can't be used from early init context, so
use imx51_silicon_revision() instead.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-imx')
| -rw-r--r-- | arch/arm/mach-imx/Makefile | 1 | ||||
| -rw-r--r-- | arch/arm/mach-imx/imx51.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile index 72125e775b..db74d4e51a 100644 --- a/arch/arm/mach-imx/Makefile +++ b/arch/arm/mach-imx/Makefile @@ -6,6 +6,7 @@ obj-$(CONFIG_ARCH_IMX27) += imx27.o clk-imx27.o obj-$(CONFIG_ARCH_IMX31) += imx31.o clk-imx31.o obj-$(CONFIG_ARCH_IMX35) += imx35.o clk-imx35.o obj-$(CONFIG_ARCH_IMX51) += imx51.o imx5.o clk-imx5.o +pbl-$(CONFIG_ARCH_IMX51) += imx51.o imx5.o obj-$(CONFIG_ARCH_IMX53) += imx53.o imx5.o clk-imx5.o esdctl-v4.o pbl-$(CONFIG_ARCH_IMX53) += imx53.o imx5.o esdctl-v4.o obj-$(CONFIG_ARCH_IMX6) += imx6.o usb-imx6.o clk-imx6.o diff --git a/arch/arm/mach-imx/imx51.c b/arch/arm/mach-imx/imx51.c index c9f88f541e..c75534e893 100644 --- a/arch/arm/mach-imx/imx51.c +++ b/arch/arm/mach-imx/imx51.c @@ -137,7 +137,7 @@ void imx51_init_lowlevel(unsigned int cpufreq_mhz) { void __iomem *ccm = (void __iomem *)MX51_CCM_BASE_ADDR; u32 r; - int rev = imx_silicon_revision(); + int rev = imx51_silicon_revision(); imx5_init_lowlevel(); |