Commit 2e068887 authored by Danh Doan's avatar Danh Doan Committed by Benjamin Cabé
Browse files

drivers: pwm: update namming of pwm driver for RA family 

 - update namming for pwm driver.

Signed-off-by: default avatarDanh Doan <danh.doan.ue@bp.renesas.com>
parent 793bfe13

drivers/pwm/CMakeLists.txt

+1 −1
Changes for drivers/pwm/CMakeLists.txt: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ zephyr_library_sources_ifdef(CONFIG_PWM_NUMAKER pwm_numaker.c) 
zephyr_library_sources_ifdef(CONFIG_PWM_NXP_FLEXIO	pwm_nxp_flexio.c)

zephyr_library_sources_ifdef(CONFIG_PWM_NXP_S32_EMIOS pwm_nxp_s32_emios.c)

zephyr_library_sources_ifdef(CONFIG_PWM_ENE_KB1200	pwm_ene_kb1200.c)

zephyr_library_sources_ifdef(CONFIG_PWM_RENESAS_RA8	pwm_renesas_ra8.c)

zephyr_library_sources_ifdef(CONFIG_PWM_RENESAS_RA	pwm_renesas_ra.c)

zephyr_library_sources_ifdef(CONFIG_PWM_INFINEON_CAT1	pwm_ifx_cat1.c)

zephyr_library_sources_ifdef(CONFIG_PWM_FAKE	pwm_fake.c)

zephyr_library_sources_ifdef(CONFIG_USERSPACE   pwm_handlers.c)

drivers/pwm/Kconfig

+1 −1
Changes for drivers/pwm/Kconfig: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ source "drivers/pwm/Kconfig.nxp_flexio" 


source "drivers/pwm/Kconfig.ene"



source "drivers/pwm/Kconfig.renesas_ra8"

source "drivers/pwm/Kconfig.renesas_ra"



source "drivers/pwm/Kconfig.ifx_cat1"

drivers/pwm/Kconfig.renesas_ra8→drivers/pwm/Kconfig.renesas_ra

+4 −4
Changes for drivers/pwm/Kconfig.renesas_ra: 4 added lines, 4 removed lines.
Original line number Diff line number Diff line 
# Copyright (c) 2024 Renesas Electronics Corporation

# SPDX-License-Identifier: Apache-2.0



config PWM_RENESAS_RA8

	bool "Renesas RA8 PWM driver"

config PWM_RENESAS_RA

	bool "Renesas RA PWM driver"

	default y

	depends on DT_HAS_RENESAS_RA8_PWM_ENABLED

	depends on DT_HAS_RENESAS_RA_PWM_ENABLED

	select USE_RA_FSP_GPT

	select PINCTRL

	help

	  Enable Renesas RA8 PWM Driver.
 
	  Enable Renesas RA PWM Driver.

drivers/pwm/pwm_renesas_ra8.c→drivers/pwm/pwm_renesas_ra.c

+42 −40
Changes for drivers/pwm/pwm_renesas_ra.c: 42 added lines, 40 removed lines.
Original line number Diff line number Diff line
@@ -14,9 +14,9 @@ 
#include <zephyr/logging/log.h>

#include <stdio.h>



LOG_MODULE_REGISTER(pwm_renesas_ra8, CONFIG_PWM_LOG_LEVEL);

LOG_MODULE_REGISTER(pwm_renesas_ra, CONFIG_PWM_LOG_LEVEL);



#define DT_DRV_COMPAT renesas_ra8_pwm

#define DT_DRV_COMPAT renesas_ra_pwm



#define MAX_PIN                                       2U

#define GPT_PRV_GTIO_HIGH_COMPARE_MATCH_LOW_CYCLE_END 0x6U
@@ -24,7 +24,7 @@ LOG_MODULE_REGISTER(pwm_renesas_ra8, CONFIG_PWM_LOG_LEVEL); 
#define GPT_PRV_GTIOR_INITIAL_LEVEL_BIT               4

#define GPT_PRV_GTIO_TOGGLE_COMPARE_MATCH             0x3U



struct pwm_ra8_capture_data {

struct pwm_renesas_ra_capture_data {

	pwm_capture_callback_handler_t callback;

	void *user_data;

