git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
arch
/
arm
/
mach-sa1100
/
collie.c
diff --git
a/arch/arm/mach-sa1100/collie.c
b/arch/arm/mach-sa1100/collie.c
index
676b5c5
..
6496eb6
100644
(file)
--- a/
arch/arm/mach-sa1100/collie.c
+++ b/
arch/arm/mach-sa1100/collie.c
@@
-17,7
+17,6
@@
* 04-16-2001 Lineo Japan,Inc. ...
*/
* 04-16-2001 Lineo Japan,Inc. ...
*/
-#include <linux/config.h>
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/tty.h>
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/tty.h>
@@
-84,38
+83,37
@@
static struct scoop_pcmcia_config collie_pcmcia_config = {
static struct mcp_plat_data collie_mcp_data = {
static struct mcp_plat_data collie_mcp_data = {
- .mccr0 = MCCR0_ADM,
- .sclk_rate =
11981
000,
+ .mccr0 = MCCR0_ADM
| MCCR0_ExtClk
,
+ .sclk_rate =
9216
000,
};
#ifdef CONFIG_SHARP_LOCOMO
/*
* low-level UART features.
*/
};
#ifdef CONFIG_SHARP_LOCOMO
/*
* low-level UART features.
*/
-st
atic struct locomo_dev *uart_dev = NULL
;
+st
ruct platform_device collie_locomo_device
;
static void collie_uart_set_mctrl(struct uart_port *port, u_int mctrl)
{
static void collie_uart_set_mctrl(struct uart_port *port, u_int mctrl)
{
- if (!uart_dev) return;
-
if (mctrl & TIOCM_RTS)
if (mctrl & TIOCM_RTS)
- locomo_gpio_write(
uart_
dev, LOCOMO_GPIO_RTS, 0);
+ locomo_gpio_write(
&collie_locomo_device.
dev, LOCOMO_GPIO_RTS, 0);
else
else
- locomo_gpio_write(
uart_
dev, LOCOMO_GPIO_RTS, 1);
+ locomo_gpio_write(
&collie_locomo_device.
dev, LOCOMO_GPIO_RTS, 1);
if (mctrl & TIOCM_DTR)
if (mctrl & TIOCM_DTR)
- locomo_gpio_write(
uart_
dev, LOCOMO_GPIO_DTR, 0);
+ locomo_gpio_write(
&collie_locomo_device.
dev, LOCOMO_GPIO_DTR, 0);
else
else
- locomo_gpio_write(
uart_
dev, LOCOMO_GPIO_DTR, 1);
+ locomo_gpio_write(
&collie_locomo_device.
dev, LOCOMO_GPIO_DTR, 1);
}
static u_int collie_uart_get_mctrl(struct uart_port *port)
{
int ret = TIOCM_CD;
unsigned int r;
}
static u_int collie_uart_get_mctrl(struct uart_port *port)
{
int ret = TIOCM_CD;
unsigned int r;
- if (!uart_dev) return ret;
- r = locomo_gpio_read_output(uart_dev, LOCOMO_GPIO_CTS & LOCOMO_GPIO_DSR);
+ r = locomo_gpio_read_output(&collie_locomo_device.dev, LOCOMO_GPIO_CTS & LOCOMO_GPIO_DSR);
+ if (r == -ENODEV)
+ return ret;
if (r & LOCOMO_GPIO_CTS)
ret |= TIOCM_CTS;
if (r & LOCOMO_GPIO_DSR)
if (r & LOCOMO_GPIO_CTS)
ret |= TIOCM_CTS;
if (r & LOCOMO_GPIO_DSR)
@@
-131,13
+129,11
@@
static struct sa1100_port_fns collie_port_fns __initdata = {
static int collie_uart_probe(struct locomo_dev *dev)
{
static int collie_uart_probe(struct locomo_dev *dev)
{
- uart_dev = dev;
return 0;
}
static int collie_uart_remove(struct locomo_dev *dev)
{
return 0;
}
static int collie_uart_remove(struct locomo_dev *dev)
{
- uart_dev = NULL;
return 0;
}
return 0;
}
@@
-171,7
+167,7
@@
static struct resource locomo_resources[] = {
},
};
},
};
-st
atic struct platform_device
locomo_device = {
+st
ruct platform_device collie_
locomo_device = {
.name = "locomo",
.id = 0,
.num_resources = ARRAY_SIZE(locomo_resources),
.name = "locomo",
.id = 0,
.num_resources = ARRAY_SIZE(locomo_resources),
@@
-179,7
+175,7
@@
static struct platform_device locomo_device = {
};
static struct platform_device *devices[] __initdata = {
};
static struct platform_device *devices[] __initdata = {
- &locomo_device,
+ &
collie_
locomo_device,
&colliescoop_device,
};
&colliescoop_device,
};