leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

powerpc/85xx: p1025twr: add module conditional to fix QE-uart issue

Browse Source 
A ioport setting was needed when used the QE uart function on TWR-P1025.
Added a conditional definition to avoid missing this setting when the
QE-uart driver was bulit to a module.

Signed-off-by: Xie Xiaobo <X.Xie@freescale.com>
Signed-off-by: Li Pengbo <Pengbo.Li@freescale.com>
Signed-off-by: Scott Wood <scottwood@freescale.com>
This commit is contained in:
Xie Xiaobo 2015-05-22 13:07:19 +08:00 committed by Scott Wood
parent 379caf6063
commit 31ea9d5dfd
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/powerpc/platforms/85xx/twr_p102x.c
View File

@ -79,7 +79,7 @@ static void __init twr_p1025_setup_arch(void)
mpc85xx_qe_init(); mpc85xx_qe_init();
mpc85xx_qe_par_io_init(); mpc85xx_qe_par_io_init();
#if defined(CONFIG_UCC_GETH) || defined(CONFIG_SERIAL_QE) #if IS_ENABLED(CONFIG_UCC_GETH) || IS_ENABLED(CONFIG_SERIAL_QE)
if (machine_is(twr_p1025)) { if (machine_is(twr_p1025)) {
struct ccsr_guts __iomem *guts; struct ccsr_guts __iomem *guts;
@ -101,7 +101,7 @@ static void __init twr_p1025_setup_arch(void)
MPC85xx_PMUXCR_QE(12)); MPC85xx_PMUXCR_QE(12));
iounmap(guts); iounmap(guts);
#if defined(CONFIG_SERIAL_QE) #if IS_ENABLED(CONFIG_SERIAL_QE)
/* On P1025TWR board, the UCC7 acted as UART port. /* On P1025TWR board, the UCC7 acted as UART port.
* However, The UCC7's CTS pin is low level in default, * However, The UCC7's CTS pin is low level in default,
* it will impact the transmission in full duplex * it will impact the transmission in full duplex