Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linux-davinci
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
linux
linux-davinci
Commits
eef30449
Commit
eef30449
authored
Nov 05, 2009
by
Russell King
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'fix' of
git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
parents
91d3f9ba
c482ae4d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
37 additions
and
21 deletions
+37
-21
arch/arm/mach-pxa/irq.c
arch/arm/mach-pxa/irq.c
+10
-1
arch/arm/mach-pxa/palmtc.c
arch/arm/mach-pxa/palmtc.c
+4
-4
arch/arm/mach-pxa/spitz.c
arch/arm/mach-pxa/spitz.c
+23
-16
No files found.
arch/arm/mach-pxa/irq.c
View file @
eef30449
...
...
@@ -25,6 +25,8 @@
#include "generic.h"
#define MAX_INTERNAL_IRQS 128
#define IRQ_BIT(n) (((n) - PXA_IRQ(0)) & 0x1f)
#define _ICMR(n) (*((((n) - PXA_IRQ(0)) & ~0x1f) ? &ICMR2 : &ICMR))
#define _ICLR(n) (*((((n) - PXA_IRQ(0)) & ~0x1f) ? &ICLR2 : &ICLR))
...
...
@@ -122,6 +124,8 @@ void __init pxa_init_irq(int irq_nr, set_wake_t fn)
{
int
irq
,
i
;
BUG_ON
(
irq_nr
>
MAX_INTERNAL_IRQS
);
pxa_internal_irq_nr
=
irq_nr
;
for
(
irq
=
PXA_IRQ
(
0
);
irq
<
PXA_IRQ
(
irq_nr
);
irq
+=
32
)
{
...
...
@@ -149,7 +153,8 @@ void __init pxa_init_irq(int irq_nr, set_wake_t fn)
}
#ifdef CONFIG_PM
static
unsigned
long
saved_icmr
[
2
];
static
unsigned
long
saved_icmr
[
MAX_INTERNAL_IRQS
/
32
];
static
unsigned
long
saved_ipr
[
MAX_INTERNAL_IRQS
];
static
int
pxa_irq_suspend
(
struct
sys_device
*
dev
,
pm_message_t
state
)
{
...
...
@@ -159,6 +164,8 @@ static int pxa_irq_suspend(struct sys_device *dev, pm_message_t state)
saved_icmr
[
i
]
=
_ICMR
(
irq
);
_ICMR
(
irq
)
=
0
;
}
for
(
i
=
0
;
i
<
pxa_internal_irq_nr
;
i
++
)
saved_ipr
[
i
]
=
IPR
(
i
);
return
0
;
}
...
...
@@ -171,6 +178,8 @@ static int pxa_irq_resume(struct sys_device *dev)
_ICMR
(
irq
)
=
saved_icmr
[
i
];
_ICLR
(
irq
)
=
0
;
}
for
(
i
=
0
;
i
<
pxa_internal_irq_nr
;
i
++
)
IPR
(
i
)
=
saved_ipr
[
i
];
ICCR
=
1
;
return
0
;
...
...
arch/arm/mach-pxa/palmtc.c
View file @
eef30449
...
...
@@ -292,10 +292,10 @@ const static unsigned int palmtc_keypad_col_gpios[] = {
static
struct
matrix_keypad_platform_data
palmtc_keypad_platform_data
=
{
.
keymap_data
=
&
palmtc_keymap_data
,
.
col
_gpios
=
palmtc_keypad_row_gpios
,
.
num_
col_gpios
=
12
,
.
row
_gpios
=
palmtc_keypad_col_gpios
,
.
num_
row_gpios
=
4
,
.
row
_gpios
=
palmtc_keypad_row_gpios
,
.
num_
row_gpios
=
ARRAY_SIZE
(
palmtc_keypad_row_gpios
)
,
.
col
_gpios
=
palmtc_keypad_col_gpios
,
.
num_
col_gpios
=
ARRAY_SIZE
(
palmtc_keypad_col_gpios
)
,
.
active_low
=
1
,
.
debounce_ms
=
20
,
...
...
arch/arm/mach-pxa/spitz.c
View file @
eef30449
...
...
@@ -779,11 +779,34 @@ static void __init common_init(void)
pxa_set_i2c_info
(
NULL
);
}
#if defined(CONFIG_MACH_AKITA) || defined(CONFIG_MACH_BORZOI)
static
struct
nand_bbt_descr
sharpsl_akita_bbt
=
{
.
options
=
0
,
.
offs
=
4
,
.
len
=
1
,
.
pattern
=
scan_ff_pattern
};
static
struct
nand_ecclayout
akita_oobinfo
=
{
.
eccbytes
=
24
,
.
eccpos
=
{
0x5
,
0x1
,
0x2
,
0x3
,
0x6
,
0x7
,
0x15
,
0x11
,
0x12
,
0x13
,
0x16
,
0x17
,
0x25
,
0x21
,
0x22
,
0x23
,
0x26
,
0x27
,
0x35
,
0x31
,
0x32
,
0x33
,
0x36
,
0x37
},
.
oobfree
=
{{
0x08
,
0x09
}}
};
#endif
#if defined(CONFIG_MACH_SPITZ) || defined(CONFIG_MACH_BORZOI)
static
void
__init
spitz_init
(
void
)
{
spitz_ficp_platform_data
.
gpio_pwdown
=
SPITZ_GPIO_IR_ON
;
if
(
machine_is_borzoi
())
{
sharpsl_nand_platform_data
.
badblock_pattern
=
&
sharpsl_akita_bbt
;
sharpsl_nand_platform_data
.
ecc_layout
=
&
akita_oobinfo
;
}
platform_scoop_config
=
&
spitz_pcmcia_config
;
common_init
();
...
...
@@ -808,22 +831,6 @@ static struct i2c_board_info akita_i2c_board_info[] = {
},
};
static
struct
nand_bbt_descr
sharpsl_akita_bbt
=
{
.
options
=
0
,
.
offs
=
4
,
.
len
=
1
,
.
pattern
=
scan_ff_pattern
};
static
struct
nand_ecclayout
akita_oobinfo
=
{
.
eccbytes
=
24
,
.
eccpos
=
{
0x5
,
0x1
,
0x2
,
0x3
,
0x6
,
0x7
,
0x15
,
0x11
,
0x12
,
0x13
,
0x16
,
0x17
,
0x25
,
0x21
,
0x22
,
0x23
,
0x26
,
0x27
,
0x35
,
0x31
,
0x32
,
0x33
,
0x36
,
0x37
},
.
oobfree
=
{{
0x08
,
0x09
}}
};
static
void
__init
akita_init
(
void
)
{
spitz_ficp_platform_data
.
gpio_pwdown
=
AKITA_GPIO_IR_ON
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment