From ffad404a6af1efea02737210b3617dc74e640695 Mon Sep 17 00:00:00 2001
From: "Duy Phuong Hoang. Nguyen" <duy.nguyen.xa@renesas.com>
Date: Thu, 18 Jul 2024 19:34:21 +0700
Subject: [PATCH] drivers: pinctrl: Update pinctrl driver name for Renesas RA
 series

Update pinctrl driver which used for Renesas RA series with
PFS secure register

Signed-off-by: Duy Phuong Hoang. Nguyen <duy.nguyen.xa@renesas.com>
Signed-off-by: Quy Tran <quy.tran.pz@renesas.com>
---
 drivers/pinctrl/renesas/CMakeLists.txt                    | 2 +-
 drivers/pinctrl/renesas/ra/Kconfig                        | 8 ++++----
 .../renesas/ra/{pinctrl_renesas_ra8.c => pinctrl_ra.c}    | 0
 dts/arm/renesas/ra/ra8/ra8x1.dtsi                         | 4 ++--
 ...enesas,ra8-pinctrl.yaml => renesas,ra-pincrl-pfs.yaml} | 4 ++--
 .../pinctrl/renesas/{ra-pinctrl.h => pinctrl-ra.h}        | 0
 soc/renesas/ra/common_fsp/pinctrl_soc.h                   | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)
 rename drivers/pinctrl/renesas/ra/{pinctrl_renesas_ra8.c => pinctrl_ra.c} (100%)
 rename dts/bindings/pinctrl/{renesas,ra8-pinctrl.yaml => renesas,ra-pincrl-pfs.yaml} (97%)
 rename include/zephyr/dt-bindings/pinctrl/renesas/{ra-pinctrl.h => pinctrl-ra.h} (100%)

diff --git a/drivers/pinctrl/renesas/CMakeLists.txt b/drivers/pinctrl/renesas/CMakeLists.txt
index 38347a8ed3e..f53523415ba 100644
--- a/drivers/pinctrl/renesas/CMakeLists.txt
+++ b/drivers/pinctrl/renesas/CMakeLists.txt
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 
 zephyr_library_sources_ifdef(CONFIG_PINCTRL_RENESAS_RA ra/pinctrl_renesas_ra.c)
-zephyr_library_sources_ifdef(CONFIG_PINCTRL_RENESAS_RA8 ra/pinctrl_renesas_ra8.c)
+zephyr_library_sources_ifdef(CONFIG_PINCTRL_RENESAS_RA_PFS ra/pinctrl_ra.c)
 zephyr_library_sources_ifdef(CONFIG_PINCTRL_RZT2M rz/pinctrl_rzt2m.c)
 zephyr_library_sources_ifdef(CONFIG_PINCTRL_SMARTBOND smartbond/pinctrl_smartbond.c)
 
diff --git a/drivers/pinctrl/renesas/ra/Kconfig b/drivers/pinctrl/renesas/ra/Kconfig
index 2ffaa63d16a..3ca03057982 100644
--- a/drivers/pinctrl/renesas/ra/Kconfig
+++ b/drivers/pinctrl/renesas/ra/Kconfig
@@ -9,9 +9,9 @@ config PINCTRL_RENESAS_RA
 	help
 	  Enable Renesas RA series pin controller driver.
 
-config PINCTRL_RENESAS_RA8
-	bool "Renesas RA8 pinctrl driver"
+config PINCTRL_RENESAS_RA_PFS
+	bool "Renesas RA pinctrl driver"
 	default y
-	depends on DT_HAS_RENESAS_RA8_PINCTRL_ENABLED
+	depends on DT_HAS_RENESAS_RA_PINCTRL_PFS_ENABLED
 	help
-	  Enable the Renesas RA8 pinctrl driver.
+	  Enable the Renesas RA series pinctrl driver with PFS secure register.
diff --git a/drivers/pinctrl/renesas/ra/pinctrl_renesas_ra8.c b/drivers/pinctrl/renesas/ra/pinctrl_ra.c
similarity index 100%
rename from drivers/pinctrl/renesas/ra/pinctrl_renesas_ra8.c
rename to drivers/pinctrl/renesas/ra/pinctrl_ra.c
diff --git a/dts/arm/renesas/ra/ra8/ra8x1.dtsi b/dts/arm/renesas/ra/ra8/ra8x1.dtsi
index 19221efe205..9cc6648ec96 100644
--- a/dts/arm/renesas/ra/ra8/ra8x1.dtsi
+++ b/dts/arm/renesas/ra/ra8/ra8x1.dtsi
@@ -7,7 +7,7 @@
 #include <mem.h>
 #include <arm/armv8.1-m.dtsi>
 #include <freq.h>
-#include <zephyr/dt-bindings/pinctrl/renesas/ra-pinctrl.h>
+#include <zephyr/dt-bindings/pinctrl/renesas/pinctrl-ra.h>
 #include <zephyr/dt-bindings/clock/ra_clock.h>
 
 / {
@@ -44,7 +44,7 @@
 		};
 
 		pinctrl: pin-controller@40400800 {
-			compatible = "renesas,ra8-pinctrl";
+			compatible = "renesas,ra-pinctrl-pfs";
 			reg = <0x40400800 0x3c0>;
 			status = "okay";
 		};
diff --git a/dts/bindings/pinctrl/renesas,ra8-pinctrl.yaml b/dts/bindings/pinctrl/renesas,ra-pincrl-pfs.yaml
similarity index 97%
rename from dts/bindings/pinctrl/renesas,ra8-pinctrl.yaml
rename to dts/bindings/pinctrl/renesas,ra-pincrl-pfs.yaml
index e4240dbc18a..c3782162b84 100644
--- a/dts/bindings/pinctrl/renesas,ra8-pinctrl.yaml
+++ b/dts/bindings/pinctrl/renesas,ra-pincrl-pfs.yaml
@@ -21,7 +21,7 @@ description: |
        */
 
       /* include pre-defined combinations for the SoC variant used by the board */
-      #include <dt-bindings/pinctrl/renesas/ra-pinctrl.h>
+      #include <dt-bindings/pinctrl/renesas/pinctrl-ra.h>
 
       &pinctrl {
         /* configuration for the sci0 "default" state */
@@ -67,7 +67,7 @@ description: |
              pinctrl-names = "default", "sleep";
        };
 
-compatible: "renesas,ra8-pinctrl"
+compatible: "renesas,ra-pinctrl-pfs"
 
 include: base.yaml
 
diff --git a/include/zephyr/dt-bindings/pinctrl/renesas/ra-pinctrl.h b/include/zephyr/dt-bindings/pinctrl/renesas/pinctrl-ra.h
similarity index 100%
rename from include/zephyr/dt-bindings/pinctrl/renesas/ra-pinctrl.h
rename to include/zephyr/dt-bindings/pinctrl/renesas/pinctrl-ra.h
diff --git a/soc/renesas/ra/common_fsp/pinctrl_soc.h b/soc/renesas/ra/common_fsp/pinctrl_soc.h
index 7390202a24c..1b347f2bd23 100644
--- a/soc/renesas/ra/common_fsp/pinctrl_soc.h
+++ b/soc/renesas/ra/common_fsp/pinctrl_soc.h
@@ -10,7 +10,7 @@
 #include <zephyr/devicetree.h>
 #include <zephyr/types.h>
 
-#include <zephyr/dt-bindings/pinctrl/renesas/ra-pinctrl.h>
+#include <zephyr/dt-bindings/pinctrl/renesas/pinctrl-ra.h>
 
 /**
  * @brief Type to hold a renesas ra pin's pinctrl configuration.