diff options
author | Paul Mundt <lethal@linux-sh.org> | 2011-06-15 18:03:58 +0900 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2011-06-15 18:03:58 +0900 |
commit | 1f83812d61de8c09ad6ab6be29e0ebd0817d16f1 (patch) | |
tree | 32cc463e07a5efd7ec4702df003780664f543d5c /arch/sh/kernel/cpu/sh4/setup-sh7760.c | |
parent | 201fbceb258650157fcc4fd746abcdd3a571eada (diff) | |
parent | 4b8c59a3d83e9cf2b65b16999a0c704fc72de056 (diff) | |
download | op-kernel-dev-1f83812d61de8c09ad6ab6be29e0ebd0817d16f1.zip op-kernel-dev-1f83812d61de8c09ad6ab6be29e0ebd0817d16f1.tar.gz |
Merge branch 'common/serial-rework' into sh-latest
Diffstat (limited to 'arch/sh/kernel/cpu/sh4/setup-sh7760.c')
-rw-r--r-- | arch/sh/kernel/cpu/sh4/setup-sh7760.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/sh/kernel/cpu/sh4/setup-sh7760.c b/arch/sh/kernel/cpu/sh4/setup-sh7760.c index 78bbf23..c0b4c77 100644 --- a/arch/sh/kernel/cpu/sh4/setup-sh7760.c +++ b/arch/sh/kernel/cpu/sh4/setup-sh7760.c @@ -133,6 +133,7 @@ static struct plat_sci_port scif0_platform_data = { .scbrr_algo_id = SCBRR_ALGO_2, .type = PORT_SCIF, .irqs = { 52, 53, 55, 54 }, + .regtype = SCIx_SH4_SCIF_FIFODATA_REGTYPE, }; static struct platform_device scif0_device = { @@ -150,6 +151,7 @@ static struct plat_sci_port scif1_platform_data = { .scscr = SCSCR_RE | SCSCR_TE | SCSCR_REIE, .scbrr_algo_id = SCBRR_ALGO_2, .irqs = { 72, 73, 75, 74 }, + .regtype = SCIx_SH4_SCIF_FIFODATA_REGTYPE, }; static struct platform_device scif1_device = { @@ -167,6 +169,7 @@ static struct plat_sci_port scif2_platform_data = { .scbrr_algo_id = SCBRR_ALGO_2, .type = PORT_SCIF, .irqs = { 76, 77, 79, 78 }, + .regtype = SCIx_SH4_SCIF_FIFODATA_REGTYPE, }; static struct platform_device scif2_device = { @@ -184,6 +187,7 @@ static struct plat_sci_port scif3_platform_data = { .scbrr_algo_id = SCBRR_ALGO_2, .type = PORT_SCI, .irqs = { 80, 81, 82, 0 }, + .regshift = 2, }; static struct platform_device scif3_device = { |