drivers: timer: sam: Update to use clock control

nandojve · mbolivar-nordic · commit eb2c6d7e2c8b · 2023-03-21T14:12:25.000-07:00
This update Atmel SAM timer driver to use clock control drivers.

Signed-off-by: Gerson Fernando Budke &lt;nandojve@gmail.com&gt;
diff --git a/drivers/counter/counter_sam_tc.c b/drivers/counter/counter_sam_tc.c
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2021, Piotr Mienkowski
+ * Copyright (c) 2023, Gerson Fernando Budke
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -31,6 +32,7 @@
 #include <soc.h>
 #include <zephyr/drivers/counter.h>
 #include <zephyr/drivers/pinctrl.h>
+#include <zephyr/drivers/clock_control/atmel_sam_pmc.h>
 
 #include <zephyr/logging/log.h>
 #include <zephyr/irq.h>
@@ -51,11 +53,11 @@ struct counter_sam_dev_cfg {
 	uint32_t reg_cmr;
 	uint32_t reg_rc;
 	void (*irq_config_func)(const struct device *dev);
+	const struct atmel_sam_pmc_config clock_cfg[TCCHANNEL_NUMBER];
 	const struct pinctrl_dev_config *pcfg;
 	uint8_t clk_sel;
 	bool nodivclk;
 	uint8_t tc_chan_num;
-	uint8_t periph_id[TCCHANNEL_NUMBER];
 };
 
 struct counter_sam_alarm_data {
@@ -322,7 +324,8 @@ static int counter_sam_initialize(const struct device *dev)
 	}
 
 	/* Enable channel's clock */
-	soc_pmc_peripheral_enable(dev_cfg->periph_id[dev_cfg->tc_chan_num]);
+	(void)clock_control_on(SAM_DT_PMC_CONTROLLER,
+			       (clock_control_subsys_t *)&dev_cfg->clock_cfg[dev_cfg->tc_chan_num]);
 
 	/* Clock and Mode Selection */
 	tc_ch->TC_CMR = dev_cfg->reg_cmr;
@@ -384,7 +387,7 @@ static const struct counter_sam_dev_cfg counter_##n##_sam_config = { \
 	.pcfg = PINCTRL_DT_INST_DEV_CONFIG_GET(n),		\
 	.nodivclk = DT_INST_PROP(n, nodivclk),			\
 	.tc_chan_num = DT_INST_PROP_OR(n, channel, 0),		\
-	.periph_id = DT_INST_PROP(n, peripheral_id),		\
+	.clock_cfg = SAM_DT_INST_CLOCKS_PMC_CFG(n),		\
 };								\
 								\
 static struct counter_sam_dev_data counter_##n##_sam_data;	\
diff --git a/dts/arm/atmel/sam3x.dtsi b/dts/arm/atmel/sam3x.dtsi
@@ -199,7 +199,9 @@
 			interrupts = <27 0
 				      28 0
 				      29 0>;
-			peripheral-id = <27 28 29>;
+			clocks = <&pmc PMC_TYPE_PERIPHERAL 27>,
+				 <&pmc PMC_TYPE_PERIPHERAL 28>,
+				 <&pmc PMC_TYPE_PERIPHERAL 29>;
 			status = "disabled";
 		};
 
@@ -209,7 +211,9 @@
 			interrupts = <30 0
 				      31 0
 				      32 0>;
-			peripheral-id = <30 31 32>;
+			clocks = <&pmc PMC_TYPE_PERIPHERAL 30>,
+				 <&pmc PMC_TYPE_PERIPHERAL 31>,
+				 <&pmc PMC_TYPE_PERIPHERAL 32>;
 			status = "disabled";
 		};
 
@@ -219,7 +223,9 @@
 			interrupts = <33 0
 				      34 0
 				      35 0>;
-			peripheral-id = <33 34 35>;
+			clocks = <&pmc PMC_TYPE_PERIPHERAL 33>,
+				 <&pmc PMC_TYPE_PERIPHERAL 34>,
+				 <&pmc PMC_TYPE_PERIPHERAL 35>;
 			status = "disabled";
 		};
 	};
diff --git a/dts/arm/atmel/sam4e.dtsi b/dts/arm/atmel/sam4e.dtsi
@@ -218,7 +218,9 @@
 			interrupts = <21 0
 				      22 0
 				      23 0>;
-			peripheral-id = <21 22 23>;
+			clocks = <&pmc PMC_TYPE_PERIPHERAL 21>,
+				 <&pmc PMC_TYPE_PERIPHERAL 22>,
+				 <&pmc PMC_TYPE_PERIPHERAL 23>;
 			status = "disabled";
 		};
 
