Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 166060
b: refs/heads/master
c: 4646dd2
h: refs/heads/master
v: v3
  • Loading branch information
Haojian Zhuang authored and Eric Miao committed Sep 10, 2009
1 parent 7cd535f commit 05d0237
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 337c1db645bce3f5a832129c4a803dc157ac7e9a
refs/heads/master: 4646dd2795e793f97b7fd40206567bf72e6cdf21
5 changes: 5 additions & 0 deletions trunk/arch/arm/mach-pxa/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,11 @@ config CPU_PXA930

config CPU_PXA935
bool "PXA935 (codename Tavor-P65)"
select CPU_PXA930

config CPU_PXA950
bool "PXA950 (codename Tavor-PV2)"
select CPU_PXA930

endmenu

Expand Down
17 changes: 17 additions & 0 deletions trunk/arch/arm/mach-pxa/include/mach/hardware.h
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,16 @@
#define __cpu_is_pxa935(id) (0)
#endif

#ifdef CONFIG_CPU_PXA950
#define __cpu_is_pxa950(id) \
({ \
unsigned int _id = (id) >> 4 & 0xfff; \
id == 0x697; \
})
#else
#define __cpu_is_pxa950(id) (0)
#endif

#define cpu_is_pxa210() \
({ \
__cpu_is_pxa210(read_cpuid_id()); \
Expand Down Expand Up @@ -249,6 +259,13 @@
__cpu_is_pxa935(id); \
})

#define cpu_is_pxa950() \
({ \
unsigned int id = read_cpuid(CPUID_ID); \
__cpu_is_pxa950(id); \
})


/*
* CPUID Core Generation Bit
* <= 0x2 for pxa21x/pxa25x/pxa26x/pxa27x
Expand Down

0 comments on commit 05d0237

Please sign in to comment.