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
0b6c135e
Commit
0b6c135e
authored
Jan 28, 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
00e4acb1
c70f5a60
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
6 deletions
+15
-6
arch/arm/mach-pxa/corgi.c
arch/arm/mach-pxa/corgi.c
+1
-0
arch/arm/mach-pxa/include/mach/mfp-pxa25x.h
arch/arm/mach-pxa/include/mach/mfp-pxa25x.h
+4
-2
arch/arm/mach-pxa/irq.c
arch/arm/mach-pxa/irq.c
+10
-4
No files found.
arch/arm/mach-pxa/corgi.c
View file @
0b6c135e
...
@@ -457,6 +457,7 @@ static struct pxaficp_platform_data corgi_ficp_platform_data = {
...
@@ -457,6 +457,7 @@ static struct pxaficp_platform_data corgi_ficp_platform_data = {
* USB Device Controller
* USB Device Controller
*/
*/
static
struct
pxa2xx_udc_mach_info
udc_info
__initdata
=
{
static
struct
pxa2xx_udc_mach_info
udc_info
__initdata
=
{
.
gpio_vbus
=
-
1
,
/* no connect GPIO; corgi can't tell connection status */
/* no connect GPIO; corgi can't tell connection status */
.
gpio_pullup
=
CORGI_GPIO_USB_PULLUP
,
.
gpio_pullup
=
CORGI_GPIO_USB_PULLUP
,
};
};
...
...
arch/arm/mach-pxa/include/mach/mfp-pxa25x.h
View file @
0b6c135e
...
@@ -169,7 +169,6 @@
...
@@ -169,7 +169,6 @@
#define GPIO86_nSDCS2 MFP_CFG_OUT(GPIO86, AF0, DRIVE_HIGH)
#define GPIO86_nSDCS2 MFP_CFG_OUT(GPIO86, AF0, DRIVE_HIGH)
#define GPIO87_nSDCS3 MFP_CFG_OUT(GPIO87, AF0, DRIVE_HIGH)
#define GPIO87_nSDCS3 MFP_CFG_OUT(GPIO87, AF0, DRIVE_HIGH)
#define GPIO88_RDnWR MFP_CFG_OUT(GPIO88, AF0, DRIVE_HIGH)
#define GPIO88_RDnWR MFP_CFG_OUT(GPIO88, AF0, DRIVE_HIGH)
#define GPIO89_nACRESET MFP_CFG_OUT(GPIO89, AF0, DRIVE_HIGH)
/* USB */
/* USB */
#define GPIO9_USB_RCV MFP_CFG_IN(GPIO9, AF1)
#define GPIO9_USB_RCV MFP_CFG_IN(GPIO9, AF1)
...
@@ -186,6 +185,9 @@
...
@@ -186,6 +185,9 @@
#define GPIO30_ASSP_TXD MFP_CFG_OUT(GPIO30, AF3, DRIVE_LOW)
#define GPIO30_ASSP_TXD MFP_CFG_OUT(GPIO30, AF3, DRIVE_LOW)
#define GPIO31_ASSP_SFRM_IN MFP_CFG_IN(GPIO31, AF1)
#define GPIO31_ASSP_SFRM_IN MFP_CFG_IN(GPIO31, AF1)
#define GPIO31_ASSP_SFRM_OUT MFP_CFG_OUT(GPIO31, AF3, DRIVE_LOW)
#define GPIO31_ASSP_SFRM_OUT MFP_CFG_OUT(GPIO31, AF3, DRIVE_LOW)
#endif
/* AC97 */
#define GPIO89_AC97_nRESET MFP_CFG_OUT(GPIO89, AF0, DRIVE_HIGH)
#endif
/* CONFIG_CPU_PXA26x */
#endif
/* __ASM_ARCH_MFP_PXA25X_H */
#endif
/* __ASM_ARCH_MFP_PXA25X_H */
arch/arm/mach-pxa/irq.c
View file @
0b6c135e
...
@@ -164,8 +164,11 @@ static int pxa_irq_suspend(struct sys_device *dev, pm_message_t state)
...
@@ -164,8 +164,11 @@ static int pxa_irq_suspend(struct sys_device *dev, pm_message_t state)
saved_icmr
[
i
]
=
_ICMR
(
irq
);
saved_icmr
[
i
]
=
_ICMR
(
irq
);
_ICMR
(
irq
)
=
0
;
_ICMR
(
irq
)
=
0
;
}
}
if
(
cpu_is_pxa27x
()
||
cpu_is_pxa3xx
())
{
for
(
i
=
0
;
i
<
pxa_internal_irq_nr
;
i
++
)
for
(
i
=
0
;
i
<
pxa_internal_irq_nr
;
i
++
)
saved_ipr
[
i
]
=
IPR
(
i
);
saved_ipr
[
i
]
=
IPR
(
i
);
}
return
0
;
return
0
;
}
}
...
@@ -174,12 +177,15 @@ static int pxa_irq_resume(struct sys_device *dev)
...
@@ -174,12 +177,15 @@ static int pxa_irq_resume(struct sys_device *dev)
{
{
int
i
,
irq
=
PXA_IRQ
(
0
);
int
i
,
irq
=
PXA_IRQ
(
0
);
if
(
cpu_is_pxa27x
()
||
cpu_is_pxa3xx
())
{
for
(
i
=
0
;
i
<
pxa_internal_irq_nr
;
i
++
)
IPR
(
i
)
=
saved_ipr
[
i
];
}
for
(
i
=
0
;
irq
<
PXA_IRQ
(
pxa_internal_irq_nr
);
i
++
,
irq
+=
32
)
{
for
(
i
=
0
;
irq
<
PXA_IRQ
(
pxa_internal_irq_nr
);
i
++
,
irq
+=
32
)
{
_ICMR
(
irq
)
=
saved_icmr
[
i
];
_ICMR
(
irq
)
=
saved_icmr
[
i
];
_ICLR
(
irq
)
=
0
;
_ICLR
(
irq
)
=
0
;
}
}
for
(
i
=
0
;
i
<
pxa_internal_irq_nr
;
i
++
)
IPR
(
i
)
=
saved_ipr
[
i
];
ICCR
=
1
;
ICCR
=
1
;
return
0
;
return
0
;
...
...
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