|
@@ -35,8 +35,6 @@
|
|
#define MEN_Z135_BAUD_REG 0x810
|
|
#define MEN_Z135_BAUD_REG 0x810
|
|
#define MEN_Z135_TIMEOUT 0x814
|
|
#define MEN_Z135_TIMEOUT 0x814
|
|
|
|
|
|
-#define MEN_Z135_MEM_SIZE 0x818
|
|
|
|
-
|
|
|
|
#define IRQ_ID(x) ((x) & 0x1f)
|
|
#define IRQ_ID(x) ((x) & 0x1f)
|
|
|
|
|
|
#define MEN_Z135_IER_RXCIEN BIT(0) /* RX Space IRQ */
|
|
#define MEN_Z135_IER_RXCIEN BIT(0) /* RX Space IRQ */
|
|
@@ -124,6 +122,7 @@ MODULE_PARM_DESC(rx_timeout, "RX timeout. "
|
|
struct men_z135_port {
|
|
struct men_z135_port {
|
|
struct uart_port port;
|
|
struct uart_port port;
|
|
struct mcb_device *mdev;
|
|
struct mcb_device *mdev;
|
|
|
|
+ struct resource *mem;
|
|
unsigned char *rxbuf;
|
|
unsigned char *rxbuf;
|
|
u32 stat_reg;
|
|
u32 stat_reg;
|
|
spinlock_t lock;
|
|
spinlock_t lock;
|
|
@@ -734,22 +733,30 @@ static const char *men_z135_type(struct uart_port *port)
|
|
|
|
|
|
static void men_z135_release_port(struct uart_port *port)
|
|
static void men_z135_release_port(struct uart_port *port)
|
|
{
|
|
{
|
|
|
|
+ struct men_z135_port *uart = to_men_z135(port);
|
|
|
|
+
|
|
iounmap(port->membase);
|
|
iounmap(port->membase);
|
|
port->membase = NULL;
|
|
port->membase = NULL;
|
|
|
|
|
|
- release_mem_region(port->mapbase, MEN_Z135_MEM_SIZE);
|
|
|
|
|
|
+ mcb_release_mem(uart->mem);
|
|
}
|
|
}
|
|
|
|
|
|
static int men_z135_request_port(struct uart_port *port)
|
|
static int men_z135_request_port(struct uart_port *port)
|
|
{
|
|
{
|
|
- int size = MEN_Z135_MEM_SIZE;
|
|
|
|
|
|
+ struct men_z135_port *uart = to_men_z135(port);
|
|
|
|
+ struct mcb_device *mdev = uart->mdev;
|
|
|
|
+ struct resource *mem;
|
|
|
|
+
|
|
|
|
+ mem = mcb_request_mem(uart->mdev, dev_name(&mdev->dev));
|
|
|
|
+ if (IS_ERR(mem))
|
|
|
|
+ return PTR_ERR(mem);
|
|
|
|
|
|
- if (!request_mem_region(port->mapbase, size, "men_z135_port"))
|
|
|
|
- return -EBUSY;
|
|
|
|
|
|
+ port->mapbase = mem->start;
|
|
|
|
+ uart->mem = mem;
|
|
|
|
|
|
- port->membase = ioremap(port->mapbase, MEN_Z135_MEM_SIZE);
|
|
|
|
|
|
+ port->membase = ioremap(mem->start, resource_size(mem));
|
|
if (port->membase == NULL) {
|
|
if (port->membase == NULL) {
|
|
- release_mem_region(port->mapbase, MEN_Z135_MEM_SIZE);
|
|
|
|
|
|
+ mcb_release_mem(mem);
|
|
return -ENOMEM;
|
|
return -ENOMEM;
|
|
}
|
|
}
|
|
|
|
|