Message ID | 20230705181833.16137-5-ddrokosov@sberdevices.ru |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp2068249vqx; Wed, 5 Jul 2023 11:49:05 -0700 (PDT) X-Google-Smtp-Source: APBJJlFgHKNwmFy/GUdFqpnhhjbl/wiifooyp9C2wJfG/l+50ipSCK7YgN9aFYoU7gaQkJd2iQGh X-Received: by 2002:a17:903:2304:b0:1b3:a928:18e7 with SMTP id d4-20020a170903230400b001b3a92818e7mr14439780plh.59.1688582944868; Wed, 05 Jul 2023 11:49:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688582944; cv=none; d=google.com; s=arc-20160816; b=j6S/OH/2FCNof2HutTG1z94RuZ3PRmXsV1cDqMZTr9B11KC9tPvvZFEraHG8jffYus L24zlOHB1eVqmOC7etNeN3z6PnQgwc+jdpmp3Er2CrkGQna8m5AwUqQ1P2RAyctmpAwM YgEPOVrNEmQkHVVL1+3bDTkHkS8LDscvQECTbwuoCdhsQWhTqAQ8k+6TZeYtcynDZoTD 3+k9sAZhAX31L4+rXFaSarHY/iHtjFg18b59QnB4BDTUfK6pWYrQiACx5TuIsEEIvZb/ gRxZQcN2WzX7I0P0IX7gfOGqj2hBOhl4YWnHW3T247jEiw/syvqLbClGonU8fTAm45Im U1jg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-filter; bh=OllYyhrUJ08P7wMySV5F6J3h9lBYzlt948FsMshI588=; fh=WJqZePI8VHr7PwehuKfE5Na7FLIpnW3ROa7as0MZyQE=; b=RDHzsy6M8PsvVth4PX/koECfweogSQiI2Z0RscZ+i1szdYubuC/cVmpal/v1sTJNcO bCv8aFerxSMW7Ji+Kj1ZuCut871wqVkRhQyaCydBdJbESbqmN/cdeDQA/UVa/FnY8l0e 0mVLSqjkhL/P3zoIBmnHPS/LkKaYnx87ZExc9B5WjVkklg/UEL7OS6BPf8mJmbftADeg MAs2fCMe9dpbbUW9RpH/4oXry3O5pwEWg/jTMq9SL7mE1R5892LmnUHGf/M0xVkORrvQ YQ6YZGIshneLqsQEIf+1aPOXnxkcWZJ6u3ACz/96oX9tv3khkBAAXba3EeJtuTBpk8Eh xkfA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sberdevices.ru header.s=mail header.b=RRT2fsKX; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=sberdevices.ru Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ay1-20020a1709028b8100b001b53a3fbcc3si22181962plb.328.2023.07.05.11.48.49; Wed, 05 Jul 2023 11:49:04 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@sberdevices.ru header.s=mail header.b=RRT2fsKX; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=sberdevices.ru Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232758AbjGESdP (ORCPT <rfc822;tebrre53rla2o@gmail.com> + 99 others); Wed, 5 Jul 2023 14:33:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57818 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229645AbjGEScl (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Wed, 5 Jul 2023 14:32:41 -0400 Received: from mx1.sberdevices.ru (mx2.sberdevices.ru [45.89.224.132]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A472212A; Wed, 5 Jul 2023 11:32:39 -0700 (PDT) Received: from p-infra-ksmg-sc-msk02 (localhost [127.0.0.1]) by mx1.sberdevices.ru (Postfix) with ESMTP id 1B56B120071; Wed, 5 Jul 2023 21:18:46 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.sberdevices.ru 1B56B120071 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sberdevices.ru; s=mail; t=1688581126; bh=OllYyhrUJ08P7wMySV5F6J3h9lBYzlt948FsMshI588=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type:From; b=RRT2fsKX+4aBYJHk8wqotSPoX9ajwXxJA/z27vHSCg28qI07e4Q3QdC+DOQsO05aN hJWNJT7JyoITSJ4W8TewnamvRVio5cwFyBtd18QTd78qZ5fZhUBEEPsYgKhtXQg98R OZw41A7gm/a+8r4ZRMiv9smll3uwcpCj1Ie7W53Iw2TT61UHCyXv3r/TwcUnxVFy1q 2Ph9Dk5ZSBXyn8IKTK+VrA0kzGN/DHf2PDOzX7PZgnh9ChFI3TM/XrqFDeXeteaBgG JRv1YXTsqR/howZcb0PHfXCf6xOMtL6UOi+pBpy7VFI7u/MnMz3eiCoUisXrcj0O8+ OxJznG/mrlH+w== Received: from p-i-exch-sc-m01.sberdevices.ru (p-i-exch-sc-m01.sberdevices.ru [172.16.192.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.sberdevices.ru (Postfix) with ESMTPS; Wed, 5 Jul 2023 21:18:45 +0300 (MSK) Received: from localhost.localdomain (100.64.160.123) by p-i-exch-sc-m01.sberdevices.ru (172.16.192.107) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.30; Wed, 5 Jul 2023 21:18:43 +0300 From: Dmitry Rokosov <ddrokosov@sberdevices.ru> To: <gregkh@linuxfoundation.org>, <robh+dt@kernel.org>, <krzysztof.kozlowski+dt@linaro.org>, <conor+dt@kernel.org>, <neil.armstrong@linaro.org>, <jbrunet@baylibre.com>, <jirislaby@kernel.org>, <khilman@baylibre.com>, <martin.blumenstingl@googlemail.com> CC: <kelvin.zhang@amlogic.com>, <xianwei.zhao@amlogic.com>, <kernel@sberdevices.ru>, <rockosov@gmail.com>, <linux-amlogic@lists.infradead.org>, <linux-serial@vger.kernel.org>, <devicetree@vger.kernel.org>, <linux-kernel@vger.kernel.org>, <linux-arm-kernel@lists.infradead.org>, Dmitry Rokosov <ddrokosov@sberdevices.ru> Subject: [PATCH v2 4/7] tty: serial: meson: introduce separate uart_data for S4 SoC family Date: Wed, 5 Jul 2023 21:18:30 +0300 Message-ID: <20230705181833.16137-5-ddrokosov@sberdevices.ru> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20230705181833.16137-1-ddrokosov@sberdevices.ru> References: <20230705181833.16137-1-ddrokosov@sberdevices.ru> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [100.64.160.123] X-ClientProxiedBy: p-i-exch-sc-m02.sberdevices.ru (172.16.192.103) To p-i-exch-sc-m01.sberdevices.ru (172.16.192.107) X-KSMG-Rule-ID: 10 X-KSMG-Message-Action: clean X-KSMG-AntiSpam-Lua-Profiles: 178461 [Jul 05 2023] X-KSMG-AntiSpam-Version: 5.9.59.0 X-KSMG-AntiSpam-Envelope-From: DDRokosov@sberdevices.ru X-KSMG-AntiSpam-Rate: 0 X-KSMG-AntiSpam-Status: not_detected X-KSMG-AntiSpam-Method: none X-KSMG-AntiSpam-Auth: dkim=none X-KSMG-AntiSpam-Info: LuaCore: 520 520 ccb018a655251011855942a2571029252d3d69a2, {Tracking_from_domain_doesnt_match_to}, 100.64.160.123:7.1.2;p-i-exch-sc-m01.sberdevices.ru:7.1.1,5.0.1;d41d8cd98f00b204e9800998ecf8427e.com:7.1.1;sberdevices.ru:7.1.1,5.0.1;127.0.0.199:7.1.2, FromAlignment: s, {Tracking_white_helo}, ApMailHostAddress: 100.64.160.123 X-MS-Exchange-Organization-SCL: -1 X-KSMG-AntiSpam-Interceptor-Info: scan successful X-KSMG-AntiPhishing: Clean X-KSMG-LinksScanning: Clean X-KSMG-AntiVirus: Kaspersky Secure Mail Gateway, version 2.0.1.6960, bases: 2023/07/05 14:57:00 #21566867 X-KSMG-AntiVirus-Status: Clean, skipped X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770607550359322321?= X-GMAIL-MSGID: =?utf-8?q?1770607550359322321?= |
Series |
tty: serial: meson: support ttyS devname
|
|
Commit Message
Dmitry Rokosov
July 5, 2023, 6:18 p.m. UTC
In order to use the correct devname value for the S4 SoC family, it
is imperative that we implement separate uart_data. Unlike the legacy
g12a architecture, the S4 architecture should employ the use of 'ttyS'
devname.
Signed-off-by: Dmitry Rokosov <ddrokosov@sberdevices.ru>
---
drivers/tty/serial/meson_uart.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
Comments
On 05/07/2023 20:18, Dmitry Rokosov wrote: > In order to use the correct devname value for the S4 SoC family, it > is imperative that we implement separate uart_data. Unlike the legacy > g12a architecture, the S4 architecture should employ the use of 'ttyS' > devname. > > Signed-off-by: Dmitry Rokosov <ddrokosov@sberdevices.ru> > --- > drivers/tty/serial/meson_uart.c | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) > > diff --git a/drivers/tty/serial/meson_uart.c b/drivers/tty/serial/meson_uart.c > index ad0748a10db7..6a63184b8091 100644 > --- a/drivers/tty/serial/meson_uart.c > +++ b/drivers/tty/serial/meson_uart.c > @@ -818,6 +818,11 @@ static struct meson_uart_data meson_g12a_uart_data = { > .has_xtal_div2 = true, > }; > > +static struct meson_uart_data meson_s4_uart_data = { > + .uart_driver = &MESON_UART_DRIVER(ttyS), > + .has_xtal_div2 = true, > +}; > + > static const struct of_device_id meson_uart_dt_match[] = { > { .compatible = "amlogic,meson6-uart" }, > { .compatible = "amlogic,meson8-uart" }, > @@ -829,7 +834,7 @@ static const struct of_device_id meson_uart_dt_match[] = { > }, > { > .compatible = "amlogic,meson-s4-uart", > - .data = (void *)&meson_g12a_uart_data, > + .data = (void *)&meson_s4_uart_data, > }, > { /* sentinel */ }, > }; With the real struct name: Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
diff --git a/drivers/tty/serial/meson_uart.c b/drivers/tty/serial/meson_uart.c index ad0748a10db7..6a63184b8091 100644 --- a/drivers/tty/serial/meson_uart.c +++ b/drivers/tty/serial/meson_uart.c @@ -818,6 +818,11 @@ static struct meson_uart_data meson_g12a_uart_data = { .has_xtal_div2 = true, }; +static struct meson_uart_data meson_s4_uart_data = { + .uart_driver = &MESON_UART_DRIVER(ttyS), + .has_xtal_div2 = true, +}; + static const struct of_device_id meson_uart_dt_match[] = { { .compatible = "amlogic,meson6-uart" }, { .compatible = "amlogic,meson8-uart" }, @@ -829,7 +834,7 @@ static const struct of_device_id meson_uart_dt_match[] = { }, { .compatible = "amlogic,meson-s4-uart", - .data = (void *)&meson_g12a_uart_data, + .data = (void *)&meson_s4_uart_data, }, { /* sentinel */ }, };