projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'firewire-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee139...
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm
/
mach-omap2
/
id.c
diff --git
a/arch/arm/mach-omap2/id.c
b/arch/arm/mach-omap2/id.c
index 2fb17caa86834ce7f2bc3df26a4fba15b3387a36..0f4c18e6e60c686b0a82528aba55889d89586200 100644
(file)
--- a/
arch/arm/mach-omap2/id.c
+++ b/
arch/arm/mach-omap2/id.c
@@
-314,7
+314,7
@@
void __init omap3xxx_check_revision(void)
* If the processor type is Cortex-A8 and the revision is 0x0
* it means its Cortex r0p0 which is 3430 ES1.0.
*/
* If the processor type is Cortex-A8 and the revision is 0x0
* it means its Cortex r0p0 which is 3430 ES1.0.
*/
- cpuid = read_cpuid
(CPUID_ID
);
+ cpuid = read_cpuid
_id(
);
if ((((cpuid >> 4) & 0xfff) == 0xc08) && ((cpuid & 0xf) == 0x0)) {
omap_revision = OMAP3430_REV_ES1_0;
cpu_rev = "1.0";
if ((((cpuid >> 4) & 0xfff) == 0xc08) && ((cpuid & 0xf) == 0x0)) {
omap_revision = OMAP3430_REV_ES1_0;
cpu_rev = "1.0";
@@
-475,7
+475,7
@@
void __init omap4xxx_check_revision(void)
* Use ARM register to detect the correct ES version
*/
if (!rev && (hawkeye != 0xb94e) && (hawkeye != 0xb975)) {
* Use ARM register to detect the correct ES version
*/
if (!rev && (hawkeye != 0xb94e) && (hawkeye != 0xb975)) {
- idcode = read_cpuid
(CPUID_ID
);
+ idcode = read_cpuid
_id(
);
rev = (idcode & 0xf) - 1;
}
rev = (idcode & 0xf) - 1;
}