lkml.org 
[lkml]   [2019]   [Nov]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v4 31/47] serial: ucc_uart: stub out soft_uart_init for !CONFIG_PPC32
    Date
    The Soft UART hack is only needed for some PPC-based SOCs. To allow
    building this driver for non-PPC, guard soft_uart_init() and its
    helpers by CONFIG_PPC32, and use a no-op soft_uart_init() otherwise.

    Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
    ---
    drivers/tty/serial/ucc_uart.c | 17 ++++++++++++++++-
    1 file changed, 16 insertions(+), 1 deletion(-)

    diff --git a/drivers/tty/serial/ucc_uart.c b/drivers/tty/serial/ucc_uart.c
    index f286e91714cb..313697842e24 100644
    --- a/drivers/tty/serial/ucc_uart.c
    +++ b/drivers/tty/serial/ucc_uart.c
    @@ -33,7 +33,10 @@

    #include <linux/firmware.h>
    #include <soc/fsl/cpm.h>
    -#include <asm/reg.h>
    +
    +#ifdef CONFIG_PPC32
    +#include <asm/reg.h> /* mfspr, SPRN_SVR */
    +#endif

    /*
    * The GUMR flag for Soft UART. This would normally be defined in qe.h,
    @@ -1096,6 +1099,8 @@ static const struct uart_ops qe_uart_pops = {
    .verify_port = qe_uart_verify_port,
    };

    +
    +#ifdef CONFIG_PPC32
    /*
    * Obtain the SOC model number and revision level
    *
    @@ -1238,6 +1243,16 @@ static int soft_uart_init(struct platform_device *ofdev)
    return 0;
    }

    +#else /* !CONFIG_PPC32 */
    +
    +static int soft_uart_init(struct platform_device *ofdev)
    +{
    + return 0;
    +}
    +
    +#endif
    +
    +
    static int ucc_uart_probe(struct platform_device *ofdev)
    {
    struct device_node *np = ofdev->dev.of_node;
    --
    2.23.0
    \
     
     \ /
      Last update: 2019-11-08 14:04    [W:7.853 / U:0.052 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site