From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ragnatech-se.20230601.gappssmtp.com header.i=@ragnatech-se.20230601.gappssmtp.com header.b="1yBNd35c" Received: from mail-ej1-x62a.google.com (mail-ej1-x62a.google.com [IPv6:2a00:1450:4864:20::62a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9B9D910CA for ; Tue, 21 Nov 2023 07:53:44 -0800 (PST) Received: by mail-ej1-x62a.google.com with SMTP id a640c23a62f3a-9ffb5a4f622so273622866b.0 for ; Tue, 21 Nov 2023 07:53:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ragnatech-se.20230601.gappssmtp.com; s=20230601; t=1700582023; x=1701186823; 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=WnAd+fxIMU0M2YoK/HG0/F62cLWjPueZxjIM5o5heQk=; b=1yBNd35cFskuw3LE/vXn+9efY5IynXYRz724nKrvztXx5VVytLQdSquNY/iKObdNuv auG/RM7qoCdYCePiE10ydIe9+owgMRGWoOjvp5roFwLCwZGfQrdkrRjX+q8B1azyIh2T o9yf6Vi1myH+18o3xaFJwX/NA3tW/8R6I6MK3waAhl5hO0ykCaY1DZfCx58Sabqkk7Rv DtXkJ+arzUwApTbxhoE0UbpCkq1xvRouRRtjzXWPHrQRvFEecZ9CoSXpoZlBgIEzDRro Q8flOyqNAqhzdOXWW2g8AbfKsxIK9MUv2ZNEWAfzVbCA5EvBujE4lZCdFuPpWCKRQHUF AMFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700582023; x=1701186823; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=WnAd+fxIMU0M2YoK/HG0/F62cLWjPueZxjIM5o5heQk=; b=XGjp4BHphZBBttAaIsbV5nKp2uRDbggTwHzzH/Bdjnu+0iFzqNNf/2pz6mvQYqEUn8 ykJaGgTRCNIsgNwS+Wwqz/jgkmpI0TicUgaGgZsChiorqxSzeP7j0j4nZgJQN4gk7D40 /3WlBULrb2+l1BsFQbDySEc11Jq2IuITOiwu1VAw5uUe+d+0+biHDVFuKc9zk4CB534U hC05cqbX8+Vheno+EfIeMQeNsO52mZ54G2jHHTQMt144GrEet6M7UgEXzhL1qg4fcxx6 1tkrXjMPpDJIg2AReJ9+CBz1KGJ+kHn52F2x9P/Nl/ubPYGNxfhGrebEOO1y1QgHy/4C CpFQ== X-Gm-Message-State: AOJu0YwtnjQ6uaubsQD925UYXCc4R26H5vVWT6ea2YQKKWqs08eQE9Im 0dUGhRZCNlvsyYl8mBQLaThp8g== X-Google-Smtp-Source: AGHT+IHNgT0RSd5XpQjVPdqZAhwakMa7fQmzFVifYxXJ/RQ6Z6jRRjcHep7Irojk4543l/o35jEYOQ== X-Received: by 2002:a17:906:25a:b0:a02:5bb:5658 with SMTP id 26-20020a170906025a00b00a0205bb5658mr1501587ejl.47.1700582022843; Tue, 21 Nov 2023 07:53:42 -0800 (PST) Received: from sleipner.berto.se (p4fcc8a96.dip0.t-ipconnect.de. [79.204.138.150]) by smtp.googlemail.com with ESMTPSA id dv8-20020a170906b80800b009fdc15b5304sm2896853ejb.102.2023.11.21.07.53.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Nov 2023 07:53:42 -0800 (PST) From: =?UTF-8?q?Niklas=20S=C3=B6derlund?= To: "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Richard Cochran , netdev@vger.kernel.org Cc: linux-renesas-soc@vger.kernel.org, =?UTF-8?q?Niklas=20S=C3=B6derlund?= , Wolfram Sang Subject: [net-next v3 3/5] net: ethernet: renesas: rcar_gen4_ptp: Prepare for shared register layout Date: Tue, 21 Nov 2023 16:53:04 +0100 Message-ID: <20231121155306.515446-4-niklas.soderlund+renesas@ragnatech.se> X-Mailer: git-send-email 2.42.1 In-Reply-To: <20231121155306.515446-1-niklas.soderlund+renesas@ragnatech.se> References: <20231121155306.515446-1-niklas.soderlund+renesas@ragnatech.se> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit All known R-Car Gen4 SoC share the same register layout, rename the R-Car S4 specific identifiers so they can be shared with the upcoming R-Car V4H support. Signed-off-by: Niklas Söderlund Reviewed-by: Wolfram Sang --- * Changes since v2 - No change. * Changes since v1 - Fix spelling in commit message. - Added review tag from Wolfram. --- drivers/net/ethernet/renesas/rcar_gen4_ptp.c | 6 +++--- drivers/net/ethernet/renesas/rcar_gen4_ptp.h | 4 ++-- drivers/net/ethernet/renesas/rswitch.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/net/ethernet/renesas/rcar_gen4_ptp.c b/drivers/net/ethernet/renesas/rcar_gen4_ptp.c index 443ca5a18703..59f6351e9ae9 100644 --- a/drivers/net/ethernet/renesas/rcar_gen4_ptp.c +++ b/drivers/net/ethernet/renesas/rcar_gen4_ptp.c @@ -14,7 +14,7 @@ #include "rcar_gen4_ptp.h" #define ptp_to_priv(ptp) container_of(ptp, struct rcar_gen4_ptp_private, info) -static const struct rcar_gen4_ptp_reg_offset s4_offs = { +static const struct rcar_gen4_ptp_reg_offset gen4_offs = { .enable = PTPTMEC, .disable = PTPTMDC, .increment = PTPTIVC0, @@ -133,10 +133,10 @@ static struct ptp_clock_info rcar_gen4_ptp_info = { static int rcar_gen4_ptp_set_offs(struct rcar_gen4_ptp_private *ptp_priv, enum rcar_gen4_ptp_reg_layout layout) { - if (layout != RCAR_GEN4_PTP_REG_LAYOUT_S4) + if (layout != RCAR_GEN4_PTP_REG_LAYOUT) return -EINVAL; - ptp_priv->offs = &s4_offs; + ptp_priv->offs = &gen4_offs; return 0; } diff --git a/drivers/net/ethernet/renesas/rcar_gen4_ptp.h b/drivers/net/ethernet/renesas/rcar_gen4_ptp.h index 9f148110df66..35664d1dc472 100644 --- a/drivers/net/ethernet/renesas/rcar_gen4_ptp.h +++ b/drivers/net/ethernet/renesas/rcar_gen4_ptp.h @@ -14,7 +14,7 @@ #define RCAR_GEN4_GPTP_OFFSET_S4 0x00018000 enum rcar_gen4_ptp_reg_layout { - RCAR_GEN4_PTP_REG_LAYOUT_S4 + RCAR_GEN4_PTP_REG_LAYOUT }; /* driver's definitions */ @@ -27,7 +27,7 @@ enum rcar_gen4_ptp_reg_layout { #define PTPRO 0 -enum rcar_gen4_ptp_reg_s4 { +enum rcar_gen4_ptp_reg { PTPTMEC = PTPRO + 0x0010, PTPTMDC = PTPRO + 0x0014, PTPTIVC0 = PTPRO + 0x0020, diff --git a/drivers/net/ethernet/renesas/rswitch.c b/drivers/net/ethernet/renesas/rswitch.c index 43a7795d6591..e1e29a2caf22 100644 --- a/drivers/net/ethernet/renesas/rswitch.c +++ b/drivers/net/ethernet/renesas/rswitch.c @@ -1828,7 +1828,7 @@ static int rswitch_init(struct rswitch_private *priv) rswitch_fwd_init(priv); - err = rcar_gen4_ptp_register(priv->ptp_priv, RCAR_GEN4_PTP_REG_LAYOUT_S4, + err = rcar_gen4_ptp_register(priv->ptp_priv, RCAR_GEN4_PTP_REG_LAYOUT, RCAR_GEN4_PTP_CLOCK_S4); if (err < 0) goto err_ptp_register; -- 2.42.1