From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 71AEFC7618D for ; Mon, 20 Mar 2023 09:12:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230198AbjCTJMz (ORCPT ); Mon, 20 Mar 2023 05:12:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44148 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230220AbjCTJMn (ORCPT ); Mon, 20 Mar 2023 05:12:43 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 16BFA20A2E for ; Mon, 20 Mar 2023 02:12:35 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id C64B7B80DB5 for ; Mon, 20 Mar 2023 09:12:33 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 327A4C433EF; Mon, 20 Mar 2023 09:12:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1679303552; bh=1rHMWN99+Mkof1GZxNkFIBABt5ImKkq1SKa5Q5NgoMU=; h=Subject:To:Cc:From:Date:From; b=EDIyniwrEvmYl+pXvTW7EUjAeK3/h6baT3l6jSyFUh0CNAxh01NmO7VqHd27ZOAZU c/WHlmfG29Tl2kOgdN1vjD38YuH7ZO7JYeIAAxInnqxJc9mASTMtUVd+MfsxffJ0xQ yI2R+5cDD2OXBZC627tOOnigjxi2pgbepiVR3tso= Subject: FAILED: patch "[PATCH] serial: 8250_em: Fix UART port type" failed to apply to 4.14-stable tree To: biju.das.jz@bp.renesas.com, gregkh@linuxfoundation.org Cc: From: Date: Mon, 20 Mar 2023 10:12:20 +0100 Message-ID: <167930354015894@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org The patch below does not apply to the 4.14-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-4.14.y git checkout FETCH_HEAD git cherry-pick -x 32e293be736b853f168cd065d9cbc1b0c69f545d # git commit -s git send-email --to '' --in-reply-to '167930354015894@kroah.com' --subject-prefix 'PATCH 4.14.y' HEAD^.. Possible dependencies: 32e293be736b ("serial: 8250_em: Fix UART port type") 2a1dbd259e63 ("serial: 8250_em: Switch to use platform_get_irq()") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 32e293be736b853f168cd065d9cbc1b0c69f545d Mon Sep 17 00:00:00 2001 From: Biju Das Date: Mon, 27 Feb 2023 11:41:46 +0000 Subject: [PATCH] serial: 8250_em: Fix UART port type As per HW manual for EMEV2 "R19UH0040EJ0400 Rev.4.00", the UART IP found on EMMA mobile SoC is Register-compatible with the general-purpose 16750 UART chip. Fix UART port type as 16750 and enable 64-bytes fifo support. Fixes: 22886ee96895 ("serial8250-em: Emma Mobile UART driver V2") Cc: stable@vger.kernel.org Signed-off-by: Biju Das Link: https://lore.kernel.org/r/20230227114152.22265-2-biju.das.jz@bp.renesas.com Signed-off-by: Greg Kroah-Hartman diff --git a/drivers/tty/serial/8250/8250_em.c b/drivers/tty/serial/8250/8250_em.c index f8e99995eee9..d94c3811a8f7 100644 --- a/drivers/tty/serial/8250/8250_em.c +++ b/drivers/tty/serial/8250/8250_em.c @@ -106,8 +106,8 @@ static int serial8250_em_probe(struct platform_device *pdev) memset(&up, 0, sizeof(up)); up.port.mapbase = regs->start; up.port.irq = irq; - up.port.type = PORT_UNKNOWN; - up.port.flags = UPF_BOOT_AUTOCONF | UPF_FIXED_PORT | UPF_IOREMAP; + up.port.type = PORT_16750; + up.port.flags = UPF_FIXED_PORT | UPF_IOREMAP | UPF_FIXED_TYPE; up.port.dev = &pdev->dev; up.port.private_data = priv;