* [PATCH 1/4 v2] serial: add a new port type, found on some sh-mobile
@ 2010-05-23 16:39 ` Guennadi Liakhovetski
0 siblings, 0 replies; 12+ messages in thread
From: Guennadi Liakhovetski @ 2010-05-23 16:39 UTC (permalink / raw)
To: linux-sh; +Cc: linux-serial, Paul Mundt
Such ports are found, e.g., on SH7372.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
---
v1 -> v2:
rebased onto the current (sh-2.6/master) HEAD, where two more new port
types have been registered.
include/linux/serial_core.h | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h
index f10db6e..5228320 100644
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@ -186,6 +186,9 @@
#define PORT_ALTERA_JTAGUART 91
#define PORT_ALTERA_UART 92
+/* SH-SCI */
+#define PORT_SCIFB 93
+
#ifdef __KERNEL__
#include <linux/compiler.h>
--
1.6.2.4
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 1/4 v2] serial: add a new port type, found on some sh-mobile SoCs
@ 2010-05-23 16:39 ` Guennadi Liakhovetski
0 siblings, 0 replies; 12+ messages in thread
From: Guennadi Liakhovetski @ 2010-05-23 16:39 UTC (permalink / raw)
To: linux-sh; +Cc: linux-serial, Paul Mundt
Such ports are found, e.g., on SH7372.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
---
v1 -> v2:
rebased onto the current (sh-2.6/master) HEAD, where two more new port
types have been registered.
include/linux/serial_core.h | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h
index f10db6e..5228320 100644
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@ -186,6 +186,9 @@
#define PORT_ALTERA_JTAGUART 91
#define PORT_ALTERA_UART 92
+/* SH-SCI */
+#define PORT_SCIFB 93
+
#ifdef __KERNEL__
#include <linux/compiler.h>
--
1.6.2.4
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 2/4] serial: sh-sci: fix handling of SCIFB sh-mobile ports
2010-05-23 16:39 ` [PATCH 1/4 v2] serial: add a new port type, found on some sh-mobile SoCs Guennadi Liakhovetski
@ 2010-05-23 16:39 ` Guennadi Liakhovetski
-1 siblings, 0 replies; 12+ messages in thread
From: Guennadi Liakhovetski @ 2010-05-23 16:39 UTC (permalink / raw)
To: linux-sh; +Cc: linux-serial, Paul Mundt
SCIFB ports have a slightly different register layout and a different FIFO
size from SCIFA ports, in DMA mode they have to be treated just like SCIFA.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
---
No change since the original version
drivers/serial/sh-sci.c | 42 ++++++++++++++++++++++++++++++++++--------
drivers/serial/sh-sci.h | 29 +++++++++++++++++++++++------
2 files changed, 57 insertions(+), 14 deletions(-)
diff --git a/drivers/serial/sh-sci.c b/drivers/serial/sh-sci.c
index b985ffd..17eceaa 100644
--- a/drivers/serial/sh-sci.c
+++ b/drivers/serial/sh-sci.c
@@ -342,6 +342,27 @@ static int scif_rxfill(struct uart_port *port)
return sci_in(port, SCFDR) & SCIF2_RFDC_MASK;
}
}
+#elif defined(CONFIG_ARCH_SH7372)
+static int scif_txfill(struct uart_port *port)
+{
+ if (port->type = PORT_SCIFA)
+ return sci_in(port, SCFDR) >> 8;
+ else
+ return sci_in(port, SCTFDR);
+}
+
+static int scif_txroom(struct uart_port *port)
+{
+ return port->fifosize - scif_txfill(port);
+}
+
+static int scif_rxfill(struct uart_port *port)
+{
+ if (port->type = PORT_SCIFA)
+ return sci_in(port, SCFDR) & SCIF_RFDC_MASK;
+ else
+ return sci_in(port, SCRFDR);
+}
#else
static int scif_txfill(struct uart_port *port)
{
@@ -679,7 +700,7 @@ static irqreturn_t sci_rx_interrupt(int irq, void *ptr)
u16 ssr = sci_in(port, SCxSR);
/* Disable future Rx interrupts */
- if (port->type = PORT_SCIFA) {
+ if (port->type = PORT_SCIFA || port->type = PORT_SCIFB) {
disable_irq_nosync(irq);
scr |= 0x4000;
} else {
@@ -924,7 +945,7 @@ static void sci_dma_tx_complete(void *arg)
if (!uart_circ_empty(xmit)) {
schedule_work(&s->work_tx);
- } else if (port->type = PORT_SCIFA) {
+ } else if (port->type = PORT_SCIFA || port->type = PORT_SCIFB) {
u16 ctrl = sci_in(port, SCSCR);
sci_out(port, SCSCR, ctrl & ~SCI_CTRL_FLAGS_TIE);
}
@@ -1180,7 +1201,7 @@ static void sci_start_tx(struct uart_port *port)
unsigned short ctrl;
#ifdef CONFIG_SERIAL_SH_SCI_DMA
- if (port->type = PORT_SCIFA) {
+ if (port->type = PORT_SCIFA || port->type = PORT_SCIFB) {
u16 new, scr = sci_in(port, SCSCR);
if (s->chan_tx)
new = scr | 0x8000;
@@ -1193,7 +1214,7 @@ static void sci_start_tx(struct uart_port *port)
s->cookie_tx < 0)
schedule_work(&s->work_tx);
#endif
- if (!s->chan_tx || port->type = PORT_SCIFA) {
+ if (!s->chan_tx || port->type = PORT_SCIFA || port->type = PORT_SCIFB) {
/* Set TIE (Transmit Interrupt Enable) bit in SCSCR */
ctrl = sci_in(port, SCSCR);
sci_out(port, SCSCR, ctrl | SCI_CTRL_FLAGS_TIE);
@@ -1206,7 +1227,7 @@ static void sci_stop_tx(struct uart_port *port)
/* Clear TIE (Transmit Interrupt Enable) bit in SCSCR */
ctrl = sci_in(port, SCSCR);
- if (port->type = PORT_SCIFA)
+ if (port->type = PORT_SCIFA || port->type = PORT_SCIFB)
ctrl &= ~0x8000;
ctrl &= ~SCI_CTRL_FLAGS_TIE;
sci_out(port, SCSCR, ctrl);
@@ -1218,7 +1239,7 @@ static void sci_start_rx(struct uart_port *port)
/* Set RIE (Receive Interrupt Enable) bit in SCSCR */
ctrl |= sci_in(port, SCSCR);
- if (port->type = PORT_SCIFA)
+ if (port->type = PORT_SCIFA || port->type = PORT_SCIFB)
ctrl &= ~0x4000;
sci_out(port, SCSCR, ctrl);
}
@@ -1229,7 +1250,7 @@ static void sci_stop_rx(struct uart_port *port)
/* Clear RIE (Receive Interrupt Enable) bit in SCSCR */
ctrl = sci_in(port, SCSCR);
- if (port->type = PORT_SCIFA)
+ if (port->type = PORT_SCIFA || port->type = PORT_SCIFB)
ctrl &= ~0x4000;
ctrl &= ~(SCI_CTRL_FLAGS_RIE | SCI_CTRL_FLAGS_REIE);
sci_out(port, SCSCR, ctrl);
@@ -1267,7 +1288,7 @@ static void rx_timer_fn(unsigned long arg)
struct uart_port *port = &s->port;
u16 scr = sci_in(port, SCSCR);
- if (port->type = PORT_SCIFA) {
+ if (port->type = PORT_SCIFA || port->type = PORT_SCIFB) {
scr &= ~0x4000;
enable_irq(s->irqs[1]);
}
@@ -1520,6 +1541,8 @@ static const char *sci_type(struct uart_port *port)
return "scif";
case PORT_SCIFA:
return "scifa";
+ case PORT_SCIFB:
+ return "scifb";
}
return NULL;
@@ -1608,6 +1631,9 @@ static int __devinit sci_init_single(struct platform_device *dev,
port->line = index;
switch (p->type) {
+ case PORT_SCIFB:
+ port->fifosize = 256;
+ break;
case PORT_SCIFA:
port->fifosize = 64;
break;
diff --git a/drivers/serial/sh-sci.h b/drivers/serial/sh-sci.h
index f70c49f..9b52f77 100644
--- a/drivers/serial/sh-sci.h
+++ b/drivers/serial/sh-sci.h
@@ -322,7 +322,7 @@
#define CPU_SCIx_FNS(name, sci_offset, sci_size, scif_offset, scif_size)\
static inline unsigned int sci_##name##_in(struct uart_port *port) \
{ \
- if (port->type = PORT_SCIF) { \
+ if (port->type = PORT_SCIF || port->type = PORT_SCIFB) { \
SCI_IN(scif_size, scif_offset) \
} else { /* PORT_SCI or PORT_SCIFA */ \
SCI_IN(sci_size, sci_offset); \
@@ -330,7 +330,7 @@
} \
static inline void sci_##name##_out(struct uart_port *port, unsigned int value) \
{ \
- if (port->type = PORT_SCIF) { \
+ if (port->type = PORT_SCIF || port->type = PORT_SCIFB) { \
SCI_OUT(scif_size, scif_offset, value) \
} else { /* PORT_SCI or PORT_SCIFA */ \
SCI_OUT(sci_size, sci_offset, value); \
@@ -384,8 +384,12 @@
defined(CONFIG_CPU_SUBTYPE_SH7720) || \
defined(CONFIG_CPU_SUBTYPE_SH7721) || \
defined(CONFIG_ARCH_SH7367) || \
- defined(CONFIG_ARCH_SH7377) || \
- defined(CONFIG_ARCH_SH7372)
+ defined(CONFIG_ARCH_SH7377)
+#define SCIF_FNS(name, scif_offset, scif_size) \
+ CPU_SCIF_FNS(name, scif_offset, scif_size)
+#elif defined(CONFIG_ARCH_SH7372)
+#define SCIx_FNS(name, sh4_scifa_offset, sh4_scifa_size, sh4_scifb_offset, sh4_scifb_size) \
+ CPU_SCIx_FNS(name, sh4_scifa_offset, sh4_scifa_size, sh4_scifb_offset, sh4_scifb_size)
#define SCIF_FNS(name, scif_offset, scif_size) \
CPU_SCIF_FNS(name, scif_offset, scif_size)
#else
@@ -422,8 +426,7 @@
defined(CONFIG_CPU_SUBTYPE_SH7720) || \
defined(CONFIG_CPU_SUBTYPE_SH7721) || \
defined(CONFIG_ARCH_SH7367) || \
- defined(CONFIG_ARCH_SH7377) || \
- defined(CONFIG_ARCH_SH7372)
+ defined(CONFIG_ARCH_SH7377)
SCIF_FNS(SCSMR, 0x00, 16)
SCIF_FNS(SCBRR, 0x04, 8)
@@ -436,6 +439,20 @@ SCIF_FNS(SCFDR, 0x1c, 16)
SCIF_FNS(SCxTDR, 0x20, 8)
SCIF_FNS(SCxRDR, 0x24, 8)
SCIF_FNS(SCLSR, 0x00, 0)
+#elif defined(CONFIG_ARCH_SH7372)
+SCIF_FNS(SCSMR, 0x00, 16)
+SCIF_FNS(SCBRR, 0x04, 8)
+SCIF_FNS(SCSCR, 0x08, 16)
+SCIF_FNS(SCTDSR, 0x0c, 16)
+SCIF_FNS(SCFER, 0x10, 16)
+SCIF_FNS(SCxSR, 0x14, 16)
+SCIF_FNS(SCFCR, 0x18, 16)
+SCIF_FNS(SCFDR, 0x1c, 16)
+SCIF_FNS(SCTFDR, 0x38, 16)
+SCIF_FNS(SCRFDR, 0x3c, 16)
+SCIx_FNS(SCxTDR, 0x20, 8, 0x40, 8)
+SCIx_FNS(SCxRDR, 0x24, 8, 0x60, 8)
+SCIF_FNS(SCLSR, 0x00, 0)
#elif defined(CONFIG_CPU_SUBTYPE_SH7723) ||\
defined(CONFIG_CPU_SUBTYPE_SH7724)
SCIx_FNS(SCSMR, 0x00, 16, 0x00, 16)
--
1.6.2.4
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 2/4] serial: sh-sci: fix handling of SCIFB sh-mobile ports
@ 2010-05-23 16:39 ` Guennadi Liakhovetski
0 siblings, 0 replies; 12+ messages in thread
From: Guennadi Liakhovetski @ 2010-05-23 16:39 UTC (permalink / raw)
To: linux-sh; +Cc: linux-serial, Paul Mundt
SCIFB ports have a slightly different register layout and a different FIFO
size from SCIFA ports, in DMA mode they have to be treated just like SCIFA.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
---
No change since the original version
drivers/serial/sh-sci.c | 42 ++++++++++++++++++++++++++++++++++--------
drivers/serial/sh-sci.h | 29 +++++++++++++++++++++++------
2 files changed, 57 insertions(+), 14 deletions(-)
diff --git a/drivers/serial/sh-sci.c b/drivers/serial/sh-sci.c
index b985ffd..17eceaa 100644
--- a/drivers/serial/sh-sci.c
+++ b/drivers/serial/sh-sci.c
@@ -342,6 +342,27 @@ static int scif_rxfill(struct uart_port *port)
return sci_in(port, SCFDR) & SCIF2_RFDC_MASK;
}
}
+#elif defined(CONFIG_ARCH_SH7372)
+static int scif_txfill(struct uart_port *port)
+{
+ if (port->type == PORT_SCIFA)
+ return sci_in(port, SCFDR) >> 8;
+ else
+ return sci_in(port, SCTFDR);
+}
+
+static int scif_txroom(struct uart_port *port)
+{
+ return port->fifosize - scif_txfill(port);
+}
+
+static int scif_rxfill(struct uart_port *port)
+{
+ if (port->type == PORT_SCIFA)
+ return sci_in(port, SCFDR) & SCIF_RFDC_MASK;
+ else
+ return sci_in(port, SCRFDR);
+}
#else
static int scif_txfill(struct uart_port *port)
{
@@ -679,7 +700,7 @@ static irqreturn_t sci_rx_interrupt(int irq, void *ptr)
u16 ssr = sci_in(port, SCxSR);
/* Disable future Rx interrupts */
- if (port->type == PORT_SCIFA) {
+ if (port->type == PORT_SCIFA || port->type == PORT_SCIFB) {
disable_irq_nosync(irq);
scr |= 0x4000;
} else {
@@ -924,7 +945,7 @@ static void sci_dma_tx_complete(void *arg)
if (!uart_circ_empty(xmit)) {
schedule_work(&s->work_tx);
- } else if (port->type == PORT_SCIFA) {
+ } else if (port->type == PORT_SCIFA || port->type == PORT_SCIFB) {
u16 ctrl = sci_in(port, SCSCR);
sci_out(port, SCSCR, ctrl & ~SCI_CTRL_FLAGS_TIE);
}
@@ -1180,7 +1201,7 @@ static void sci_start_tx(struct uart_port *port)
unsigned short ctrl;
#ifdef CONFIG_SERIAL_SH_SCI_DMA
- if (port->type == PORT_SCIFA) {
+ if (port->type == PORT_SCIFA || port->type == PORT_SCIFB) {
u16 new, scr = sci_in(port, SCSCR);
if (s->chan_tx)
new = scr | 0x8000;
@@ -1193,7 +1214,7 @@ static void sci_start_tx(struct uart_port *port)
s->cookie_tx < 0)
schedule_work(&s->work_tx);
#endif
- if (!s->chan_tx || port->type == PORT_SCIFA) {
+ if (!s->chan_tx || port->type == PORT_SCIFA || port->type == PORT_SCIFB) {
/* Set TIE (Transmit Interrupt Enable) bit in SCSCR */
ctrl = sci_in(port, SCSCR);
sci_out(port, SCSCR, ctrl | SCI_CTRL_FLAGS_TIE);
@@ -1206,7 +1227,7 @@ static void sci_stop_tx(struct uart_port *port)
/* Clear TIE (Transmit Interrupt Enable) bit in SCSCR */
ctrl = sci_in(port, SCSCR);
- if (port->type == PORT_SCIFA)
+ if (port->type == PORT_SCIFA || port->type == PORT_SCIFB)
ctrl &= ~0x8000;
ctrl &= ~SCI_CTRL_FLAGS_TIE;
sci_out(port, SCSCR, ctrl);
@@ -1218,7 +1239,7 @@ static void sci_start_rx(struct uart_port *port)
/* Set RIE (Receive Interrupt Enable) bit in SCSCR */
ctrl |= sci_in(port, SCSCR);
- if (port->type == PORT_SCIFA)
+ if (port->type == PORT_SCIFA || port->type == PORT_SCIFB)
ctrl &= ~0x4000;
sci_out(port, SCSCR, ctrl);
}
@@ -1229,7 +1250,7 @@ static void sci_stop_rx(struct uart_port *port)
/* Clear RIE (Receive Interrupt Enable) bit in SCSCR */
ctrl = sci_in(port, SCSCR);
- if (port->type == PORT_SCIFA)
+ if (port->type == PORT_SCIFA || port->type == PORT_SCIFB)
ctrl &= ~0x4000;
ctrl &= ~(SCI_CTRL_FLAGS_RIE | SCI_CTRL_FLAGS_REIE);
sci_out(port, SCSCR, ctrl);
@@ -1267,7 +1288,7 @@ static void rx_timer_fn(unsigned long arg)
struct uart_port *port = &s->port;
u16 scr = sci_in(port, SCSCR);
- if (port->type == PORT_SCIFA) {
+ if (port->type == PORT_SCIFA || port->type == PORT_SCIFB) {
scr &= ~0x4000;
enable_irq(s->irqs[1]);
}
@@ -1520,6 +1541,8 @@ static const char *sci_type(struct uart_port *port)
return "scif";
case PORT_SCIFA:
return "scifa";
+ case PORT_SCIFB:
+ return "scifb";
}
return NULL;
@@ -1608,6 +1631,9 @@ static int __devinit sci_init_single(struct platform_device *dev,
port->line = index;
switch (p->type) {
+ case PORT_SCIFB:
+ port->fifosize = 256;
+ break;
case PORT_SCIFA:
port->fifosize = 64;
break;
diff --git a/drivers/serial/sh-sci.h b/drivers/serial/sh-sci.h
index f70c49f..9b52f77 100644
--- a/drivers/serial/sh-sci.h
+++ b/drivers/serial/sh-sci.h
@@ -322,7 +322,7 @@
#define CPU_SCIx_FNS(name, sci_offset, sci_size, scif_offset, scif_size)\
static inline unsigned int sci_##name##_in(struct uart_port *port) \
{ \
- if (port->type == PORT_SCIF) { \
+ if (port->type == PORT_SCIF || port->type == PORT_SCIFB) { \
SCI_IN(scif_size, scif_offset) \
} else { /* PORT_SCI or PORT_SCIFA */ \
SCI_IN(sci_size, sci_offset); \
@@ -330,7 +330,7 @@
} \
static inline void sci_##name##_out(struct uart_port *port, unsigned int value) \
{ \
- if (port->type == PORT_SCIF) { \
+ if (port->type == PORT_SCIF || port->type == PORT_SCIFB) { \
SCI_OUT(scif_size, scif_offset, value) \
} else { /* PORT_SCI or PORT_SCIFA */ \
SCI_OUT(sci_size, sci_offset, value); \
@@ -384,8 +384,12 @@
defined(CONFIG_CPU_SUBTYPE_SH7720) || \
defined(CONFIG_CPU_SUBTYPE_SH7721) || \
defined(CONFIG_ARCH_SH7367) || \
- defined(CONFIG_ARCH_SH7377) || \
- defined(CONFIG_ARCH_SH7372)
+ defined(CONFIG_ARCH_SH7377)
+#define SCIF_FNS(name, scif_offset, scif_size) \
+ CPU_SCIF_FNS(name, scif_offset, scif_size)
+#elif defined(CONFIG_ARCH_SH7372)
+#define SCIx_FNS(name, sh4_scifa_offset, sh4_scifa_size, sh4_scifb_offset, sh4_scifb_size) \
+ CPU_SCIx_FNS(name, sh4_scifa_offset, sh4_scifa_size, sh4_scifb_offset, sh4_scifb_size)
#define SCIF_FNS(name, scif_offset, scif_size) \
CPU_SCIF_FNS(name, scif_offset, scif_size)
#else
@@ -422,8 +426,7 @@
defined(CONFIG_CPU_SUBTYPE_SH7720) || \
defined(CONFIG_CPU_SUBTYPE_SH7721) || \
defined(CONFIG_ARCH_SH7367) || \
- defined(CONFIG_ARCH_SH7377) || \
- defined(CONFIG_ARCH_SH7372)
+ defined(CONFIG_ARCH_SH7377)
SCIF_FNS(SCSMR, 0x00, 16)
SCIF_FNS(SCBRR, 0x04, 8)
@@ -436,6 +439,20 @@ SCIF_FNS(SCFDR, 0x1c, 16)
SCIF_FNS(SCxTDR, 0x20, 8)
SCIF_FNS(SCxRDR, 0x24, 8)
SCIF_FNS(SCLSR, 0x00, 0)
+#elif defined(CONFIG_ARCH_SH7372)
+SCIF_FNS(SCSMR, 0x00, 16)
+SCIF_FNS(SCBRR, 0x04, 8)
+SCIF_FNS(SCSCR, 0x08, 16)
+SCIF_FNS(SCTDSR, 0x0c, 16)
+SCIF_FNS(SCFER, 0x10, 16)
+SCIF_FNS(SCxSR, 0x14, 16)
+SCIF_FNS(SCFCR, 0x18, 16)
+SCIF_FNS(SCFDR, 0x1c, 16)
+SCIF_FNS(SCTFDR, 0x38, 16)
+SCIF_FNS(SCRFDR, 0x3c, 16)
+SCIx_FNS(SCxTDR, 0x20, 8, 0x40, 8)
+SCIx_FNS(SCxRDR, 0x24, 8, 0x60, 8)
+SCIF_FNS(SCLSR, 0x00, 0)
#elif defined(CONFIG_CPU_SUBTYPE_SH7723) ||\
defined(CONFIG_CPU_SUBTYPE_SH7724)
SCIx_FNS(SCSMR, 0x00, 16, 0x00, 16)
--
1.6.2.4
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 3/4] ARM: mach-shmobile: SH7372 has 6 SCIFA and 1 SCIFB ports
2010-05-23 16:39 ` [PATCH 1/4 v2] serial: add a new port type, found on some sh-mobile SoCs Guennadi Liakhovetski
@ 2010-05-23 16:39 ` Guennadi Liakhovetski
-1 siblings, 0 replies; 12+ messages in thread
From: Guennadi Liakhovetski @ 2010-05-23 16:39 UTC (permalink / raw)
To: linux-sh; +Cc: linux-serial, Paul Mundt
The current SH7372 setup code registers 7 SCIF ports, which is wrong.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
---
no change
arch/arm/mach-shmobile/setup-sh7372.c | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/arch/arm/mach-shmobile/setup-sh7372.c b/arch/arm/mach-shmobile/setup-sh7372.c
index 0a834d3..cc040a8 100644
--- a/arch/arm/mach-shmobile/setup-sh7372.c
+++ b/arch/arm/mach-shmobile/setup-sh7372.c
@@ -256,7 +256,7 @@ static struct platform_device dma2_device = {
static struct plat_sci_port scif0_platform_data = {
.mapbase = 0xe6c40000,
.flags = UPF_BOOT_AUTOCONF,
- .type = PORT_SCIF,
+ .type = PORT_SCIFA,
.irqs = { 80, 80, 80, 80 },
};
@@ -271,7 +271,7 @@ static struct platform_device scif0_device = {
static struct plat_sci_port scif1_platform_data = {
.mapbase = 0xe6c50000,
.flags = UPF_BOOT_AUTOCONF,
- .type = PORT_SCIF,
+ .type = PORT_SCIFA,
.irqs = { 81, 81, 81, 81 },
};
@@ -286,7 +286,7 @@ static struct platform_device scif1_device = {
static struct plat_sci_port scif2_platform_data = {
.mapbase = 0xe6c60000,
.flags = UPF_BOOT_AUTOCONF,
- .type = PORT_SCIF,
+ .type = PORT_SCIFA,
.irqs = { 82, 82, 82, 82 },
};
@@ -301,7 +301,7 @@ static struct platform_device scif2_device = {
static struct plat_sci_port scif3_platform_data = {
.mapbase = 0xe6c70000,
.flags = UPF_BOOT_AUTOCONF,
- .type = PORT_SCIF,
+ .type = PORT_SCIFA,
.irqs = { 83, 83, 83, 83 },
};
@@ -316,7 +316,7 @@ static struct platform_device scif3_device = {
static struct plat_sci_port scif4_platform_data = {
.mapbase = 0xe6c80000,
.flags = UPF_BOOT_AUTOCONF,
- .type = PORT_SCIF,
+ .type = PORT_SCIFA,
.irqs = { 89, 89, 89, 89 },
};
@@ -331,7 +331,7 @@ static struct platform_device scif4_device = {
static struct plat_sci_port scif5_platform_data = {
.mapbase = 0xe6cb0000,
.flags = UPF_BOOT_AUTOCONF,
- .type = PORT_SCIF,
+ .type = PORT_SCIFA,
.irqs = { 90, 90, 90, 90 },
};
@@ -346,7 +346,7 @@ static struct platform_device scif5_device = {
static struct plat_sci_port scif6_platform_data = {
.mapbase = 0xe6c30000,
.flags = UPF_BOOT_AUTOCONF,
- .type = PORT_SCIF,
+ .type = PORT_SCIFB,
.irqs = { 91, 91, 91, 91 },
};
--
1.6.2.4
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 3/4] ARM: mach-shmobile: SH7372 has 6 SCIFA and 1 SCIFB ports
@ 2010-05-23 16:39 ` Guennadi Liakhovetski
0 siblings, 0 replies; 12+ messages in thread
From: Guennadi Liakhovetski @ 2010-05-23 16:39 UTC (permalink / raw)
To: linux-sh; +Cc: linux-serial, Paul Mundt
The current SH7372 setup code registers 7 SCIF ports, which is wrong.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
---
no change
arch/arm/mach-shmobile/setup-sh7372.c | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/arch/arm/mach-shmobile/setup-sh7372.c b/arch/arm/mach-shmobile/setup-sh7372.c
index 0a834d3..cc040a8 100644
--- a/arch/arm/mach-shmobile/setup-sh7372.c
+++ b/arch/arm/mach-shmobile/setup-sh7372.c
@@ -256,7 +256,7 @@ static struct platform_device dma2_device = {
static struct plat_sci_port scif0_platform_data = {
.mapbase = 0xe6c40000,
.flags = UPF_BOOT_AUTOCONF,
- .type = PORT_SCIF,
+ .type = PORT_SCIFA,
.irqs = { 80, 80, 80, 80 },
};
@@ -271,7 +271,7 @@ static struct platform_device scif0_device = {
static struct plat_sci_port scif1_platform_data = {
.mapbase = 0xe6c50000,
.flags = UPF_BOOT_AUTOCONF,
- .type = PORT_SCIF,
+ .type = PORT_SCIFA,
.irqs = { 81, 81, 81, 81 },
};
@@ -286,7 +286,7 @@ static struct platform_device scif1_device = {
static struct plat_sci_port scif2_platform_data = {
.mapbase = 0xe6c60000,
.flags = UPF_BOOT_AUTOCONF,
- .type = PORT_SCIF,
+ .type = PORT_SCIFA,
.irqs = { 82, 82, 82, 82 },
};
@@ -301,7 +301,7 @@ static struct platform_device scif2_device = {
static struct plat_sci_port scif3_platform_data = {
.mapbase = 0xe6c70000,
.flags = UPF_BOOT_AUTOCONF,
- .type = PORT_SCIF,
+ .type = PORT_SCIFA,
.irqs = { 83, 83, 83, 83 },
};
@@ -316,7 +316,7 @@ static struct platform_device scif3_device = {
static struct plat_sci_port scif4_platform_data = {
.mapbase = 0xe6c80000,
.flags = UPF_BOOT_AUTOCONF,
- .type = PORT_SCIF,
+ .type = PORT_SCIFA,
.irqs = { 89, 89, 89, 89 },
};
@@ -331,7 +331,7 @@ static struct platform_device scif4_device = {
static struct plat_sci_port scif5_platform_data = {
.mapbase = 0xe6cb0000,
.flags = UPF_BOOT_AUTOCONF,
- .type = PORT_SCIF,
+ .type = PORT_SCIFA,
.irqs = { 90, 90, 90, 90 },
};
@@ -346,7 +346,7 @@ static struct platform_device scif5_device = {
static struct plat_sci_port scif6_platform_data = {
.mapbase = 0xe6c30000,
.flags = UPF_BOOT_AUTOCONF,
- .type = PORT_SCIF,
+ .type = PORT_SCIFB,
.irqs = { 91, 91, 91, 91 },
};
--
1.6.2.4
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 4/4 v2] ARM: mach-shmobile: add SCIFA and SCIFB DMA slave
2010-05-23 16:39 ` [PATCH 1/4 v2] serial: add a new port type, found on some sh-mobile SoCs Guennadi Liakhovetski
@ 2010-05-23 16:39 ` Guennadi Liakhovetski
-1 siblings, 0 replies; 12+ messages in thread
From: Guennadi Liakhovetski @ 2010-05-23 16:39 UTC (permalink / raw)
To: linux-sh; +Cc: linux-serial, Paul Mundt
SH7372 can use DMA with the SCI serial driver. Add required slave IDs and slave
descriptors.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
---
v1 -> v2:
No need to move DMA platform devices to the top, they are placed correctly
by the new version of the
[PATCH 9/9 v2] ARM: mach-shmobile: add DMA support to sh7372, enable DMA for SDHI
patch
arch/arm/mach-shmobile/include/mach/sh7372.h | 14 +++++
arch/arm/mach-shmobile/setup-sh7372.c | 70 ++++++++++++++++++++++++++
2 files changed, 84 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-shmobile/include/mach/sh7372.h b/arch/arm/mach-shmobile/include/mach/sh7372.h
index 57e033a..c2d2d81 100644
--- a/arch/arm/mach-shmobile/include/mach/sh7372.h
+++ b/arch/arm/mach-shmobile/include/mach/sh7372.h
@@ -433,6 +433,20 @@ enum {
/* DMA slave IDs */
enum {
+ SHDMA_SLAVE_SCIF0_TX,
+ SHDMA_SLAVE_SCIF0_RX,
+ SHDMA_SLAVE_SCIF1_TX,
+ SHDMA_SLAVE_SCIF1_RX,
+ SHDMA_SLAVE_SCIF2_TX,
+ SHDMA_SLAVE_SCIF2_RX,
+ SHDMA_SLAVE_SCIF3_TX,
+ SHDMA_SLAVE_SCIF3_RX,
+ SHDMA_SLAVE_SCIF4_TX,
+ SHDMA_SLAVE_SCIF4_RX,
+ SHDMA_SLAVE_SCIF5_TX,
+ SHDMA_SLAVE_SCIF5_RX,
+ SHDMA_SLAVE_SCIF6_TX,
+ SHDMA_SLAVE_SCIF6_RX,
SHDMA_SLAVE_SDHI0_RX,
SHDMA_SLAVE_SDHI0_TX,
SHDMA_SLAVE_SDHI1_RX,
diff --git a/arch/arm/mach-shmobile/setup-sh7372.c b/arch/arm/mach-shmobile/setup-sh7372.c
index cc040a8..ce50184 100644
--- a/arch/arm/mach-shmobile/setup-sh7372.c
+++ b/arch/arm/mach-shmobile/setup-sh7372.c
@@ -62,6 +62,76 @@ enum {
static const struct sh_dmae_slave_config sh7724_dmae_slaves[] = {
{
+ .slave_id = SHDMA_SLAVE_SCIF0_TX,
+ .addr = 0xe6c40020,
+ .chcr = DM_FIX | SM_INC | 0x800 | TS_INDEX2VAL(XMIT_SZ_8BIT),
+ .mid_rid = 0x21,
+ }, {
+ .slave_id = SHDMA_SLAVE_SCIF0_RX,
+ .addr = 0xe6c40024,
+ .chcr = DM_INC | SM_FIX | 0x800 | TS_INDEX2VAL(XMIT_SZ_8BIT),
+ .mid_rid = 0x22,
+ }, {
+ .slave_id = SHDMA_SLAVE_SCIF1_TX,
+ .addr = 0xe6c50020,
+ .chcr = DM_FIX | SM_INC | 0x800 | TS_INDEX2VAL(XMIT_SZ_8BIT),
+ .mid_rid = 0x25,
+ }, {
+ .slave_id = SHDMA_SLAVE_SCIF1_RX,
+ .addr = 0xe6c50024,
+ .chcr = DM_INC | SM_FIX | 0x800 | TS_INDEX2VAL(XMIT_SZ_8BIT),
+ .mid_rid = 0x26,
+ }, {
+ .slave_id = SHDMA_SLAVE_SCIF2_TX,
+ .addr = 0xe6c60020,
+ .chcr = DM_FIX | SM_INC | 0x800 | TS_INDEX2VAL(XMIT_SZ_8BIT),
+ .mid_rid = 0x29,
+ }, {
+ .slave_id = SHDMA_SLAVE_SCIF2_RX,
+ .addr = 0xe6c60024,
+ .chcr = DM_INC | SM_FIX | 0x800 | TS_INDEX2VAL(XMIT_SZ_8BIT),
+ .mid_rid = 0x2a,
+ }, {
+ .slave_id = SHDMA_SLAVE_SCIF3_TX,
+ .addr = 0xe6c70020,
+ .chcr = DM_FIX | SM_INC | 0x800 | TS_INDEX2VAL(XMIT_SZ_8BIT),
+ .mid_rid = 0x2d,
+ }, {
+ .slave_id = SHDMA_SLAVE_SCIF3_RX,
+ .addr = 0xe6c70024,
+ .chcr = DM_INC | SM_FIX | 0x800 | TS_INDEX2VAL(XMIT_SZ_8BIT),
+ .mid_rid = 0x2e,
+ }, {
+ .slave_id = SHDMA_SLAVE_SCIF4_TX,
+ .addr = 0xe6c80020,
+ .chcr = DM_FIX | SM_INC | 0x800 | TS_INDEX2VAL(XMIT_SZ_8BIT),
+ .mid_rid = 0x39,
+ }, {
+ .slave_id = SHDMA_SLAVE_SCIF4_RX,
+ .addr = 0xe6c80024,
+ .chcr = DM_INC | SM_FIX | 0x800 | TS_INDEX2VAL(XMIT_SZ_8BIT),
+ .mid_rid = 0x3a,
+ }, {
+ .slave_id = SHDMA_SLAVE_SCIF5_TX,
+ .addr = 0xe6cb0020,
+ .chcr = DM_FIX | SM_INC | 0x800 | TS_INDEX2VAL(XMIT_SZ_8BIT),
+ .mid_rid = 0x35,
+ }, {
+ .slave_id = SHDMA_SLAVE_SCIF5_RX,
+ .addr = 0xe6cb0024,
+ .chcr = DM_INC | SM_FIX | 0x800 | TS_INDEX2VAL(XMIT_SZ_8BIT),
+ .mid_rid = 0x36,
+ }, {
+ .slave_id = SHDMA_SLAVE_SCIF6_TX,
+ .addr = 0xe6c30040,
+ .chcr = DM_FIX | SM_INC | 0x800 | TS_INDEX2VAL(XMIT_SZ_8BIT),
+ .mid_rid = 0x3d,
+ }, {
+ .slave_id = SHDMA_SLAVE_SCIF6_RX,
+ .addr = 0xe6c30060,
+ .chcr = DM_INC | SM_FIX | 0x800 | TS_INDEX2VAL(XMIT_SZ_8BIT),
+ .mid_rid = 0x3e,
+ }, {
.slave_id = SHDMA_SLAVE_SDHI0_TX,
.addr = 0xe6850030,
.chcr = DM_FIX | SM_INC | 0x800 | TS_INDEX2VAL(XMIT_SZ_16BIT),
--
1.6.2.4
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 4/4 v2] ARM: mach-shmobile: add SCIFA and SCIFB DMA slave definitions for sh7372
@ 2010-05-23 16:39 ` Guennadi Liakhovetski
0 siblings, 0 replies; 12+ messages in thread
From: Guennadi Liakhovetski @ 2010-05-23 16:39 UTC (permalink / raw)
To: linux-sh; +Cc: linux-serial, Paul Mundt
SH7372 can use DMA with the SCI serial driver. Add required slave IDs and slave
descriptors.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
---
v1 -> v2:
No need to move DMA platform devices to the top, they are placed correctly
by the new version of the
[PATCH 9/9 v2] ARM: mach-shmobile: add DMA support to sh7372, enable DMA for SDHI
patch
arch/arm/mach-shmobile/include/mach/sh7372.h | 14 +++++
arch/arm/mach-shmobile/setup-sh7372.c | 70 ++++++++++++++++++++++++++
2 files changed, 84 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-shmobile/include/mach/sh7372.h b/arch/arm/mach-shmobile/include/mach/sh7372.h
index 57e033a..c2d2d81 100644
--- a/arch/arm/mach-shmobile/include/mach/sh7372.h
+++ b/arch/arm/mach-shmobile/include/mach/sh7372.h
@@ -433,6 +433,20 @@ enum {
/* DMA slave IDs */
enum {
+ SHDMA_SLAVE_SCIF0_TX,
+ SHDMA_SLAVE_SCIF0_RX,
+ SHDMA_SLAVE_SCIF1_TX,
+ SHDMA_SLAVE_SCIF1_RX,
+ SHDMA_SLAVE_SCIF2_TX,
+ SHDMA_SLAVE_SCIF2_RX,
+ SHDMA_SLAVE_SCIF3_TX,
+ SHDMA_SLAVE_SCIF3_RX,
+ SHDMA_SLAVE_SCIF4_TX,
+ SHDMA_SLAVE_SCIF4_RX,
+ SHDMA_SLAVE_SCIF5_TX,
+ SHDMA_SLAVE_SCIF5_RX,
+ SHDMA_SLAVE_SCIF6_TX,
+ SHDMA_SLAVE_SCIF6_RX,
SHDMA_SLAVE_SDHI0_RX,
SHDMA_SLAVE_SDHI0_TX,
SHDMA_SLAVE_SDHI1_RX,
diff --git a/arch/arm/mach-shmobile/setup-sh7372.c b/arch/arm/mach-shmobile/setup-sh7372.c
index cc040a8..ce50184 100644
--- a/arch/arm/mach-shmobile/setup-sh7372.c
+++ b/arch/arm/mach-shmobile/setup-sh7372.c
@@ -62,6 +62,76 @@ enum {
static const struct sh_dmae_slave_config sh7724_dmae_slaves[] = {
{
+ .slave_id = SHDMA_SLAVE_SCIF0_TX,
+ .addr = 0xe6c40020,
+ .chcr = DM_FIX | SM_INC | 0x800 | TS_INDEX2VAL(XMIT_SZ_8BIT),
+ .mid_rid = 0x21,
+ }, {
+ .slave_id = SHDMA_SLAVE_SCIF0_RX,
+ .addr = 0xe6c40024,
+ .chcr = DM_INC | SM_FIX | 0x800 | TS_INDEX2VAL(XMIT_SZ_8BIT),
+ .mid_rid = 0x22,
+ }, {
+ .slave_id = SHDMA_SLAVE_SCIF1_TX,
+ .addr = 0xe6c50020,
+ .chcr = DM_FIX | SM_INC | 0x800 | TS_INDEX2VAL(XMIT_SZ_8BIT),
+ .mid_rid = 0x25,
+ }, {
+ .slave_id = SHDMA_SLAVE_SCIF1_RX,
+ .addr = 0xe6c50024,
+ .chcr = DM_INC | SM_FIX | 0x800 | TS_INDEX2VAL(XMIT_SZ_8BIT),
+ .mid_rid = 0x26,
+ }, {
+ .slave_id = SHDMA_SLAVE_SCIF2_TX,
+ .addr = 0xe6c60020,
+ .chcr = DM_FIX | SM_INC | 0x800 | TS_INDEX2VAL(XMIT_SZ_8BIT),
+ .mid_rid = 0x29,
+ }, {
+ .slave_id = SHDMA_SLAVE_SCIF2_RX,
+ .addr = 0xe6c60024,
+ .chcr = DM_INC | SM_FIX | 0x800 | TS_INDEX2VAL(XMIT_SZ_8BIT),
+ .mid_rid = 0x2a,
+ }, {
+ .slave_id = SHDMA_SLAVE_SCIF3_TX,
+ .addr = 0xe6c70020,
+ .chcr = DM_FIX | SM_INC | 0x800 | TS_INDEX2VAL(XMIT_SZ_8BIT),
+ .mid_rid = 0x2d,
+ }, {
+ .slave_id = SHDMA_SLAVE_SCIF3_RX,
+ .addr = 0xe6c70024,
+ .chcr = DM_INC | SM_FIX | 0x800 | TS_INDEX2VAL(XMIT_SZ_8BIT),
+ .mid_rid = 0x2e,
+ }, {
+ .slave_id = SHDMA_SLAVE_SCIF4_TX,
+ .addr = 0xe6c80020,
+ .chcr = DM_FIX | SM_INC | 0x800 | TS_INDEX2VAL(XMIT_SZ_8BIT),
+ .mid_rid = 0x39,
+ }, {
+ .slave_id = SHDMA_SLAVE_SCIF4_RX,
+ .addr = 0xe6c80024,
+ .chcr = DM_INC | SM_FIX | 0x800 | TS_INDEX2VAL(XMIT_SZ_8BIT),
+ .mid_rid = 0x3a,
+ }, {
+ .slave_id = SHDMA_SLAVE_SCIF5_TX,
+ .addr = 0xe6cb0020,
+ .chcr = DM_FIX | SM_INC | 0x800 | TS_INDEX2VAL(XMIT_SZ_8BIT),
+ .mid_rid = 0x35,
+ }, {
+ .slave_id = SHDMA_SLAVE_SCIF5_RX,
+ .addr = 0xe6cb0024,
+ .chcr = DM_INC | SM_FIX | 0x800 | TS_INDEX2VAL(XMIT_SZ_8BIT),
+ .mid_rid = 0x36,
+ }, {
+ .slave_id = SHDMA_SLAVE_SCIF6_TX,
+ .addr = 0xe6c30040,
+ .chcr = DM_FIX | SM_INC | 0x800 | TS_INDEX2VAL(XMIT_SZ_8BIT),
+ .mid_rid = 0x3d,
+ }, {
+ .slave_id = SHDMA_SLAVE_SCIF6_RX,
+ .addr = 0xe6c30060,
+ .chcr = DM_INC | SM_FIX | 0x800 | TS_INDEX2VAL(XMIT_SZ_8BIT),
+ .mid_rid = 0x3e,
+ }, {
.slave_id = SHDMA_SLAVE_SDHI0_TX,
.addr = 0xe6850030,
.chcr = DM_FIX | SM_INC | 0x800 | TS_INDEX2VAL(XMIT_SZ_16BIT),
--
1.6.2.4
^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH 4/4 v2] ARM: mach-shmobile: add SCIFA and SCIFB DMA slave definitions for sh7372
2010-05-23 16:39 ` [PATCH 4/4 v2] ARM: mach-shmobile: add SCIFA and SCIFB DMA slave definitions for sh7372 Guennadi Liakhovetski
@ 2010-05-31 4:51 ` Paul Mundt
-1 siblings, 0 replies; 12+ messages in thread
From: Paul Mundt @ 2010-05-31 4:51 UTC (permalink / raw)
To: Guennadi Liakhovetski; +Cc: linux-sh, linux-serial
On Sun, May 23, 2010 at 06:39:24PM +0200, Guennadi Liakhovetski wrote:
> SH7372 can use DMA with the SCI serial driver. Add required slave IDs and slave
> descriptors.
>
> Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
> ---
>
> v1 -> v2:
>
> No need to move DMA platform devices to the top, they are placed correctly
> by the new version of the
>
> [PATCH 9/9 v2] ARM: mach-shmobile: add DMA support to sh7372, enable DMA for SDHI
>
> patch
>
> arch/arm/mach-shmobile/include/mach/sh7372.h | 14 +++++
> arch/arm/mach-shmobile/setup-sh7372.c | 70 ++++++++++++++++++++++++++
> 2 files changed, 84 insertions(+), 0 deletions(-)
>
This is applied now, too.
You may want to double check to make sure all of the correct versions
have been applied and that you have nothing more outstanding.
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 4/4 v2] ARM: mach-shmobile: add SCIFA and SCIFB DMA slave definitions for sh7372
@ 2010-05-31 4:51 ` Paul Mundt
0 siblings, 0 replies; 12+ messages in thread
From: Paul Mundt @ 2010-05-31 4:51 UTC (permalink / raw)
To: Guennadi Liakhovetski; +Cc: linux-sh, linux-serial
On Sun, May 23, 2010 at 06:39:24PM +0200, Guennadi Liakhovetski wrote:
> SH7372 can use DMA with the SCI serial driver. Add required slave IDs and slave
> descriptors.
>
> Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
> ---
>
> v1 -> v2:
>
> No need to move DMA platform devices to the top, they are placed correctly
> by the new version of the
>
> [PATCH 9/9 v2] ARM: mach-shmobile: add DMA support to sh7372, enable DMA for SDHI
>
> patch
>
> arch/arm/mach-shmobile/include/mach/sh7372.h | 14 +++++
> arch/arm/mach-shmobile/setup-sh7372.c | 70 ++++++++++++++++++++++++++
> 2 files changed, 84 insertions(+), 0 deletions(-)
>
This is applied now, too.
You may want to double check to make sure all of the correct versions
have been applied and that you have nothing more outstanding.
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 4/4 v2] ARM: mach-shmobile: add SCIFA and SCIFB DMA slave
2010-05-31 4:51 ` Paul Mundt
@ 2010-06-01 7:30 ` Guennadi Liakhovetski
-1 siblings, 0 replies; 12+ messages in thread
From: Guennadi Liakhovetski @ 2010-06-01 7:30 UTC (permalink / raw)
To: Paul Mundt; +Cc: linux-sh, linux-serial
On Mon, 31 May 2010, Paul Mundt wrote:
> On Sun, May 23, 2010 at 06:39:24PM +0200, Guennadi Liakhovetski wrote:
> > SH7372 can use DMA with the SCI serial driver. Add required slave IDs and slave
> > descriptors.
> >
> > Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
> > ---
> >
> > v1 -> v2:
> >
> > No need to move DMA platform devices to the top, they are placed correctly
> > by the new version of the
> >
> > [PATCH 9/9 v2] ARM: mach-shmobile: add DMA support to sh7372, enable DMA for SDHI
> >
> > patch
> >
> > arch/arm/mach-shmobile/include/mach/sh7372.h | 14 +++++
> > arch/arm/mach-shmobile/setup-sh7372.c | 70 ++++++++++++++++++++++++++
> > 2 files changed, 84 insertions(+), 0 deletions(-)
> >
> This is applied now, too.
>
> You may want to double check to make sure all of the correct versions
> have been applied and that you have nothing more outstanding.
Apart from a wrong version of the "add DMA support to sh7372, enable DMA
for SDHI" patch, which doesn't change much, the rest looks good to me.
Thanks!
Guennadi
---
Guennadi Liakhovetski, Ph.D.
Freelance Open-Source Software Developer
http://www.open-technology.de/
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH 4/4 v2] ARM: mach-shmobile: add SCIFA and SCIFB DMA slave definitions for sh7372
@ 2010-06-01 7:30 ` Guennadi Liakhovetski
0 siblings, 0 replies; 12+ messages in thread
From: Guennadi Liakhovetski @ 2010-06-01 7:30 UTC (permalink / raw)
To: Paul Mundt; +Cc: linux-sh, linux-serial
On Mon, 31 May 2010, Paul Mundt wrote:
> On Sun, May 23, 2010 at 06:39:24PM +0200, Guennadi Liakhovetski wrote:
> > SH7372 can use DMA with the SCI serial driver. Add required slave IDs and slave
> > descriptors.
> >
> > Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
> > ---
> >
> > v1 -> v2:
> >
> > No need to move DMA platform devices to the top, they are placed correctly
> > by the new version of the
> >
> > [PATCH 9/9 v2] ARM: mach-shmobile: add DMA support to sh7372, enable DMA for SDHI
> >
> > patch
> >
> > arch/arm/mach-shmobile/include/mach/sh7372.h | 14 +++++
> > arch/arm/mach-shmobile/setup-sh7372.c | 70 ++++++++++++++++++++++++++
> > 2 files changed, 84 insertions(+), 0 deletions(-)
> >
> This is applied now, too.
>
> You may want to double check to make sure all of the correct versions
> have been applied and that you have nothing more outstanding.
Apart from a wrong version of the "add DMA support to sh7372, enable DMA
for SDHI" patch, which doesn't change much, the rest looks good to me.
Thanks!
Guennadi
---
Guennadi Liakhovetski, Ph.D.
Freelance Open-Source Software Developer
http://www.open-technology.de/
^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2010-06-01 7:30 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-05-23 16:39 [PATCH 1/4 v2] serial: add a new port type, found on some sh-mobile Guennadi Liakhovetski
2010-05-23 16:39 ` [PATCH 1/4 v2] serial: add a new port type, found on some sh-mobile SoCs Guennadi Liakhovetski
2010-05-23 16:39 ` [PATCH 2/4] serial: sh-sci: fix handling of SCIFB sh-mobile ports Guennadi Liakhovetski
2010-05-23 16:39 ` Guennadi Liakhovetski
2010-05-23 16:39 ` [PATCH 3/4] ARM: mach-shmobile: SH7372 has 6 SCIFA and 1 SCIFB ports Guennadi Liakhovetski
2010-05-23 16:39 ` Guennadi Liakhovetski
2010-05-23 16:39 ` [PATCH 4/4 v2] ARM: mach-shmobile: add SCIFA and SCIFB DMA slave Guennadi Liakhovetski
2010-05-23 16:39 ` [PATCH 4/4 v2] ARM: mach-shmobile: add SCIFA and SCIFB DMA slave definitions for sh7372 Guennadi Liakhovetski
2010-05-31 4:51 ` Paul Mundt
2010-05-31 4:51 ` Paul Mundt
2010-06-01 7:30 ` [PATCH 4/4 v2] ARM: mach-shmobile: add SCIFA and SCIFB DMA slave Guennadi Liakhovetski
2010-06-01 7:30 ` [PATCH 4/4 v2] ARM: mach-shmobile: add SCIFA and SCIFB DMA slave definitions for sh7372 Guennadi Liakhovetski
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.