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
0de9a00f
Commit
0de9a00f
authored
Jan 08, 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
22325525
d13fecd0
Changes
13
Show whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
26 additions
and
23 deletions
+26
-23
arch/arm/mach-pxa/include/mach/hardware.h
arch/arm/mach-pxa/include/mach/hardware.h
+3
-6
arch/arm/mach-pxa/magician.c
arch/arm/mach-pxa/magician.c
+1
-1
arch/arm/mach-pxa/palmld.c
arch/arm/mach-pxa/palmld.c
+1
-1
arch/arm/mach-pxa/palmt5.c
arch/arm/mach-pxa/palmt5.c
+1
-1
arch/arm/mach-pxa/palmtc.c
arch/arm/mach-pxa/palmtc.c
+1
-1
arch/arm/mach-pxa/palmte2.c
arch/arm/mach-pxa/palmte2.c
+1
-1
arch/arm/mach-pxa/palmtreo.c
arch/arm/mach-pxa/palmtreo.c
+1
-1
arch/arm/mach-pxa/palmtx.c
arch/arm/mach-pxa/palmtx.c
+1
-1
arch/arm/mach-pxa/palmz72.c
arch/arm/mach-pxa/palmz72.c
+1
-1
arch/arm/mach-pxa/spitz.c
arch/arm/mach-pxa/spitz.c
+2
-2
arch/arm/mach-pxa/viper.c
arch/arm/mach-pxa/viper.c
+1
-1
arch/arm/mm/cache-xsc3l2.c
arch/arm/mm/cache-xsc3l2.c
+5
-6
arch/arm/mm/proc-xsc3.S
arch/arm/mm/proc-xsc3.S
+7
-0
No files found.
arch/arm/mach-pxa/include/mach/hardware.h
View file @
0de9a00f
...
@@ -250,20 +250,17 @@
...
@@ -250,20 +250,17 @@
#define cpu_is_pxa930() \
#define cpu_is_pxa930() \
({ \
({ \
unsigned int id = read_cpuid(CPUID_ID); \
__cpu_is_pxa930(read_cpuid_id()); \
__cpu_is_pxa930(id); \
})
})
#define cpu_is_pxa935() \
#define cpu_is_pxa935() \
({ \
({ \
unsigned int id = read_cpuid(CPUID_ID); \
__cpu_is_pxa935(read_cpuid_id()); \
__cpu_is_pxa935(id); \
})
})
#define cpu_is_pxa950() \
#define cpu_is_pxa950() \
({ \
({ \
unsigned int id = read_cpuid(CPUID_ID); \
__cpu_is_pxa950(read_cpuid_id()); \
__cpu_is_pxa950(id); \
})
})
...
...
arch/arm/mach-pxa/magician.c
View file @
0de9a00f
...
@@ -381,7 +381,7 @@ static int magician_backlight_init(struct device *dev)
...
@@ -381,7 +381,7 @@ static int magician_backlight_init(struct device *dev)
return
ret
;
return
ret
;
}
}
static
int
magician_backlight_notify
(
int
brightness
)
static
int
magician_backlight_notify
(
struct
device
*
dev
,
int
brightness
)
{
{
gpio_set_value
(
EGPIO_MAGICIAN_BL_POWER
,
brightness
);
gpio_set_value
(
EGPIO_MAGICIAN_BL_POWER
,
brightness
);
if
(
brightness
>=
200
)
{
if
(
brightness
>=
200
)
{
...
...
arch/arm/mach-pxa/palmld.c
View file @
0de9a00f
...
@@ -270,7 +270,7 @@ static int palmld_backlight_init(struct device *dev)
...
@@ -270,7 +270,7 @@ static int palmld_backlight_init(struct device *dev)
return
ret
;
return
ret
;
}
}
static
int
palmld_backlight_notify
(
int
brightness
)
static
int
palmld_backlight_notify
(
struct
device
*
dev
,
int
brightness
)
{
{
gpio_set_value
(
GPIO_NR_PALMLD_BL_POWER
,
brightness
);
gpio_set_value
(
GPIO_NR_PALMLD_BL_POWER
,
brightness
);
gpio_set_value
(
GPIO_NR_PALMLD_LCD_POWER
,
brightness
);
gpio_set_value
(
GPIO_NR_PALMLD_LCD_POWER
,
brightness
);
...
...
arch/arm/mach-pxa/palmt5.c
View file @
0de9a00f
...
@@ -209,7 +209,7 @@ static int palmt5_backlight_init(struct device *dev)
...
@@ -209,7 +209,7 @@ static int palmt5_backlight_init(struct device *dev)
return
ret
;
return
ret
;
}
}
static
int
palmt5_backlight_notify
(
int
brightness
)
static
int
palmt5_backlight_notify
(
struct
device
*
dev
,
int
brightness
)
{
{
gpio_set_value
(
GPIO_NR_PALMT5_BL_POWER
,
brightness
);
gpio_set_value
(
GPIO_NR_PALMT5_BL_POWER
,
brightness
);
gpio_set_value
(
GPIO_NR_PALMT5_LCD_POWER
,
brightness
);
gpio_set_value
(
GPIO_NR_PALMT5_LCD_POWER
,
brightness
);
...
...
arch/arm/mach-pxa/palmtc.c
View file @
0de9a00f
...
@@ -185,7 +185,7 @@ static int palmtc_backlight_init(struct device *dev)
...
@@ -185,7 +185,7 @@ static int palmtc_backlight_init(struct device *dev)
return
ret
;
return
ret
;
}
}
static
int
palmtc_backlight_notify
(
int
brightness
)
static
int
palmtc_backlight_notify
(
struct
device
*
dev
,
int
brightness
)
{
{
/* backlight is on when GPIO16 AF0 is high */
/* backlight is on when GPIO16 AF0 is high */
gpio_set_value
(
GPIO_NR_PALMTC_BL_POWER
,
brightness
);
gpio_set_value
(
GPIO_NR_PALMTC_BL_POWER
,
brightness
);
...
...
arch/arm/mach-pxa/palmte2.c
View file @
0de9a00f
...
@@ -181,7 +181,7 @@ static int palmte2_backlight_init(struct device *dev)
...
@@ -181,7 +181,7 @@ static int palmte2_backlight_init(struct device *dev)
return
ret
;
return
ret
;
}
}
static
int
palmte2_backlight_notify
(
int
brightness
)
static
int
palmte2_backlight_notify
(
struct
device
*
dev
,
int
brightness
)
{
{
gpio_set_value
(
GPIO_NR_PALMTE2_BL_POWER
,
brightness
);
gpio_set_value
(
GPIO_NR_PALMTE2_BL_POWER
,
brightness
);
gpio_set_value
(
GPIO_NR_PALMTE2_LCD_POWER
,
brightness
);
gpio_set_value
(
GPIO_NR_PALMTE2_LCD_POWER
,
brightness
);
...
...
arch/arm/mach-pxa/palmtreo.c
View file @
0de9a00f
...
@@ -375,7 +375,7 @@ static int treo_backlight_init(struct device *dev)
...
@@ -375,7 +375,7 @@ static int treo_backlight_init(struct device *dev)
return
ret
;
return
ret
;
}
}
static
int
treo_backlight_notify
(
int
brightness
)
static
int
treo_backlight_notify
(
struct
device
*
dev
,
int
brightness
)
{
{
gpio_set_value
(
GPIO_NR_TREO_BL_POWER
,
brightness
);
gpio_set_value
(
GPIO_NR_TREO_BL_POWER
,
brightness
);
return
TREO_MAX_INTENSITY
-
brightness
;
return
TREO_MAX_INTENSITY
-
brightness
;
...
...
arch/arm/mach-pxa/palmtx.c
View file @
0de9a00f
...
@@ -269,7 +269,7 @@ static int palmtx_backlight_init(struct device *dev)
...
@@ -269,7 +269,7 @@ static int palmtx_backlight_init(struct device *dev)
return
ret
;
return
ret
;
}
}
static
int
palmtx_backlight_notify
(
int
brightness
)
static
int
palmtx_backlight_notify
(
struct
device
*
dev
,
int
brightness
)
{
{
gpio_set_value
(
GPIO_NR_PALMTX_BL_POWER
,
brightness
);
gpio_set_value
(
GPIO_NR_PALMTX_BL_POWER
,
brightness
);
gpio_set_value
(
GPIO_NR_PALMTX_LCD_POWER
,
brightness
);
gpio_set_value
(
GPIO_NR_PALMTX_LCD_POWER
,
brightness
);
...
...
arch/arm/mach-pxa/palmz72.c
View file @
0de9a00f
...
@@ -196,7 +196,7 @@ static int palmz72_backlight_init(struct device *dev)
...
@@ -196,7 +196,7 @@ static int palmz72_backlight_init(struct device *dev)
return
ret
;
return
ret
;
}
}
static
int
palmz72_backlight_notify
(
int
brightness
)
static
int
palmz72_backlight_notify
(
struct
device
*
dev
,
int
brightness
)
{
{
gpio_set_value
(
GPIO_NR_PALMZ72_BL_POWER
,
brightness
);
gpio_set_value
(
GPIO_NR_PALMZ72_BL_POWER
,
brightness
);
gpio_set_value
(
GPIO_NR_PALMZ72_LCD_POWER
,
brightness
);
gpio_set_value
(
GPIO_NR_PALMZ72_LCD_POWER
,
brightness
);
...
...
arch/arm/mach-pxa/spitz.c
View file @
0de9a00f
...
@@ -389,13 +389,13 @@ static struct gpio_keys_button spitz_gpio_keys[] = {
...
@@ -389,13 +389,13 @@ static struct gpio_keys_button spitz_gpio_keys[] = {
.
type
=
EV_SW
,
.
type
=
EV_SW
,
.
code
=
0
,
.
code
=
0
,
.
gpio
=
SPITZ_GPIO_SWA
,
.
gpio
=
SPITZ_GPIO_SWA
,
.
desc
=
"
Display Down"
,
.
desc
=
"Display Down"
,
},
},
{
{
.
type
=
EV_SW
,
.
type
=
EV_SW
,
.
code
=
1
,
.
code
=
1
,
.
gpio
=
SPITZ_GPIO_SWB
,
.
gpio
=
SPITZ_GPIO_SWB
,
.
desc
=
"
Lid Closed"
,
.
desc
=
"Lid Closed"
,
},
},
};
};
...
...
arch/arm/mach-pxa/viper.c
View file @
0de9a00f
...
@@ -379,7 +379,7 @@ static int viper_backlight_init(struct device *dev)
...
@@ -379,7 +379,7 @@ static int viper_backlight_init(struct device *dev)
return
ret
;
return
ret
;
}
}
static
int
viper_backlight_notify
(
int
brightness
)
static
int
viper_backlight_notify
(
struct
device
*
dev
,
int
brightness
)
{
{
gpio_set_value
(
VIPER_LCD_EN_GPIO
,
!!
brightness
);
gpio_set_value
(
VIPER_LCD_EN_GPIO
,
!!
brightness
);
gpio_set_value
(
VIPER_BCKLIGHT_EN_GPIO
,
!!
brightness
);
gpio_set_value
(
VIPER_BCKLIGHT_EN_GPIO
,
!!
brightness
);
...
...
arch/arm/mm/cache-xsc3l2.c
View file @
0de9a00f
...
@@ -221,15 +221,14 @@ static int __init xsc3_l2_init(void)
...
@@ -221,15 +221,14 @@ static int __init xsc3_l2_init(void)
if
(
!
cpu_is_xsc3
()
||
!
xsc3_l2_present
())
if
(
!
cpu_is_xsc3
()
||
!
xsc3_l2_present
())
return
0
;
return
0
;
if
(
!
(
get_cr
()
&
CR_L2
)
)
{
if
(
get_cr
()
&
CR_L2
)
{
pr_info
(
"XScale3 L2 cache enabled.
\n
"
);
pr_info
(
"XScale3 L2 cache enabled.
\n
"
);
adjust_cr
(
CR_L2
,
CR_L2
);
xsc3_l2_inv_all
();
xsc3_l2_inv_all
();
}
outer_cache
.
inv_range
=
xsc3_l2_inv_range
;
outer_cache
.
inv_range
=
xsc3_l2_inv_range
;
outer_cache
.
clean_range
=
xsc3_l2_clean_range
;
outer_cache
.
clean_range
=
xsc3_l2_clean_range
;
outer_cache
.
flush_range
=
xsc3_l2_flush_range
;
outer_cache
.
flush_range
=
xsc3_l2_flush_range
;
}
return
0
;
return
0
;
}
}
...
...
arch/arm/mm/proc-xsc3.S
View file @
0de9a00f
...
@@ -407,6 +407,13 @@ __xsc3_setup:
...
@@ -407,6 +407,13 @@ __xsc3_setup:
adr
r5
,
xsc3_crval
adr
r5
,
xsc3_crval
ldmia
r5
,
{
r5
,
r6
}
ldmia
r5
,
{
r5
,
r6
}
#ifdef CONFIG_CACHE_XSC3L2
mrc
p15
,
1
,
r0
,
c0
,
c0
,
1
@
get
L2
present
information
ands
r0
,
r0
,
#
0xf8
orrne
r6
,
r6
,
#(
1
<<
26
)
@
enable
L2
if
present
#endif
mrc
p15
,
0
,
r0
,
c1
,
c0
,
0
@
get
control
register
mrc
p15
,
0
,
r0
,
c1
,
c0
,
0
@
get
control
register
bic
r0
,
r0
,
r5
@
..
V
.
..
R
.
....
..
A
.
bic
r0
,
r0
,
r5
@
..
V
.
..
R
.
....
..
A
.
orr
r0
,
r0
,
r6
@
..
VI
Z
..
S
....
.
C
.
M
(
mmu
)
orr
r0
,
r0
,
r6
@
..
VI
Z
..
S
....
.
C
.
M
(
mmu
)
...
...
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