Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
c6a519d2
Commit
c6a519d2
authored
Sep 26, 2005
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Plain Diff
Merge master.kernel.org:/home/rmk/linux-2.6-arm
parents
bf0cbb3e
819ccc86
Changes
4
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
327 additions
and
266 deletions
+327
-266
arch/arm/configs/ixp4xx_defconfig
arch/arm/configs/ixp4xx_defconfig
+318
-259
arch/arm/mach-ixp4xx/common.c
arch/arm/mach-ixp4xx/common.c
+4
-1
include/asm-arm/arch-s3c2410/anubis-map.h
include/asm-arm/arch-s3c2410/anubis-map.h
+5
-5
include/asm-arm/signal.h
include/asm-arm/signal.h
+0
-1
No files found.
arch/arm/configs/ixp4xx_defconfig
View file @
c6a519d2
This diff is collapsed.
Click to expand it.
arch/arm/mach-ixp4xx/common.c
View file @
c6a519d2
...
@@ -125,7 +125,8 @@ static int ixp4xx_set_irq_type(unsigned int irq, unsigned int type)
...
@@ -125,7 +125,8 @@ static int ixp4xx_set_irq_type(unsigned int irq, unsigned int type)
}
else
if
(
type
&
IRQT_LOW
)
{
}
else
if
(
type
&
IRQT_LOW
)
{
int_style
=
IXP4XX_GPIO_STYLE_ACTIVE_LOW
;
int_style
=
IXP4XX_GPIO_STYLE_ACTIVE_LOW
;
irq_type
=
IXP4XX_IRQ_LEVEL
;
irq_type
=
IXP4XX_IRQ_LEVEL
;
}
}
else
return
-
EINVAL
;
ixp4xx_config_irq
(
irq
,
irq_type
);
ixp4xx_config_irq
(
irq
,
irq_type
);
...
@@ -142,6 +143,8 @@ static int ixp4xx_set_irq_type(unsigned int irq, unsigned int type)
...
@@ -142,6 +143,8 @@ static int ixp4xx_set_irq_type(unsigned int irq, unsigned int type)
/* Set the new style */
/* Set the new style */
*
int_reg
|=
(
int_style
<<
(
line
*
IXP4XX_GPIO_STYLE_SIZE
));
*
int_reg
|=
(
int_style
<<
(
line
*
IXP4XX_GPIO_STYLE_SIZE
));
return
0
;
}
}
static
void
ixp4xx_irq_mask
(
unsigned
int
irq
)
static
void
ixp4xx_irq_mask
(
unsigned
int
irq
)
...
...
include/asm-arm/arch-s3c2410/anubis-map.h
View file @
c6a519d2
...
@@ -20,22 +20,22 @@
...
@@ -20,22 +20,22 @@
/* start peripherals off after the S3C2410 */
/* start peripherals off after the S3C2410 */
#define ANUBIS_IOADDR(x) (S3C2410_ADDR((x) + 0x0
20
00000))
#define ANUBIS_IOADDR(x) (S3C2410_ADDR((x) + 0x0
18
00000))
#define ANUBIS_PA_CPLD (S3C2410_CS1 | (1<<26))
#define ANUBIS_PA_CPLD (S3C2410_CS1 | (1<<26))
/* we put the CPLD registers next, to get them out of the way */
/* we put the CPLD registers next, to get them out of the way */
#define ANUBIS_VA_CTRL1 ANUBIS_IOADDR(0x00000000)
/* 0x01
3
00000 */
#define ANUBIS_VA_CTRL1 ANUBIS_IOADDR(0x00000000)
/* 0x01
8
00000 */
#define ANUBIS_PA_CTRL1 (ANUBIS_PA_CPLD)
#define ANUBIS_PA_CTRL1 (ANUBIS_PA_CPLD)
#define ANUBIS_VA_CTRL2 ANUBIS_IOADDR(0x00100000)
/* 0x01
4
00000 */
#define ANUBIS_VA_CTRL2 ANUBIS_IOADDR(0x00100000)
/* 0x01
9
00000 */
#define ANUBIS_PA_CTRL2 (ANUBIS_PA_CPLD)
#define ANUBIS_PA_CTRL2 (ANUBIS_PA_CPLD)
#define ANUBIS_VA_CTRL3 ANUBIS_IOADDR(0x00200000)
/* 0x01
5
00000 */
#define ANUBIS_VA_CTRL3 ANUBIS_IOADDR(0x00200000)
/* 0x01
A
00000 */
#define ANUBIS_PA_CTRL3 (ANUBIS_PA_CPLD)
#define ANUBIS_PA_CTRL3 (ANUBIS_PA_CPLD)
#define ANUBIS_VA_CTRL4 ANUBIS_IOADDR(0x00300000)
/* 0x01
6
00000 */
#define ANUBIS_VA_CTRL4 ANUBIS_IOADDR(0x00300000)
/* 0x01
B
00000 */
#define ANUBIS_PA_CTRL4 (ANUBIS_PA_CPLD)
#define ANUBIS_PA_CTRL4 (ANUBIS_PA_CPLD)
#define ANUBIS_IDEPRI ANUBIS_IOADDR(0x01000000)
#define ANUBIS_IDEPRI ANUBIS_IOADDR(0x01000000)
...
...
include/asm-arm/signal.h
View file @
c6a519d2
...
@@ -115,7 +115,6 @@ typedef unsigned long sigset_t;
...
@@ -115,7 +115,6 @@ typedef unsigned long sigset_t;
#ifdef __KERNEL__
#ifdef __KERNEL__
#define SA_TIMER 0x40000000
#define SA_TIMER 0x40000000
#define SA_IRQNOMASK 0x08000000
#endif
#endif
#include <asm-generic/signal.h>
#include <asm-generic/signal.h>
...
...
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