]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
powerpc/85xx: p1025twr: add module conditional to fix QE-uart issue
authorXie Xiaobo <X.Xie@freescale.com>
Fri, 22 May 2015 05:07:19 +0000 (13:07 +0800)
committerScott Wood <scottwood@freescale.com>
Wed, 3 Jun 2015 02:37:29 +0000 (21:37 -0500)
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>
arch/powerpc/platforms/85xx/twr_p102x.c

index 1eadb6d0dc6406acbe24a5b946fb4a62b104b83e..30e002f4648c81a1b7f1d4a6d5a0d7c08d4ea2fb 100644 (file)
@@ -79,7 +79,7 @@ static void __init twr_p1025_setup_arch(void)
        mpc85xx_qe_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)) {
                struct ccsr_guts __iomem *guts;
 
@@ -101,7 +101,7 @@ static void __init twr_p1025_setup_arch(void)
                                        MPC85xx_PMUXCR_QE(12));
                        iounmap(guts);
 
-#if defined(CONFIG_SERIAL_QE)
+#if IS_ENABLED(CONFIG_SERIAL_QE)
                        /* On P1025TWR board, the UCC7 acted as UART port.
                         * However, The UCC7's CTS pin is low level in default,
                         * it will impact the transmission in full duplex