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
693d9d95
Commit
693d9d95
authored
Oct 02, 2007
by
Russell King
Committed by
Russell King
Oct 15, 2007
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[ARM] pxa: move pxa_set_mode() from pxa2xx_lubbock.c to lubbock.c
Signed-off-by:
Russell King
<
rmk+kernel@arm.linux.org.uk
>
parent
36d8b17b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
30 deletions
+20
-30
arch/arm/mach-pxa/lubbock.c
arch/arm/mach-pxa/lubbock.c
+19
-0
drivers/pcmcia/pxa2xx_lubbock.c
drivers/pcmcia/pxa2xx_lubbock.c
+1
-30
No files found.
arch/arm/mach-pxa/lubbock.c
View file @
693d9d95
...
...
@@ -512,6 +512,25 @@ static void __init lubbock_map_io(void)
pxa_gpio_mode
(
GPIO44_BTCTS_MD
);
pxa_gpio_mode
(
GPIO45_BTRTS_MD
);
GPSR
(
GPIO48_nPOE
)
=
GPIO_bit
(
GPIO48_nPOE
)
|
GPIO_bit
(
GPIO49_nPWE
)
|
GPIO_bit
(
GPIO50_nPIOR
)
|
GPIO_bit
(
GPIO51_nPIOW
)
|
GPIO_bit
(
GPIO52_nPCE_1
)
|
GPIO_bit
(
GPIO53_nPCE_2
);
pxa_gpio_mode
(
GPIO48_nPOE_MD
);
pxa_gpio_mode
(
GPIO49_nPWE_MD
);
pxa_gpio_mode
(
GPIO50_nPIOR_MD
);
pxa_gpio_mode
(
GPIO51_nPIOW_MD
);
pxa_gpio_mode
(
GPIO52_nPCE_1_MD
);
pxa_gpio_mode
(
GPIO53_nPCE_2_MD
);
pxa_gpio_mode
(
GPIO54_pSKTSEL_MD
);
pxa_gpio_mode
(
GPIO55_nPREG_MD
);
pxa_gpio_mode
(
GPIO56_nPWAIT_MD
);
pxa_gpio_mode
(
GPIO57_nIOIS16_MD
);
/* This is for the SMC chip select */
pxa_gpio_mode
(
GPIO79_nCS_3_MD
);
...
...
drivers/pcmcia/pxa2xx_lubbock.c
View file @
693d9d95
...
...
@@ -29,35 +29,6 @@
#include "sa1111_generic.h"
static
int
lubbock_pcmcia_hw_init
(
struct
soc_pcmcia_socket
*
skt
)
{
/*
* Setup default state of GPIO outputs
* before we enable them as outputs.
*/
GPSR
(
GPIO48_nPOE
)
=
GPIO_bit
(
GPIO48_nPOE
)
|
GPIO_bit
(
GPIO49_nPWE
)
|
GPIO_bit
(
GPIO50_nPIOR
)
|
GPIO_bit
(
GPIO51_nPIOW
)
|
GPIO_bit
(
GPIO52_nPCE_1
)
|
GPIO_bit
(
GPIO53_nPCE_2
);
pxa_gpio_mode
(
GPIO48_nPOE_MD
);
pxa_gpio_mode
(
GPIO49_nPWE_MD
);
pxa_gpio_mode
(
GPIO50_nPIOR_MD
);
pxa_gpio_mode
(
GPIO51_nPIOW_MD
);
pxa_gpio_mode
(
GPIO52_nPCE_1_MD
);
pxa_gpio_mode
(
GPIO53_nPCE_2_MD
);
pxa_gpio_mode
(
GPIO54_pSKTSEL_MD
);
pxa_gpio_mode
(
GPIO55_nPREG_MD
);
pxa_gpio_mode
(
GPIO56_nPWAIT_MD
);
pxa_gpio_mode
(
GPIO57_nIOIS16_MD
);
return
sa1111_pcmcia_hw_init
(
skt
);
}
static
int
lubbock_pcmcia_configure_socket
(
struct
soc_pcmcia_socket
*
skt
,
const
socket_state_t
*
state
)
...
...
@@ -230,7 +201,7 @@ lubbock_pcmcia_configure_socket(struct soc_pcmcia_socket *skt,
static
struct
pcmcia_low_level
lubbock_pcmcia_ops
=
{
.
owner
=
THIS_MODULE
,
.
hw_init
=
lubbock
_pcmcia_hw_init
,
.
hw_init
=
sa1111
_pcmcia_hw_init
,
.
hw_shutdown
=
sa1111_pcmcia_hw_shutdown
,
.
socket_state
=
sa1111_pcmcia_socket_state
,
.
configure_socket
=
lubbock_pcmcia_configure_socket
,
...
...
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