@@ -228,7 +230,9 @@
 			interrupts = <24 0
 				      25 0
 				      26 0>;
-			peripheral-id = <24 25 26>;
+			clocks = <&pmc PMC_TYPE_PERIPHERAL 24>,
+				 <&pmc PMC_TYPE_PERIPHERAL 25>,
+				 <&pmc PMC_TYPE_PERIPHERAL 26>;
 			status = "disabled";
 		};
 
@@ -238,7 +242,9 @@
 			interrupts = <27 0
 				      28 0
 				      29 0>;
-			peripheral-id = <27 28 29>;
+			clocks = <&pmc PMC_TYPE_PERIPHERAL 27>,
+				 <&pmc PMC_TYPE_PERIPHERAL 28>,
+				 <&pmc PMC_TYPE_PERIPHERAL 29>;
 			status = "disabled";
 		};
 
diff --git a/dts/arm/atmel/sam4l.dtsi b/dts/arm/atmel/sam4l.dtsi
@@ -211,7 +211,7 @@
 			interrupts = <55 0
 				      56 0
 				      57 0>;
-			peripheral-id = <2>;
+			clocks = <&pmc PMC_TYPE_PERIPHERAL 2>;
 			status = "disabled";
 		};
 
@@ -221,7 +221,7 @@
 			interrupts = <58 0
 				      59 0
 				      60 0>;
-			peripheral-id = <3>;
+			clocks = <&pmc PMC_TYPE_PERIPHERAL 3>;
 			status = "disabled";
 		};
 
diff --git a/dts/arm/atmel/sam4s.dtsi b/dts/arm/atmel/sam4s.dtsi
@@ -195,7 +195,9 @@
 			interrupts = <23 0
 				      24 0
 				      25 0>;
-			peripheral-id = <23 24 25>;
+			clocks = <&pmc PMC_TYPE_PERIPHERAL 23>,
+				 <&pmc PMC_TYPE_PERIPHERAL 24>,
+				 <&pmc PMC_TYPE_PERIPHERAL 25>;
 			status = "disabled";
 		};
 
@@ -205,7 +207,9 @@
 			interrupts = <26 0
 				      27 0
 				      28 0>;
-			peripheral-id = <26 27 28>;
+			clocks = <&pmc PMC_TYPE_PERIPHERAL 26>,
+				 <&pmc PMC_TYPE_PERIPHERAL 27>,
+				 <&pmc PMC_TYPE_PERIPHERAL 28>;
 			status = "disabled";
 		};
 
diff --git a/dts/arm/atmel/same70.dtsi b/dts/arm/atmel/same70.dtsi
@@ -340,7 +340,9 @@
 			interrupts = <23 0
 				      24 0
 				      25 0>;
-			peripheral-id = <23 24 25>;
+			clocks = <&pmc PMC_TYPE_PERIPHERAL 23>,
+				 <&pmc PMC_TYPE_PERIPHERAL 24>,
+				 <&pmc PMC_TYPE_PERIPHERAL 25>;
 			status = "disabled";
 		};
 
@@ -350,7 +352,9 @@
 			interrupts = <26 0
 				      27 0
 				      28 0>;
-			peripheral-id = <26 27 28>;
+			clocks = <&pmc PMC_TYPE_PERIPHERAL 26>,
+				 <&pmc PMC_TYPE_PERIPHERAL 27>,
+				 <&pmc PMC_TYPE_PERIPHERAL 28>;
 			status = "disabled";
 		};
 
@@ -360,7 +364,9 @@
 			interrupts = <47 0
 				      48 0
 				      49 0>;
-			peripheral-id = <47 48 49>;
+			clocks = <&pmc PMC_TYPE_PERIPHERAL 47>,
+				 <&pmc PMC_TYPE_PERIPHERAL 48>,
+				 <&pmc PMC_TYPE_PERIPHERAL 49>;
 			status = "disabled";
 		};
 
@@ -370,7 +376,9 @@
 			interrupts = <50 0
 				      51 0
 				      52 0>;
-			peripheral-id = <50 51 52>;
+			clocks = <&pmc PMC_TYPE_PERIPHERAL 50>,
+				 <&pmc PMC_TYPE_PERIPHERAL 51>,
+				 <&pmc PMC_TYPE_PERIPHERAL 52>;
 			status = "disabled";
 		};
 
diff --git a/dts/bindings/timer/atmel,sam-tc.yaml b/dts/bindings/timer/atmel,sam-tc.yaml
@@ -15,9 +15,7 @@ properties:
   interrupts:
     required: true
 
-  peripheral-id:
-    type: array
-    description: peripheral ID
+  clocks:
     required: true
 
   channel:
