clock_control: Added clock controller driver for Raspberry Pi Pico

boards/arm/adafruit_kb2040/adafruit_kb2040-pinctrl.dtsi

@@ -47,4 +47,7 @@
 			input-enable;
 		};
 	};
+
+	clocks_default: clocks_default {
+	};
 };

boards/arm/adafruit_kb2040/adafruit_kb2040.dts

@@ -25,12 +25,6 @@
 	aliases {
 		watchdog0 = &wdt0;
 	};
-
-	xtal_clk: xtal-clk {
-		compatible = "fixed-clock";
-		clock-frequency = <12000000>;
-		#clock-cells = <0>;
-	};
 };
 
 &flash0 {
@@ -60,6 +54,11 @@
 	};
 };
 
+&clocks {
+	pinctrl-0 = <&clocks_default>;
+	pinctrl-names = "default";
+};
+
 &uart0 {
 	current-speed = <115200>;
 	status = "okay";

boards/arm/adafruit_kb2040/adafruit_kb2040.yaml

@@ -19,3 +19,5 @@ supported:
   - pwm
   - flash
   - dma
+  - counter
+  - clock

boards/arm/adafruit_kb2040/adafruit_kb2040_defconfig

@@ -17,6 +17,9 @@ CONFIG_UART_CONSOLE=y
 # Enable reset by default
 CONFIG_RESET=y
 
+# Enable clock control by default
+CONFIG_CLOCK_CONTROL=y
+
 # Code partition needed to target the correct flash range
 CONFIG_USE_DT_CODE_PARTITION=y
 

boards/arm/adafruit_kb2040/doc/index.rst

@@ -79,6 +79,9 @@ hardware features:
    * - Flash
      - :kconfig:option:`CONFIG_FLASH`
      - :dtcompatible:`raspberrypi,pico-flash`
+   * - Clock controller
+     - :kconfig:option:`CONFIG_CLOCK_CONTROL`
+     - :dtcompatible:`raspberrypi,pico-clock-controller`
    * - UART (PIO)
      - :kconfig:option:`CONFIG_SERIAL`
      - :dtcompatible:`raspberrypi,pico-uart-pio`

boards/arm/rpi_pico/doc/index.rst

@@ -89,6 +89,9 @@ hardware features:
    * - Flash
      - :kconfig:option:`CONFIG_FLASH`
      - :dtcompatible:`raspberrypi,pico-flash`
+   * - Clock controller
+     - :kconfig:option:`CONFIG_CLOCK_CONTROL`
+     - :dtcompatible:`raspberrypi,pico-clock-controller`
    * - UART (PIO)
      - :kconfig:option:`CONFIG_SERIAL`
      - :dtcompatible:`raspberrypi,pico-uart-pio`

boards/arm/rpi_pico/rpi_pico-common.dtsi

@@ -23,12 +23,6 @@
 		zephyr,code-partition = &code_partition;
 	};
 
-	xtal_clk: xtal-clk {
-		compatible = "fixed-clock";
-		clock-frequency = <12000000>;
-		#clock-cells = <0>;
-	};
-
 	aliases {
 		watchdog0 = &wdt0;
 	};
@@ -94,6 +88,11 @@
 	};
 };
 
+&clocks {
+	pinctrl-0 = <&clocks_default>;
+	pinctrl-names = "default";
+};
+
 &uart0 {
 	current-speed = <115200>;
 	status = "okay";

boards/arm/rpi_pico/rpi_pico-pinctrl.dtsi

@@ -46,4 +46,7 @@
 			input-enable;
 		};
 	};
+
+	clocks_default: clocks_default {
+	};
 };

boards/arm/rpi_pico/rpi_pico.yaml

@@ -20,3 +20,4 @@ supported:
   - flash
   - dma
   - counter
+  - clock

boards/arm/rpi_pico/rpi_pico_defconfig

@@ -11,3 +11,4 @@ CONFIG_BUILD_OUTPUT_UF2=y
 CONFIG_BUILD_OUTPUT_HEX=y
 CONFIG_UART_INTERRUPT_DRIVEN=y
 CONFIG_RESET=y
+CONFIG_CLOCK_CONTROL=y

boards/arm/rpi_pico/rpi_pico_w.yaml

@@ -20,3 +20,5 @@ supported:
   - flash
   - dma
   - pio
+  - counter
+  - clock

boards/arm/rpi_pico/rpi_pico_w_defconfig

@@ -11,3 +11,4 @@ CONFIG_BUILD_OUTPUT_UF2=y
 CONFIG_BUILD_OUTPUT_HEX=y
 CONFIG_UART_INTERRUPT_DRIVEN=y
 CONFIG_RESET=y
+CONFIG_CLOCK_CONTROL=y

boards/arm/sparkfun_pro_micro_rp2040/doc/index.rst