	uint64_t period;
@@ -35,7 +35,7 @@ struct pwm_ra8_capture_data { 
	bool continuous;

};



struct pwm_ra8_data {

struct pwm_renesas_ra_data {

	gpt_instance_ctrl_t fsp_ctrl;

	timer_cfg_t fsp_cfg;

	gpt_extended_cfg_t extend_cfg;
@@ -43,17 +43,17 @@ struct pwm_ra8_data { 
	uint16_t overflow_event;



#ifdef CONFIG_PWM_CAPTURE

	struct pwm_ra8_capture_data capture;

	struct pwm_renesas_ra_capture_data capture;

#endif /* CONFIG_PWM_CAPTURE */

};



struct pwm_ra8_config {

struct pwm_renesas_ra_config {

	const struct device *clock_dev;

	struct clock_control_ra_subsys_cfg clock_subsys;

	const struct pinctrl_dev_config *pincfg;

};



static uint32_t pwm_ra8_gtior_calculate(gpt_pin_level_t const stop_level)

static uint32_t pwm_renesas_ra_gtior_calculate(gpt_pin_level_t const stop_level)

{

	/* The stop level is used as both the initial level and the stop level. */

	uint32_t gtior = R_GPT0_GTIOR_OAE_Msk | ((uint32_t)stop_level << R_GPT0_GTIOR_OADFLT_Pos) |
@@ -67,7 +67,7 @@ static uint32_t pwm_ra8_gtior_calculate(gpt_pin_level_t const stop_level) 
	return gtior;

}



static int pwm_ra8_apply_gtior_config(gpt_instance_ctrl_t *const p_ctrl,

static int pwm_renesas_ra_apply_gtior_config(gpt_instance_ctrl_t *const p_ctrl,

					     timer_cfg_t const *const p_cfg)

{

	gpt_extended_cfg_t *p_extend = (gpt_extended_cfg_t *)p_cfg->p_extend;
@@ -80,14 +80,14 @@ static int pwm_ra8_apply_gtior_config(gpt_instance_ctrl_t *const p_ctrl, 
		/* If custom GTIOR settings are not provided, calculate GTIOR. */

		if (p_extend->gtioca.output_enabled) {

			uint32_t gtioca_gtior =

				pwm_ra8_gtior_calculate(p_extend->gtioca.stop_level);

				pwm_renesas_ra_gtior_calculate(p_extend->gtioca.stop_level);



			gtior |= gtioca_gtior << R_GPT0_GTIOR_GTIOA_Pos;

		}



		if (p_extend->gtiocb.output_enabled) {

			uint32_t gtiocb_gtior =

				pwm_ra8_gtior_calculate(p_extend->gtiocb.stop_level);

				pwm_renesas_ra_gtior_calculate(p_extend->gtiocb.stop_level);



			gtior |= gtiocb_gtior << R_GPT0_GTIOR_GTIOB_Pos;

		}
@@ -127,10 +127,10 @@ static int pwm_ra8_apply_gtior_config(gpt_instance_ctrl_t *const p_ctrl, 
	return 0;

}



static int pwm_ra8_set_cycles(const struct device *dev, uint32_t pin, uint32_t period_cycles,

static int pwm_renesas_ra_set_cycles(const struct device *dev, uint32_t pin, uint32_t period_cycles,

				     uint32_t pulse_cycles, pwm_flags_t flags)

{

	struct pwm_ra8_data *data = dev->data;

	struct pwm_renesas_ra_data *data = dev->data;

	uint32_t pulse;

	fsp_err_t err;
@@ -155,7 +155,7 @@ static int pwm_ra8_set_cycles(const struct device *dev, uint32_t pin, uint32_t p 
	pulse = (flags & PWM_POLARITY_INVERTED) ? period_cycles - pulse_cycles : pulse_cycles;



	/* Apply gtio output setting */

	pwm_ra8_apply_gtior_config(&data->fsp_ctrl, &data->fsp_cfg);

	pwm_renesas_ra_apply_gtior_config(&data->fsp_ctrl, &data->fsp_cfg);



	/* Stop timer */

	err = R_GPT_Stop(&data->fsp_ctrl);
@@ -187,9 +187,10 @@ static int pwm_ra8_set_cycles(const struct device *dev, uint32_t pin, uint32_t p 
	return 0;

};



static int pwm_ra8_get_cycles_per_sec(const struct device *dev, uint32_t pin, uint64_t *cycles)

static int pwm_renesas_ra_get_cycles_per_sec(const struct device *dev, uint32_t pin,

					     uint64_t *cycles)

{

	struct pwm_ra8_data *data = dev->data;

	struct pwm_renesas_ra_data *data = dev->data;

	timer_info_t info;

	fsp_err_t err;
@@ -226,10 +227,11 @@ static void disable_irq(IRQn_Type irq) 
	}

}



static int pwm_ra8_configure_capture(const struct device *dev, uint32_t pin, pwm_flags_t flags,

				     pwm_capture_callback_handler_t cb, void *user_data)

static int pwm_renesas_ra_configure_capture(const struct device *dev, uint32_t pin,

					    pwm_flags_t flags, pwm_capture_callback_handler_t cb,

					    void *user_data)

{

	struct pwm_ra8_data *data = dev->data;

	struct pwm_renesas_ra_data *data = dev->data;



	if (pin != GPT_IO_PIN_GTIOCA) {

		LOG_ERR("Feature only support for gtioca");
@@ -306,9 +308,9 @@ static int pwm_ra8_configure_capture(const struct device *dev, uint32_t pin, pwm 
	return 0;

}



static int pwm_ra8_enable_capture(const struct device *dev, uint32_t pin)

static int pwm_renesas_ra_enable_capture(const struct device *dev, uint32_t pin)

{

	struct pwm_ra8_data *data = dev->data;

	struct pwm_renesas_ra_data *data = dev->data;

	fsp_err_t err;



	if (pin != GPT_IO_PIN_GTIOCA) {
@@ -344,9 +346,9 @@ static int pwm_ra8_enable_capture(const struct device *dev, uint32_t pin) 
	return 0;

}



static int pwm_ra8_disable_capture(const struct device *dev, uint32_t pin)

static int pwm_renesas_ra_disable_capture(const struct device *dev, uint32_t pin)

{

	struct pwm_ra8_data *data = dev->data;

	struct pwm_renesas_ra_data *data = dev->data;

	fsp_err_t err;



	if (pin != GPT_IO_PIN_GTIOCA) {
@@ -386,7 +388,7 @@ static int pwm_ra8_disable_capture(const struct device *dev, uint32_t pin) 
static void fsp_callback(timer_callback_args_t *p_args)

{

	const struct device *dev = p_args->p_context;

	struct pwm_ra8_data *data = dev->data;

	struct pwm_renesas_ra_data *data = dev->data;

	timer_info_t info;



	(void)R_GPT_InfoGet(&data->fsp_ctrl, &info);
@@ -422,7 +424,7 @@ static void fsp_callback(timer_callback_args_t *p_args) 
			data->capture.overflows = 0U;

			/* Disable capture in single mode */

			if (data->capture.continuous == false) {

				pwm_ra8_disable_capture(dev, GPT_IO_PIN_GTIOCA);

				pwm_renesas_ra_disable_capture(dev, GPT_IO_PIN_GTIOCA);

			}

		}

	} else if (p_args->event == TIMER_EVENT_CYCLE_END) {
@@ -435,20 +437,20 @@ static void fsp_callback(timer_callback_args_t *p_args) 


#endif /* CONFIG_PWM_CAPTURE */



static DEVICE_API(pwm, pwm_ra8_driver_api) = {

	.get_cycles_per_sec = pwm_ra8_get_cycles_per_sec,

	.set_cycles = pwm_ra8_set_cycles,

static const struct pwm_driver_api pwm_renesas_ra_driver_api = {

	.get_cycles_per_sec = pwm_renesas_ra_get_cycles_per_sec,

	.set_cycles = pwm_renesas_ra_set_cycles,

#ifdef CONFIG_PWM_CAPTURE

	.configure_capture = pwm_ra8_configure_capture,

	.enable_capture = pwm_ra8_enable_capture,

	.disable_capture = pwm_ra8_disable_capture,

	.configure_capture = pwm_renesas_ra_configure_capture,

	.enable_capture = pwm_renesas_ra_enable_capture,

	.disable_capture = pwm_renesas_ra_disable_capture,

#endif /* CONFIG_PWM_CAPTURE */

};



static int pwm_ra8_init(const struct device *dev)

static int pwm_renesas_ra_init(const struct device *dev)

{

	struct pwm_ra8_data *data = dev->data;

	const struct pwm_ra8_config *cfg = dev->config;

	struct pwm_renesas_ra_data *data = dev->data;

	const struct pwm_renesas_ra_config *cfg = dev->config;

	int err;



	if (!device_is_ready(cfg->clock_dev)) {
@@ -534,7 +536,7 @@ static int pwm_ra8_init(const struct device *dev) 
		.p_pwm_cfg = NULL,                                                                 \

		.gtior_setting.gtior = (0x0U),                                                     \

	};                                                                                         \

	static struct pwm_ra8_data pwm_ra8_data_##index = {                                        \

	static struct pwm_renesas_ra_data pwm_renesas_ra_data_##index = {                          \

		.fsp_cfg =                                                                         \

			{                                                                          \

				.mode = TIMER_MODE_PWM,                                            \
@@ -547,24 +549,24 @@ static int pwm_ra8_init(const struct device *dev) 
		.capture_a_event = ELC_EVENT_GPT_CAPTURE_COMPARE_A(DT_INST_PROP(index, channel)),  \

		.overflow_event = ELC_EVENT_GPT_COUNTER_OVERFLOW(DT_INST_PROP(index, channel)),    \

	};                                                                                         \

	static const struct pwm_ra8_config pwm_ra8_config_##index = {                              \

	static const struct pwm_renesas_ra_config pwm_renesas_ra_config_##index = {                \

		.pincfg = PINCTRL_DT_INST_DEV_CONFIG_GET(index),                                   \

		.clock_dev = DEVICE_DT_GET(DT_INST_CLOCKS_CTLR(index)),                            \

		.clock_subsys = {                                                                  \

			.mstp = (uint32_t)DT_INST_CLOCKS_CELL_BY_IDX(index, 0, mstp),              \

			.stop_bit = DT_INST_CLOCKS_CELL_BY_IDX(index, 0, stop_bit),                \

		}};                                                                                \

	static int pwm_ra8_init_##index(const struct device *dev)                                  \

	static int pwm_renesas_ra_init_##index(const struct device *dev)                           \

	{                                                                                          \

		PWM_RA_IRQ_CONFIG_INIT(index);                                                     \

		int err = pwm_ra8_init(dev);                                                       \

		int err = pwm_renesas_ra_init(dev);                                                \

		if (err != 0) {                                                                    \

			return err;                                                                \

		}                                                                                  \

		return 0;                                                                          \

	}                                                                                          \

	DEVICE_DT_INST_DEFINE(index, pwm_ra8_init_##index, NULL, &pwm_ra8_data_##index,            \

			      &pwm_ra8_config_##index, POST_KERNEL, CONFIG_PWM_INIT_PRIORITY,      \

			      &pwm_ra8_driver_api);

	DEVICE_DT_INST_DEFINE(index, pwm_renesas_ra_init_##index, NULL,                            \

			      &pwm_renesas_ra_data_##index, &pwm_renesas_ra_config_##index,        \

			      POST_KERNEL, CONFIG_PWM_INIT_PRIORITY, &pwm_renesas_ra_driver_api);



DT_INST_FOREACH_STATUS_OKAY(PWM_RA8_INIT);

dts/arm/renesas/ra/ra8/ra8x1.dtsi

+14 −14
Changes for dts/arm/renesas/ra/ra8/ra8x1.dtsi: 14 added lines, 14 removed lines.
Original line number Diff line number Diff line
@@ -334,7 +334,7 @@ 
		};



		pwm0: pwm0@40322000 {

			compatible = "renesas,ra8-pwm";

			compatible = "renesas,ra-pwm";

			divider = <RA_PWM_SOURCE_DIV_1>;

			channel = <RA_PWM_CHANNEL_0>;

			clocks = <&pclkd MSTPE 31>;
@@ -344,7 +344,7 @@ 
		};



		pwm1: pwm1@40322100 {

			compatible = "renesas,ra8-pwm";

			compatible = "renesas,ra-pwm";

			divider = <RA_PWM_SOURCE_DIV_1>;

			channel = <RA_PWM_CHANNEL_1>;

			clocks = <&pclkd MSTPE 30>;
@@ -354,7 +354,7 @@ 
		};



		pwm2: pwm2@40322200 {

			compatible = "renesas,ra8-pwm";

			compatible = "renesas,ra-pwm";

			divider = <RA_PWM_SOURCE_DIV_1>;

			channel = <RA_PWM_CHANNEL_2>;

			clocks = <&pclkd MSTPE 29>;
@@ -364,7 +364,7 @@ 
		};



		pwm3: pwm3@40322300 {

			compatible = "renesas,ra8-pwm";

			compatible = "renesas,ra-pwm";

			divider = <RA_PWM_SOURCE_DIV_1>;

			channel = <RA_PWM_CHANNEL_3>;

			clocks = <&pclkd MSTPE 28>;
@@ -374,7 +374,7 @@ 
		};



		pwm4: pwm4@40322400 {

			compatible = "renesas,ra8-pwm";

			compatible = "renesas,ra-pwm";

			divider = <RA_PWM_SOURCE_DIV_1>;

			channel = <RA_PWM_CHANNEL_4>;

			clocks = <&pclkd MSTPE 27>;
@@ -384,7 +384,7 @@ 
		};



		pwm5: pwm5@40322500 {

			compatible = "renesas,ra8-pwm";

			compatible = "renesas,ra-pwm";

			divider = <RA_PWM_SOURCE_DIV_1>;

			channel = <RA_PWM_CHANNEL_5>;

			clocks = <&pclkd MSTPE 26>;
@@ -394,7 +394,7 @@ 
		};



		pwm6: pwm6@40322600 {

			compatible = "renesas,ra8-pwm";

			compatible = "renesas,ra-pwm";

			divider = <RA_PWM_SOURCE_DIV_1>;

			channel = <RA_PWM_CHANNEL_6>;

			clocks = <&pclkd MSTPE 25>;
@@ -404,7 +404,7 @@ 
		};



		pwm7: pwm7@40322700 {

			compatible = "renesas,ra8-pwm";

			compatible = "renesas,ra-pwm";

			divider = <RA_PWM_SOURCE_DIV_1>;

			channel = <RA_PWM_CHANNEL_7>;

			clocks = <&pclkd MSTPE 24>;
@@ -414,7 +414,7 @@ 
		};



		pwm8: pwm8@40322800 {

			compatible = "renesas,ra8-pwm";

			compatible = "renesas,ra-pwm";

			divider = <RA_PWM_SOURCE_DIV_1>;

			channel = <RA_PWM_CHANNEL_8>;

			clocks = <&pclkd MSTPE 23>;
@@ -424,7 +424,7 @@ 
		};



		pwm9: pwm9@40322900 {

			compatible = "renesas,ra8-pwm";

			compatible = "renesas,ra-pwm";

			divider = <RA_PWM_SOURCE_DIV_1>;

			channel = <RA_PWM_CHANNEL_9>;

			clocks = <&pclkd MSTPE 22>;
@@ -434,7 +434,7 @@ 
		};



		pwm10: pwm10@40322a00 {

			compatible = "renesas,ra8-pwm";

			compatible = "renesas,ra-pwm";

			divider = <RA_PWM_SOURCE_DIV_1>;

			channel = <RA_PWM_CHANNEL_10>;

			clocks = <&pclkd MSTPE 21>;
@@ -444,7 +444,7 @@ 
		};



		pwm11: pwm11@40322b00 {

			compatible = "renesas,ra8-pwm";

			compatible = "renesas,ra-pwm";

			divider = <RA_PWM_SOURCE_DIV_1>;

			channel = <RA_PWM_CHANNEL_11>;

			clocks = <&pclkd MSTPE 20>;
@@ -454,7 +454,7 @@ 
		};



		pwm12: pwm12@40322c00 {

			compatible = "renesas,ra8-pwm";

			compatible = "renesas,ra-pwm";

			divider = <RA_PWM_SOURCE_DIV_1>;

			channel = <RA_PWM_CHANNEL_12>;

			clocks = <&pclkd MSTPE 19>;
@@ -464,7 +464,7 @@ 
		};



		pwm13: pwm13@40322d00 {

			compatible = "renesas,ra8-pwm";

			compatible = "renesas,ra-pwm";

			divider = <RA_PWM_SOURCE_DIV_1>;

			channel = <RA_PWM_CHANNEL_13>;

			clocks = <&pclkd MSTPE 18>;

CRA Git | Maintained and supported by SUSTech CRA and CCSE