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
nexedi
linux
Commits
257dab81
Commit
257dab81
authored
May 06, 2010
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
ea056df7
ccb8d8d0
Changes
8
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
79 additions
and
121 deletions
+79
-121
arch/arm/boot/compressed/head.S
arch/arm/boot/compressed/head.S
+2
-8
arch/arm/configs/imote2_defconfig
arch/arm/configs/imote2_defconfig
+67
-105
arch/arm/mach-pxa/include/mach/colibri.h
arch/arm/mach-pxa/include/mach/colibri.h
+1
-0
arch/arm/mach-pxa/include/mach/hardware.h
arch/arm/mach-pxa/include/mach/hardware.h
+1
-1
arch/arm/mach-pxa/include/mach/regs-u2d.h
arch/arm/mach-pxa/include/mach/regs-u2d.h
+2
-1
arch/arm/mach-pxa/raumfeld.c
arch/arm/mach-pxa/raumfeld.c
+2
-3
arch/arm/mach-pxa/spitz.c
arch/arm/mach-pxa/spitz.c
+1
-1
arch/arm/mach-pxa/viper.c
arch/arm/mach-pxa/viper.c
+3
-2
No files found.
arch/arm/boot/compressed/head.S
View file @
257dab81
...
...
@@ -685,8 +685,8 @@ proc_types:
W
(
b
)
__armv4_mmu_cache_off
W
(
b
)
__armv4_mmu_cache_flush
.
word
0x560569
3
0
.
word
0xff
0ffff0
@
PXA935
.
word
0x560569
0
0
.
word
0xff
ffff00
@
PXA9xx
W
(
b
)
__armv4_mmu_cache_on
W
(
b
)
__armv4_mmu_cache_off
W
(
b
)
__armv4_mmu_cache_flush
...
...
@@ -697,12 +697,6 @@ proc_types:
W
(
b
)
__armv4_mmu_cache_off
W
(
b
)
__armv5tej_mmu_cache_flush
.
word
0x56056930
.
word
0xff0ffff0
@
PXA935
W
(
b
)
__armv4_mmu_cache_on
W
(
b
)
__armv4_mmu_cache_off
W
(
b
)
__armv4_mmu_cache_flush
.
word
0x56050000
@
Feroceon
.
word
0xff0f0000
W
(
b
)
__armv4_mmu_cache_on
...
...
arch/arm/configs/imote2_defconfig
View file @
257dab81
This diff is collapsed.
Click to expand it.
arch/arm/mach-pxa/include/mach/colibri.h
View file @
257dab81
...
...
@@ -2,6 +2,7 @@
#define _COLIBRI_H_
#include <net/ax88796.h>
#include <mach/mfp.h>
/*
* common settings for all modules
...
...
arch/arm/mach-pxa/include/mach/hardware.h
View file @
257dab81
...
...
@@ -202,7 +202,7 @@
#define __cpu_is_pxa950(id) \
({ \
unsigned int _id = (id) >> 4 & 0xfff; \
id == 0x697; \
_
id == 0x697; \
})
#else
#define __cpu_is_pxa950(id) (0)
...
...
arch/arm/mach-pxa/include/mach/regs-u2d.h
View file @
257dab81
...
...
@@ -166,7 +166,8 @@
#define U2DMACSR_BUSERRTYPE (7 << 10)
/* PX Bus Error Type */
#define U2DMACSR_EORINTR (1 << 9)
/* End Of Receive */
#define U2DMACSR_REQPEND (1 << 8)
/* Request Pending */
#define U2DMACSR_RASINTR (1 << 4)
/* Request After Channel Stopped (read / write 1 clear) */
#define U2DMACSR_STOPINTR (1 << 3)
/* Stop Interrupt (read only) */
#define U2DMACSR_RASINTR (1 << 4)
/* Request After Channel Stopped (read / write 1 clear) */
#define U2DMACSR_STOPINTR (1 << 3)
/* Stop Interrupt (read only) */
#define U2DMACSR_ENDINTR (1 << 2)
/* End Interrupt (read / write 1 clear) */
#define U2DMACSR_STARTINTR (1 << 1)
/* Start Interrupt (read / write 1 clear) */
#define U2DMACSR_BUSERRINTR (1 << 0)
/* Bus Error Interrupt (read / write 1 clear) */
...
...
arch/arm/mach-pxa/raumfeld.c
View file @
257dab81
...
...
@@ -983,7 +983,7 @@ static void __init raumfeld_common_init(void)
int
i
;
for
(
i
=
0
;
i
<
ARRAY_SIZE
(
gpio_keys_button
);
i
++
)
if
(
!
strcmp
(
gpio_keys_button
[
i
].
desc
,
"on
/
off button"
))
if
(
!
strcmp
(
gpio_keys_button
[
i
].
desc
,
"on
_
off button"
))
gpio_keys_button
[
i
].
active_low
=
1
;
}
...
...
@@ -1009,8 +1009,7 @@ static void __init raumfeld_common_init(void)
gpio_direction_output
(
GPIO_W2W_PDN
,
0
);
/* this can be used to switch off the device */
ret
=
gpio_request
(
GPIO_SHUTDOWN_SUPPLY
,
"supply shutdown"
);
ret
=
gpio_request
(
GPIO_SHUTDOWN_SUPPLY
,
"supply shutdown"
);
if
(
ret
<
0
)
pr_warning
(
"Unable to request GPIO_SHUTDOWN_SUPPLY
\n
"
);
else
...
...
arch/arm/mach-pxa/spitz.c
View file @
257dab81
...
...
@@ -363,7 +363,7 @@ static struct gpio_keys_button spitz_gpio_keys[] = {
.
type
=
EV_PWR
,
.
code
=
KEY_SUSPEND
,
.
gpio
=
SPITZ_GPIO_ON_KEY
,
.
desc
=
"On
/
Off"
,
.
desc
=
"On
Off"
,
.
wakeup
=
1
,
},
/* Two buttons detecting the lid state */
...
...
arch/arm/mach-pxa/viper.c
View file @
257dab81
...
...
@@ -34,6 +34,7 @@
#include <linux/pm.h>
#include <linux/sched.h>
#include <linux/gpio.h>
#include <linux/jiffies.h>
#include <linux/i2c-gpio.h>
#include <linux/serial_8250.h>
#include <linux/smc91x.h>
...
...
@@ -454,7 +455,7 @@ static struct i2c_gpio_platform_data i2c_bus_data = {
.
sda_pin
=
VIPER_RTC_I2C_SDA_GPIO
,
.
scl_pin
=
VIPER_RTC_I2C_SCL_GPIO
,
.
udelay
=
10
,
.
timeout
=
100
,
.
timeout
=
HZ
,
};
static
struct
platform_device
i2c_bus_device
=
{
...
...
@@ -779,7 +780,7 @@ static void __init viper_tpm_init(void)
.
sda_pin
=
VIPER_TPM_I2C_SDA_GPIO
,
.
scl_pin
=
VIPER_TPM_I2C_SCL_GPIO
,
.
udelay
=
10
,
.
timeout
=
100
,
.
timeout
=
HZ
,
};
char
*
errstr
;
...
...
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