@@ -79,6 +79,9 @@ hardware features:
    * - Flash
      - :kconfig:option:`CONFIG_FLASH`
      - :dtcompatible:`raspberrypi,pico-flash`
+   * - Clock controller
+     - :kconfig:option:`CONFIG_CLOCK_CONTROL`
+     - :dtcompatible:`raspberrypi,pico-clock-controller`
    * - UART (PIO)
      - :kconfig:option:`CONFIG_SERIAL`
      - :dtcompatible:`raspberrypi,pico-uart-pio`

boards/arm/sparkfun_pro_micro_rp2040/sparkfun_pro_micro_rp2040-pinctrl.dtsi

@@ -46,4 +46,7 @@
 			input-enable;
 		};
 	};
+
+	clocks_default: clocks_default {
+	};
 };

boards/arm/sparkfun_pro_micro_rp2040/sparkfun_pro_micro_rp2040.dts

@@ -23,12 +23,6 @@
 	aliases {
 		watchdog0 = &wdt0;
 	};
-
-	xtal_clk: xtal-clk {
-		compatible = "fixed-clock";
-		clock-frequency = <12000000>;
-		#clock-cells = <0>;
-	};
 };
 
 &flash0 {
@@ -62,6 +56,10 @@
 	};
 };
 
+&clocks {
+	pinctrl-0 = <&clocks_default>;
+	pinctrl-names = "default";
+};
 
 &uart0 {
 	current-speed = <115200>;

boards/arm/sparkfun_pro_micro_rp2040/sparkfun_pro_micro_rp2040.yaml

@@ -19,3 +19,5 @@ supported:
   - pwm
   - flash
   - dma
+  - counter
+  - clock

boards/arm/sparkfun_pro_micro_rp2040/sparkfun_pro_micro_rp2040_defconfig

@@ -15,6 +15,9 @@ CONFIG_UART_INTERRUPT_DRIVEN=y
 CONFIG_CONSOLE=y
 CONFIG_UART_CONSOLE=y
 
+# Enable clock control by default
+CONFIG_CLOCK_CONTROL=y
+
 # Code partition needed to target the correct flash range
 CONFIG_USE_DT_CODE_PARTITION=y
 

drivers/adc/adc_rpi_pico.c

@@ -8,7 +8,9 @@
 #define DT_DRV_COMPAT raspberrypi_pico_adc
 
 #include <zephyr/drivers/adc.h>
+#include <zephyr/drivers/clock_control.h>
 #include <zephyr/drivers/pinctrl.h>
+#include <zephyr/drivers/reset.h>
 #include <zephyr/logging/log.h>
 
 #include <hardware/adc.h>
@@ -36,6 +38,12 @@ struct adc_rpi_config {
 	const struct pinctrl_dev_config *pcfg;
 	/** function pointer to irq setup */
 	void (*irq_configure)(void);
+	/** Pointer to clock controller device */
+	const struct device *clk_dev;
+	/** Clock id of ADC clock */
+	clock_control_subsys_t clk_id;
+	/** Reset controller config */
+	const struct reset_dt_spec reset;
 };
 
 /**
@@ -299,6 +307,16 @@ static int adc_rpi_init(const struct device *dev)
 		return ret;
 	}
 
+	ret = clock_control_on(config->clk_dev, config->clk_id);
+	if (ret < 0) {
+		return ret;
+	}
+
+	ret = reset_line_toggle_dt(&config->reset);
+	if (ret < 0) {
+		return ret;
+	}
+
 	config->irq_configure();
 
 	/*
@@ -332,31 +350,34 @@ static int adc_rpi_init(const struct device *dev)
 
 #define IRQ_CONFIGURE_DEFINE(idx) .irq_configure = adc_rpi_configure_func_##idx
 
-#define ADC_RPI_INIT(idx)							   \
-	IRQ_CONFIGURE_FUNC(idx)							   \
-	PINCTRL_DT_INST_DEFINE(idx);						   \
-	static struct adc_driver_api adc_rpi_api_##idx = {			   \
-		.channel_setup = adc_rpi_channel_setup,				   \
-		.read = adc_rpi_read,						   \
-		.ref_internal = DT_INST_PROP(idx, vref_mv),			   \
-		IF_ENABLED(CONFIG_ADC_ASYNC, (.read_async = adc_rpi_read_async,))  \
-	};									   \
-	static const struct adc_rpi_config adc_rpi_config_##idx = {		   \
-		.num_channels = ADC_RPI_CHANNEL_NUM,				   \
-		.pcfg = PINCTRL_DT_INST_DEV_CONFIG_GET(idx),			   \
-		IRQ_CONFIGURE_DEFINE(idx),					   \
-	};									   \
-	static struct adc_rpi_data adc_rpi_data_##idx = {			   \
-		ADC_CONTEXT_INIT_TIMER(adc_rpi_data_##idx, ctx),		   \
-		ADC_CONTEXT_INIT_LOCK(adc_rpi_data_##idx, ctx),			   \
-		ADC_CONTEXT_INIT_SYNC(adc_rpi_data_##idx, ctx),			   \
-		.dev = DEVICE_DT_INST_GET(idx),					   \
-	};									   \
-										   \
-	DEVICE_DT_INST_DEFINE(idx, adc_rpi_init, NULL,				   \
-			      &adc_rpi_data_##idx,				   \
-			      &adc_rpi_config_##idx, POST_KERNEL,		   \
-			      CONFIG_ADC_INIT_PRIORITY,				   \
+#define ADC_RPI_INIT(idx)                                                                          \
+	IRQ_CONFIGURE_FUNC(idx)                                                                    \
+	PINCTRL_DT_INST_DEFINE(idx);                                                               \
+	static struct adc_driver_api adc_rpi_api_##idx = {                                         \
+		.channel_setup = adc_rpi_channel_setup,                                            \
+		.read = adc_rpi_read,                                                              \
+		.ref_internal = DT_INST_PROP(idx, vref_mv),                                        \
+		IF_ENABLED(CONFIG_ADC_ASYNC, (.read_async = adc_rpi_read_async,))                  \
+	};                                                                                         \
+	static const struct adc_rpi_config adc_rpi_config_##idx = {                                \
+		.num_channels = ADC_RPI_CHANNEL_NUM,                                               \
+		.pcfg = PINCTRL_DT_INST_DEV_CONFIG_GET(idx),                                       \
+		.clk_dev = DEVICE_DT_GET(DT_INST_CLOCKS_CTLR(idx)),                                \
+		.clk_id = (clock_control_subsys_t)DT_INST_PHA_BY_IDX(idx, clocks, 0, clk_id),      \
+		.reset = RESET_DT_SPEC_INST_GET(idx),                                              \
+		IRQ_CONFIGURE_DEFINE(idx),                                                         \
+	};                                                                                         \
+	static struct adc_rpi_data adc_rpi_data_##idx = {                                          \
+		ADC_CONTEXT_INIT_TIMER(adc_rpi_data_##idx, ctx),                                   \
+		ADC_CONTEXT_INIT_LOCK(adc_rpi_data_##idx, ctx),                                    \
+		ADC_CONTEXT_INIT_SYNC(adc_rpi_data_##idx, ctx),                                    \
+		.dev = DEVICE_DT_INST_GET(idx),                                                    \
+	};                                                                                         \
+                                                                                                   \
+	DEVICE_DT_INST_DEFINE(idx, adc_rpi_init, NULL,                                             \
+			      &adc_rpi_data_##idx,                                                 \
+			      &adc_rpi_config_##idx, POST_KERNEL,                                  \
+			      CONFIG_ADC_INIT_PRIORITY,                                            \
 			      &adc_rpi_api_##idx)
 
 DT_INST_FOREACH_STATUS_OKAY(ADC_RPI_INIT);

drivers/clock_control/CMakeLists.txt

@@ -29,6 +29,7 @@ zephyr_library_sources_ifdef(CONFIG_CLOCK_CONTROL_NXP_S32             clock_cont
 zephyr_library_sources_ifdef(CONFIG_CLOCK_CONTROL_RA                  clock_control_ra.c)
 zephyr_library_sources_ifdef(CONFIG_CLOCK_CONTROL_AMBIQ               clock_control_ambiq.c)
 zephyr_library_sources_ifdef(CONFIG_CLOCK_CONTROL_PWM                 clock_control_pwm.c)
+zephyr_library_sources_ifdef(CONFIG_CLOCK_CONTROL_RPI_PICO            clock_control_rpi_pico.c)
 
 
 if(CONFIG_CLOCK_CONTROL_STM32_CUBE)

drivers/clock_control/Kconfig

@@ -86,4 +86,6 @@ source "drivers/clock_control/Kconfig.ambiq"
 
 source "drivers/clock_control/Kconfig.pwm"
 
+source "drivers/clock_control/Kconfig.rpi_pico"
+
 endif # CLOCK_CONTROL

drivers/clock_control/Kconfig.rpi_pico

@@ -0,0 +1,19 @@
+# Raspberry Pi Pico Clock Controller Driver configuration options
+
+# Copyright (c) 2022 Andrei-Edward Popa
+# SPDX-License-Identifier: Apache-2.0
+
+config CLOCK_CONTROL_RPI_PICO
+	bool "Raspberry Pi Pico Clock Controller Driver"
+	default y
+	depends on DT_HAS_RASPBERRYPI_PICO_CLOCK_CONTROLLER_ENABLED
+
+if CLOCK_CONTROL_RPI_PICO
+
+config RPI_PICO_ROSC_USE_MEASURED_FREQ
+	bool "Use measured frequency for ring oscillator"
+	help
+	 Instead of the dts value, use the value measured by
+	 the frequency counter as the rosc frequency.
+
+endif # CLOCK_CONTROL_RPI_PICO