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
112a674f
Commit
112a674f
authored
Nov 16, 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
e12399fe
7df56c25
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
9 additions
and
6 deletions
+9
-6
arch/arm/mach-mmp/include/mach/mfp-pxa910.h
arch/arm/mach-mmp/include/mach/mfp-pxa910.h
+1
-1
arch/arm/mach-pxa/colibri-pxa320.c
arch/arm/mach-pxa/colibri-pxa320.c
+3
-1
arch/arm/mach-pxa/hx4700.c
arch/arm/mach-pxa/hx4700.c
+1
-1
arch/arm/mach-pxa/include/mach/entry-macro.S
arch/arm/mach-pxa/include/mach/entry-macro.S
+1
-0
arch/arm/plat-pxa/include/plat/mfp.h
arch/arm/plat-pxa/include/plat/mfp.h
+1
-1
arch/arm/plat-pxa/mfp.c
arch/arm/plat-pxa/mfp.c
+2
-2
No files found.
arch/arm/mach-mmp/include/mach/mfp-pxa910.h
View file @
112a674f
...
...
@@ -160,7 +160,7 @@
#define MMC1_WP_MMC1_WP MFP_CFG_DRV(MMC1_WP, AF0, MEDIUM)
/* PWM */
#define GPIO27
PWM3
AF2 MFP_CFG(GPIO27, AF2)
#define GPIO27
_PWM3_
AF2 MFP_CFG(GPIO27, AF2)
#define GPIO51_PWM2_OUT MFP_CFG(GPIO51, AF2)
#define GPIO117_PWM1_OUT MFP_CFG(GPIO117, AF2)
#define GPIO118_PWM2_OUT MFP_CFG(GPIO118, AF2)
...
...
arch/arm/mach-pxa/colibri-pxa320.c
View file @
112a674f
...
...
@@ -27,6 +27,7 @@
#include <mach/colibri.h>
#include <mach/pxafb.h>
#include <mach/ohci.h>
#include <mach/audio.h>
#include "generic.h"
#include "devices.h"
...
...
@@ -145,7 +146,8 @@ static void __init colibri_pxa320_init_lcd(void)
static
inline
void
colibri_pxa320_init_lcd
(
void
)
{}
#endif
#if defined(SND_AC97_CODEC) || defined(SND_AC97_CODEC_MODULE)
#if defined(CONFIG_SND_AC97_CODEC) || \
defined(CONFIG_SND_AC97_CODEC_MODULE)
static
mfp_cfg_t
colibri_pxa320_ac97_pin_config
[]
__initdata
=
{
GPIO34_AC97_SYSCLK
,
GPIO35_AC97_SDATA_IN_0
,
...
...
arch/arm/mach-pxa/hx4700.c
View file @
112a674f
...
...
@@ -604,7 +604,7 @@ static struct platform_device gpio_vbus = {
static
const
struct
ads7846_platform_data
tsc2046_info
=
{
.
model
=
7846
,
.
vref_delay_usecs
=
100
,
.
pressure_max
=
512
,
.
pressure_max
=
1024
,
.
debounce_max
=
10
,
.
debounce_tol
=
3
,
.
debounce_rep
=
1
,
...
...
arch/arm/mach-pxa/include/mach/entry-macro.S
View file @
112a674f
...
...
@@ -46,5 +46,6 @@
beq
1001
f
bic
\
irqstat
,
\
irqstat
,
#
0x80000000
mov
\
irqnr
,
\
irqstat
,
lsr
#
16
add
\
irqnr
,
\
irqnr
,
#(
PXA_IRQ
(
0
))
1001
:
.
endm
arch/arm/plat-pxa/include/plat/mfp.h
View file @
112a674f
...
...
@@ -16,7 +16,7 @@
#ifndef __ASM_PLAT_MFP_H
#define __ASM_PLAT_MFP_H
#define mfp_to_gpio(m) ((m) %
128
)
#define mfp_to_gpio(m) ((m) %
256
)
/* list of all the configurable MFP pins */
enum
{
...
...
arch/arm/plat-pxa/mfp.c
View file @
112a674f
...
...
@@ -207,7 +207,7 @@ unsigned long mfp_read(int mfp)
{
unsigned
long
val
,
flags
;
BUG_ON
(
mfp
>=
MFP_PIN_MAX
);
BUG_ON
(
mfp
<
0
||
mfp
>=
MFP_PIN_MAX
);
spin_lock_irqsave
(
&
mfp_spin_lock
,
flags
);
val
=
mfpr_readl
(
mfp_table
[
mfp
].
mfpr_off
);
...
...
@@ -220,7 +220,7 @@ void mfp_write(int mfp, unsigned long val)
{
unsigned
long
flags
;
BUG_ON
(
mfp
>=
MFP_PIN_MAX
);
BUG_ON
(
mfp
<
0
||
mfp
>=
MFP_PIN_MAX
);
spin_lock_irqsave
(
&
mfp_spin_lock
,
flags
);
mfpr_writel
(
mfp_table
[
mfp
].
mfpr_off
,
val
);
...
...
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