diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-mx5/clock-mx51-mx53.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-mx5/cpu.c | 23 | ||||
-rw-r--r-- | arch/arm/plat-mxc/include/mach/common.h | 1 | ||||
-rw-r--r-- | arch/arm/plat-mxc/include/mach/mx53.h | 13 |
4 files changed, 25 insertions, 13 deletions
diff --git a/arch/arm/mach-mx5/clock-mx51-mx53.c b/arch/arm/mach-mx5/clock-mx51-mx53.c index fdbc05ed5513..6b89c1bf4eb2 100644 --- a/arch/arm/mach-mx5/clock-mx51-mx53.c +++ b/arch/arm/mach-mx5/clock-mx51-mx53.c | |||
@@ -1563,6 +1563,7 @@ int __init mx53_clocks_init(unsigned long ckil, unsigned long osc, | |||
1563 | clk_enable(&iim_clk); | 1563 | clk_enable(&iim_clk); |
1564 | mx53_revision(); | 1564 | mx53_revision(); |
1565 | clk_disable(&iim_clk); | 1565 | clk_disable(&iim_clk); |
1566 | mx53_display_revision(); | ||
1566 | 1567 | ||
1567 | /* Set SDHC parents to be PLL2 */ | 1568 | /* Set SDHC parents to be PLL2 */ |
1568 | clk_set_parent(&esdhc1_clk, &pll2_sw_clk); | 1569 | clk_set_parent(&esdhc1_clk, &pll2_sw_clk); |
diff --git a/arch/arm/mach-mx5/cpu.c b/arch/arm/mach-mx5/cpu.c index 472bdfab2e55..86f87da59c64 100644 --- a/arch/arm/mach-mx5/cpu.c +++ b/arch/arm/mach-mx5/cpu.c | |||
@@ -166,6 +166,29 @@ int mx50_revision(void) | |||
166 | } | 166 | } |
167 | EXPORT_SYMBOL(mx50_revision); | 167 | EXPORT_SYMBOL(mx50_revision); |
168 | 168 | ||
169 | void mx53_display_revision(void) | ||
170 | { | ||
171 | int rev; | ||
172 | char *srev; | ||
173 | rev = mx53_revision(); | ||
174 | |||
175 | switch (rev) { | ||
176 | case IMX_CHIP_REVISION_1_0: | ||
177 | srev = IMX_CHIP_REVISION_1_0_STRING; | ||
178 | break; | ||
179 | case IMX_CHIP_REVISION_2_0: | ||
180 | srev = IMX_CHIP_REVISION_2_0_STRING; | ||
181 | break; | ||
182 | case IMX_CHIP_REVISION_2_1: | ||
183 | srev = IMX_CHIP_REVISION_2_1_STRING; | ||
184 | break; | ||
185 | default: | ||
186 | srev = IMX_CHIP_REVISION_UNKNOWN_STRING; | ||
187 | } | ||
188 | printk(KERN_INFO "CPU identified as i.MX53, silicon rev %s\n", srev); | ||
189 | } | ||
190 | EXPORT_SYMBOL(mx53_display_revision); | ||
191 | |||
169 | static int __init post_cpu_init(void) | 192 | static int __init post_cpu_init(void) |
170 | { | 193 | { |
171 | unsigned int reg; | 194 | unsigned int reg; |
diff --git a/arch/arm/plat-mxc/include/mach/common.h b/arch/arm/plat-mxc/include/mach/common.h index a22ebe11a602..bfa1ffca5d79 100644 --- a/arch/arm/plat-mxc/include/mach/common.h +++ b/arch/arm/plat-mxc/include/mach/common.h | |||
@@ -68,4 +68,5 @@ extern void mxc91231_arch_reset(int, const char *); | |||
68 | extern void mxc91231_prepare_idle(void); | 68 | extern void mxc91231_prepare_idle(void); |
69 | extern void mx51_efikamx_reset(void); | 69 | extern void mx51_efikamx_reset(void); |
70 | extern int mx53_revision(void); | 70 | extern int mx53_revision(void); |
71 | extern int mx53_display_revision(void); | ||
71 | #endif | 72 | #endif |
diff --git a/arch/arm/plat-mxc/include/mach/mx53.h b/arch/arm/plat-mxc/include/mach/mx53.h index ace17864575e..9d2a1ef84de2 100644 --- a/arch/arm/plat-mxc/include/mach/mx53.h +++ b/arch/arm/plat-mxc/include/mach/mx53.h | |||
@@ -337,17 +337,4 @@ | |||
337 | #define MX53_INT_GPIO7_LOW 107 | 337 | #define MX53_INT_GPIO7_LOW 107 |
338 | #define MX53_INT_GPIO7_HIGH 108 | 338 | #define MX53_INT_GPIO7_HIGH 108 |
339 | 339 | ||
340 | /* silicon revisions specific to i.MX53 */ | ||
341 | #define MX53_CHIP_REV_1_0 0x10 | ||
342 | #define MX53_CHIP_REV_1_1 0x11 | ||
343 | #define MX53_CHIP_REV_1_2 0x12 | ||
344 | #define MX53_CHIP_REV_1_3 0x13 | ||
345 | #define MX53_CHIP_REV_2_0 0x20 | ||
346 | #define MX53_CHIP_REV_2_1 0x21 | ||
347 | #define MX53_CHIP_REV_2_2 0x22 | ||
348 | #define MX53_CHIP_REV_2_3 0x23 | ||
349 | #define MX53_CHIP_REV_3_0 0x30 | ||
350 | #define MX53_CHIP_REV_3_1 0x31 | ||
351 | #define MX53_CHIP_REV_3_2 0x32 | ||
352 | |||
353 | #endif /* ifndef __MACH_MX53_H__ */ | 340 | #endif /* ifndef __MACH_MX53_H__ */ |