From nobody Mon Dec 1 22:38:18 2025 Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 648C330F928 for ; Sat, 29 Nov 2025 16:43:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764434625; cv=none; b=uZ+jy1FiMLjjd6kmVlazch4PAHOj/g7fnly5fDZegMSOCMGUCdD/N7Jsfhjmpxh5kwGxzEi8chQ4BTh+gk7pbkYyLfuH9mxmJ4KIpEGS9p333v3qhXhrZ1vCkrLOrz71ELxq86VflCH8F8p3qAkcH/zaVWHp7hdTRBy9FhSKDxA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764434625; c=relaxed/simple; bh=/VhQgLJMpPMzLmxjLuTth3GX0qTQ4NK8zuL+H9jKxEc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=m5gVsYb2Va2IeC7rvzagtRGi5HS/weyfcrPVYxul5G5DJTGFEPIvbFOi9gWX9BiMjYjowCCTbnQ5q0XcQPefKD3r19eAw8cBElXTVEud+rbxwmnzmN9vjpw0/K6qSJkNtk2nLNoDdAcz1roXEFxdGGZjQlxvd/fgQ65qgQ1H08Q= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=KAnNwCcQ; arc=none smtp.client-ip=209.85.221.47 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="KAnNwCcQ" Received: by mail-wr1-f47.google.com with SMTP id ffacd0b85a97d-42e2e47be25so3723f8f.2 for ; Sat, 29 Nov 2025 08:43:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1764434619; x=1765039419; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=YS50Cy4Ut/5ecqUXNaAW6S0vgr2UtXtcJfHQtbcbph4=; b=KAnNwCcQIGsj8ZMBzy312IM/dUJsx18l0X7v0y40JlI/oyDjaqe1D+un+mwOpgSmX/ fTonHCQJQlGTeV/eKSey9r5R6WLnvQVqczc8Ao34WEXuzcsqe18kUdaq7L/iHKndvFYn inVDJxg5TpHWmAa5FgnXiZOKmkvEmqlaNrZ9SOYvdo+DkuPI+NH+EEukT82BHfqW8mRM QN2SaQ5l3xiwf2XViO04Dk1B3hKdx1rJUJDjP42/Rl9DQsW+YjL6EdxwIdSvpUeJLXTk NYNfIFyCnoXUoD33Vi0M9ltJEstDyK1BelqY3qq/DiekQCLDg/rMKVWC8/WbMkr+eXxr V2kw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764434619; x=1765039419; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=YS50Cy4Ut/5ecqUXNaAW6S0vgr2UtXtcJfHQtbcbph4=; b=wdDEEBxI7cANe+d7i8k0Y3sz45HXg3OSaXEjfOUDV71FhynwZUGodNwXOL/lcR8XkD jkh3LVZ0mWfaauei0KOACGdmHhUWPSvxDEZVvrQzlYApR9gbWTVV9e9aJJrbBhLMsiYu XE1TdZ2ouChnVXtihgMhWFGT8KINb9Szg9YoGbuHqwT3htPd7msgLB6i67GGRgjFYyON nHSfSBV6pN6UfzNtWov/t00ZUnLHjmCx+6qjuJCWlvP6oMl5sEBtxFx+op15pmx/to35 HHJGoyYgoLBsb6NjsaaaxaWIDAxFLZ9jyRG6B8FLSbPtJGqgRho2p9O7ykaeYkYgLGez aFfg== X-Forwarded-Encrypted: i=1; AJvYcCUpzSn+q/SBLabSNoTN1WMSEyJshNWf86Qjm+NQMrEL6RjSDi/Q4asTrybcIqXdGBTkxTgumZSQm8cj8jo=@vger.kernel.org X-Gm-Message-State: AOJu0Yynlxe7JwQXiqoBwfl96cR4PR+7rei+C2dsOfTd643Tg79hf7ii Ej233rDNdQ0Q+r/YZkkzcFnOSisjs1oGeq3lH4j2MiMF47/wS+arE4fN X-Gm-Gg: ASbGnct1WFt+m9blYlmjvxwPMWwSyxNiFxgVgcpfiyFPQS3OKfyVoqkmMrtu+559ppd QN3T/SOLYV09VFAusSenBdkyaI4t/wRV48gXqDB6mNwM//SjPuxm4tAmqA7aAUBwV5XVRC9eotW obl+5oKO5Pv88mSCOFY8XD1Oke2YVNbSCvkOHjsLBtvarBHm8mj3uNoeFH+AC9bny7hkMoJ8aAl ToHIM91XqkTIgV7CYq/bMY3DsgmxJA60dajDvc0QK9lyRGnRl4iNPpdsFXCIS/pA19T+zfenwrS WLUtc/I5bmP3UEJOAoJZcmzzG1hRlN0UoOkOcqk67toQVcVxzhhJlWctlMBv5kUsA5Duyg2qX5V +90/e2rScknonJPUQxl29qcNs5h8t/BFN5d0/CwQaAa0WA06CV40NyQuO2FXVS4d2sD1De1qEy0 c/9Ktcdbh7ngdbOs1Ms9T93a1E8/7oXkKG/MH54Btst9HrImwCGGy+0brD0oO9MQWjwVfaNBZZ1 qzooKtdECLrHXiA X-Google-Smtp-Source: AGHT+IGtcglIGEJuZOJgiEHpEFPiXP0MXwG22ukvfQSWaguRoQU3I4nsMoTkBgR1jTz+wuybAyT6jQ== X-Received: by 2002:a05:6000:1886:b0:42b:3867:b3a7 with SMTP id ffacd0b85a97d-42e0f1d59d1mr18468516f8f.8.1764434619380; Sat, 29 Nov 2025 08:43:39 -0800 (PST) Received: from localhost.localdomain (host86-162-200-138.range86-162.btcentralplus.com. [86.162.200.138]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-42e1ca4078csm15970060f8f.29.2025.11.29.08.43.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 29 Nov 2025 08:43:38 -0800 (PST) From: Biju X-Google-Original-From: Biju To: Greg Kroah-Hartman , Jiri Slaby , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Geert Uytterhoeven , Magnus Damm Cc: Biju Das , Wolfram Sang , Lad Prabhakar , linux-kernel@vger.kernel.org, linux-serial@vger.kernel.org, devicetree@vger.kernel.org, linux-renesas-soc@vger.kernel.org, Biju Das Subject: [PATCH v5 16/17] serial: rsci: Rename early_console data, port_params and callback() names Date: Sat, 29 Nov 2025 16:43:12 +0000 Message-ID: <20251129164325.209213-17-biju.das.jz@bp.renesas.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251129164325.209213-1-biju.das.jz@bp.renesas.com> References: <20251129164325.209213-1-biju.das.jz@bp.renesas.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Biju Das Rename rsci_early_console_setup()->rsci_rzt2h_early_console_setup(), the early_console data of_sci_rsci_data->of_rsci_rzt2h_data and the port_params rsci_port_params->rsci_rzt2h_port_params to support RZ/G3E RSCI that uses different data and callback(). Signed-off-by: Biju Das --- v4->v5: * Update commit header and description. * Renamed rsci_port_params->rsci_rzt2h_port_params. v4: * New patch. --- drivers/tty/serial/rsci.c | 14 +++++++------- drivers/tty/serial/rsci.h | 2 +- drivers/tty/serial/sh-sci.c | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/tty/serial/rsci.c b/drivers/tty/serial/rsci.c index 7f4cb04daeeb..70ff81fdc027 100644 --- a/drivers/tty/serial/rsci.c +++ b/drivers/tty/serial/rsci.c @@ -419,7 +419,7 @@ static const struct sci_port_params_bits rsci_port_para= m_bits =3D { .poll_sent_bits =3D CSR_TDRE | CSR_TEND, }; =20 -static const struct sci_port_params rsci_port_params =3D { +static const struct sci_port_params rsci_rzt2h_port_params =3D { .fifosize =3D 16, .overrun_reg =3D CSR, .overrun_mask =3D CSR_ORER, @@ -461,22 +461,22 @@ static const struct sci_port_ops rsci_port_ops =3D { .shutdown_complete =3D rsci_shutdown_complete, }; =20 -struct sci_of_data of_sci_rsci_data =3D { +struct sci_of_data of_rsci_rzt2h_data =3D { .type =3D RSCI_PORT_SCIF16, .ops =3D &rsci_port_ops, .uart_ops =3D &rsci_uart_ops, - .params =3D &rsci_port_params, + .params =3D &rsci_rzt2h_port_params, }; =20 #ifdef CONFIG_SERIAL_SH_SCI_EARLYCON =20 -static int __init rsci_early_console_setup(struct earlycon_device *device, - const char *opt) +static int __init rsci_rzt2h_early_console_setup(struct earlycon_device *d= evice, + const char *opt) { - return scix_early_console_setup(device, &of_sci_rsci_data); + return scix_early_console_setup(device, &of_rsci_rzt2h_data); } =20 -OF_EARLYCON_DECLARE(rsci, "renesas,r9a09g077-rsci", rsci_early_console_set= up); +OF_EARLYCON_DECLARE(rsci, "renesas,r9a09g077-rsci", rsci_rzt2h_early_conso= le_setup); =20 #endif /* CONFIG_SERIAL_SH_SCI_EARLYCON */ =20 diff --git a/drivers/tty/serial/rsci.h b/drivers/tty/serial/rsci.h index 2af3f28b465a..9547148e8bd1 100644 --- a/drivers/tty/serial/rsci.h +++ b/drivers/tty/serial/rsci.h @@ -5,6 +5,6 @@ =20 #include "sh-sci-common.h" =20 -extern struct sci_of_data of_sci_rsci_data; +extern struct sci_of_data of_rsci_rzt2h_data; =20 #endif /* __RSCI_H__ */ diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c index 8f3314b258d6..677293115f1e 100644 --- a/drivers/tty/serial/sh-sci.c +++ b/drivers/tty/serial/sh-sci.c @@ -3664,7 +3664,7 @@ static const struct of_device_id of_sci_match[] __may= be_unused =3D { #ifdef CONFIG_SERIAL_RSCI { .compatible =3D "renesas,r9a09g077-rsci", - .data =3D &of_sci_rsci_data, + .data =3D &of_rsci_rzt2h_data, }, #endif /* CONFIG_SERIAL_RSCI */ /* Family-specific types */ --=20 2.43.0