aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/sh/configs/se7722_defconfig2
-rw-r--r--arch/sh/kernel/cpu/sh4a/setup-sh7722.c24
2 files changed, 19 insertions, 7 deletions
diff --git a/arch/sh/configs/se7722_defconfig b/arch/sh/configs/se7722_defconfig
index 764b813c4051..122b67da73cf 100644
--- a/arch/sh/configs/se7722_defconfig
+++ b/arch/sh/configs/se7722_defconfig
@@ -565,7 +565,7 @@ CONFIG_SERIO_LIBPS2=y
565# Non-8250 serial port support 565# Non-8250 serial port support
566# 566#
567CONFIG_SERIAL_SH_SCI=y 567CONFIG_SERIAL_SH_SCI=y
568CONFIG_SERIAL_SH_SCI_NR_UARTS=2 568CONFIG_SERIAL_SH_SCI_NR_UARTS=3
569CONFIG_SERIAL_SH_SCI_CONSOLE=y 569CONFIG_SERIAL_SH_SCI_CONSOLE=y
570CONFIG_SERIAL_CORE=y 570CONFIG_SERIAL_CORE=y
571CONFIG_SERIAL_CORE_CONSOLE=y 571CONFIG_SERIAL_CORE_CONSOLE=y
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7722.c b/arch/sh/kernel/cpu/sh4a/setup-sh7722.c
index a3e159ef6dfe..d3d444a900ed 100644
--- a/arch/sh/kernel/cpu/sh4a/setup-sh7722.c
+++ b/arch/sh/kernel/cpu/sh4a/setup-sh7722.c
@@ -19,8 +19,21 @@ static struct plat_sci_port sci_platform_data[] = {
19 .mapbase = 0xffe00000, 19 .mapbase = 0xffe00000,
20 .flags = UPF_BOOT_AUTOCONF, 20 .flags = UPF_BOOT_AUTOCONF,
21 .type = PORT_SCIF, 21 .type = PORT_SCIF,
22 .irqs = { 80, 81, 83, 82 }, 22 .irqs = { 80, 80, 80, 80 },
23 }, { 23 },
24 {
25 .mapbase = 0xffe10000,
26 .flags = UPF_BOOT_AUTOCONF,
27 .type = PORT_SCIF,
28 .irqs = { 81, 81, 81, 81 },
29 },
30 {
31 .mapbase = 0xffe20000,
32 .flags = UPF_BOOT_AUTOCONF,
33 .type = PORT_SCIF,
34 .irqs = { 82, 82, 82, 82 },
35 },
36 {
24 .flags = 0, 37 .flags = 0,
25 } 38 }
26}; 39};
@@ -48,10 +61,9 @@ static struct ipr_data ipr_irq_table[] = {
48 /* IRQ, IPR-idx, shift, prio */ 61 /* IRQ, IPR-idx, shift, prio */
49 { 16, 0, 12, 2 }, /* TMU0 */ 62 { 16, 0, 12, 2 }, /* TMU0 */
50 { 17, 0, 8, 2 }, /* TMU1 */ 63 { 17, 0, 8, 2 }, /* TMU1 */
51 { 80, 6, 12, 3 }, /* SCIF ERI */ 64 { 80, 6, 12, 3 }, /* SCIF0 */
52 { 81, 6, 12, 3 }, /* SCIF RXI */ 65 { 81, 6, 8, 3 }, /* SCIF1 */
53 { 82, 6, 12, 3 }, /* SCIF BRI */ 66 { 82, 6, 4, 3 }, /* SCIF2 */
54 { 83, 6, 12, 3 }, /* SCIF TXI */
55}; 67};
56 68
57static unsigned long ipr_offsets[] = { 69static unsigned long ipr_offsets[] = {