Skip to contentSkip to conversation

sh: Fix maximum number of SCIF ports in R2D defconfigs

PATCH In review Magnus Damm 2 participants 2 messages Apr 22, 2010 – Apr 26, 2010 SuperH

lore
Share & tools
lore

Magnus Damm

author
#0 lore raw

PATCH 1/1 sh: Fix maximum number of SCIF ports in R2D defconfigs

From: Magnus Damm <[email protected]>

Update the R2D defconfigs to bump up the maximum number of SCIF ports on the system.

Fixes a broken serial console regression added
by cd5f107628ab89c5dec5ad923f1c27f4cba41972.

Reported-by Shin-ichiro KAWASAKI <[email protected]>
Signed-off-by Magnus Damm <[email protected]>
Tested-by Alexandre Courbot <[email protected]>

---

 arch/sh/configs/rts7751r2d1_defconfig    |    2 +-
 arch/sh/configs/rts7751r2dplus_defconfig |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
arch/sh/configs/rts7751r2d1_defconfig +1 -1
@@ -877,7 +877,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4
 #
 # CONFIG_SERIAL_MAX3100 is not set
 CONFIG_SERIAL_SH_SCI=y
-CONFIG_SERIAL_SH_SCI_NR_UARTS=1
+CONFIG_SERIAL_SH_SCI_NR_UARTS=2
 CONFIG_SERIAL_SH_SCI_CONSOLE=y
 CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
arch/sh/configs/rts7751r2dplus_defconfig +1 -1
@@ -963,7 +963,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4
 #
 # CONFIG_SERIAL_MAX3100 is not set
 CONFIG_SERIAL_SH_SCI=y
-CONFIG_SERIAL_SH_SCI_NR_UARTS=1
+CONFIG_SERIAL_SH_SCI_NR_UARTS=2
 CONFIG_SERIAL_SH_SCI_CONSOLE=y
 CONFIG_SERIAL_CORE=y
 CONFIG_SERIAL_CORE_CONSOLE=y
#1 lore raw
Quoted 5 lines · Magnus Damm

Update the R2D defconfigs to bump up the maximum
number of SCIF ports on the system.

Fixes a broken serial console regression added
by cd5f107628ab89c5dec5ad923f1c27f4cba41972.

Quoted 4 lines · Magnus Damm

This patch updates the sh7751 pci code to handle io ports correctly. The code is based on the sh7788x implementation.

Tested on a R2D-1 board with CONFIG_8139TOO_PIO=y.

Both applied for 2.6.34, thanks.