Skip to content

pinctrl: npcx: config pwm open-drain without enabling STORE_REG #45712

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 20, 2022
Merged

pinctrl: npcx: config pwm open-drain without enabling STORE_REG #45712

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion drivers/pinctrl/Kconfig.npcx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ DT_COMPAT_ST_PINCTRL_NPCX := nuvoton,npcx-pinctrl
config PINCTRL_NPCX
bool "Nuvoton NPCX embedded controller (EC) pin controller driver"
depends on SOC_FAMILY_NPCX
select PINCTRL_STORE_REG
default $(dt_compat_enabled,$(DT_COMPAT_ST_PINCTRL_NPCX))
help
This option enables the pin controller driver for NPCX family of
Expand Down
35 changes: 33 additions & 2 deletions drivers/pinctrl/pinctrl_npcx.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,22 @@ static const struct npcx_pinctrl_config npcx_pinctrl_cfg = {
.base_scfg = DT_REG_ADDR_BY_NAME(DT_NODELABEL(scfg), scfg),
};

/* PWM pinctrl config */
struct npcx_pwm_pinctrl_config {
uintptr_t base;
int channel;
};

#define NPCX_PWM_PINCTRL_CFG_INIT(node_id) \
{ \
.base = DT_REG_ADDR(node_id), \
.channel = DT_PROP(node_id, pwm_channel), \
},

static const struct npcx_pwm_pinctrl_config pwm_pinctrl_cfg[] = {
DT_FOREACH_STATUS_OKAY(nuvoton_npcx_pwm, NPCX_PWM_PINCTRL_CFG_INIT)
};

/* Pin-control local functions for peripheral devices */
static bool npcx_periph_pinmux_has_lock(int group)
{
Expand Down Expand Up @@ -70,8 +86,23 @@ static void npcx_periph_pupd_configure(const struct npcx_periph *pupd,
}
}

static void npcx_periph_pwm_drive_mode_configure(uintptr_t reg, bool is_od)
static void npcx_periph_pwm_drive_mode_configure(const struct npcx_periph *periph,
bool is_od)
{
uintptr_t reg = 0;

/* Find selected pwm module which enables open-drain prop. */
for (int i = 0; i < ARRAY_SIZE(pwm_pinctrl_cfg); i++) {
if (periph->group == pwm_pinctrl_cfg[i].channel) {
reg = pwm_pinctrl_cfg[i].base;
break;
}
}

if (reg == 0) {
return;
}

struct pwm_reg *const inst = (struct pwm_reg *)(reg);

if (is_od) {
Expand All @@ -94,7 +125,7 @@ static void npcx_periph_configure(const pinctrl_soc_pin_t *pin, uintptr_t reg)
pin->flags.io_bias_type);
} else if (pin->cfg.periph.type == NPCX_PINCTRL_TYPE_PERIPH_DRIVE) {
/* Configure peripheral device's drive mode. (Only PWM pads support it) */
npcx_periph_pwm_drive_mode_configure(reg,
npcx_periph_pwm_drive_mode_configure(&pin->cfg.periph,
pin->flags.io_drive_type == NPCX_DRIVE_TYPE_OPEN_DRAIN);
}
}
Expand Down
8 changes: 8 additions & 0 deletions dts/arm/nuvoton/npcx.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,6 +293,7 @@
pwm0: pwm@40080000 {
compatible = "nuvoton,npcx-pwm";
reg = <0x40080000 0x2000>;
pwm-channel = <0>;
clocks = <&pcc NPCX_CLOCK_BUS_APB2 NPCX_PWDWN_CTL2 0>;
#pwm-cells = <3>;
status = "disabled";
Expand All @@ -302,6 +303,7 @@
pwm1: pwm@40082000 {
compatible = "nuvoton,npcx-pwm";
reg = <0x40082000 0x2000>;
pwm-channel = <1>;
clocks = <&pcc NPCX_CLOCK_BUS_APB2 NPCX_PWDWN_CTL2 1>;
#pwm-cells = <3>;
status = "disabled";
Expand All @@ -311,6 +313,7 @@
pwm2: pwm@40084000 {
compatible = "nuvoton,npcx-pwm";
reg = <0x40084000 0x2000>;
pwm-channel = <2>;
clocks = <&pcc NPCX_CLOCK_BUS_APB2 NPCX_PWDWN_CTL2 2>;
#pwm-cells = <3>;
status = "disabled";
Expand All @@ -320,6 +323,7 @@
pwm3: pwm@40086000 {
compatible = "nuvoton,npcx-pwm";
reg = <0x40086000 0x2000>;
pwm-channel = <3>;
clocks = <&pcc NPCX_CLOCK_BUS_APB2 NPCX_PWDWN_CTL2 3>;
#pwm-cells = <3>;
status = "disabled";
Expand All @@ -329,6 +333,7 @@
pwm4: pwm@40088000 {
compatible = "nuvoton,npcx-pwm";
reg = <0x40088000 0x2000>;
pwm-channel = <4>;
clocks = <&pcc NPCX_CLOCK_BUS_APB2 NPCX_PWDWN_CTL2 4>;
#pwm-cells = <3>;
status = "disabled";
Expand All @@ -338,6 +343,7 @@
pwm5: pwm@4008a000 {
compatible = "nuvoton,npcx-pwm";
reg = <0x4008a000 0x2000>;
pwm-channel = <5>;
clocks = <&pcc NPCX_CLOCK_BUS_APB2 NPCX_PWDWN_CTL2 5>;
#pwm-cells = <3>;
status = "disabled";
Expand All @@ -347,6 +353,7 @@
pwm6: pwm@4008c000 {
compatible = "nuvoton,npcx-pwm";
reg = <0x4008c000 0x2000>;
pwm-channel = <6>;
clocks = <&pcc NPCX_CLOCK_BUS_APB2 NPCX_PWDWN_CTL2 6>;
#pwm-cells = <3>;
status = "disabled";
Expand All @@ -356,6 +363,7 @@
pwm7: pwm@4008e000 {
compatible = "nuvoton,npcx-pwm";
reg = <0x4008e000 0x2000>;
pwm-channel = <7>;
clocks = <&pcc NPCX_CLOCK_BUS_APB2 NPCX_PWDWN_CTL2 7>;
#pwm-cells = <3>;
status = "disabled";
Expand Down
8 changes: 0 additions & 8 deletions dts/arm/nuvoton/npcx/npcx7/npcx7-pinctrl.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,42 +111,34 @@
/* PWM peripheral interfaces */
/omit-if-no-ref/ pwm0_gpc3: periph-pwm0 {
pinmux = <&alt4_pwm0_sl>;
drive-supported;
Copy link
Contributor

@keith-zephyr keith-zephyr May 17, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The PWM nodes should set the channel property, correct?

Copy link
Contributor Author

@MulinChao MulinChao May 18, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, drive-supported is useless now. Helper macro checks whether channel property exists. If so, the driver will create an item for pwm drive mode configuration automatically.

};

/omit-if-no-ref/ pwm1_gpc2: periph-pwm1 {
pinmux = <&alt4_pwm1_sl>;
drive-supported;
};

/omit-if-no-ref/ pwm2_gpc4: periph-pwm2 {
pinmux = <&alt4_pwm2_sl>;
drive-supported;
};

/omit-if-no-ref/ pwm3_gp80: periph-pwm3 {
pinmux = <&alt4_pwm3_sl>;
drive-supported;
};

/omit-if-no-ref/ pwm4_gpb6: periph-pwm4 {
pinmux = <&alt4_pwm4_sl>;
drive-supported;
};

/omit-if-no-ref/ pwm5_gpb7: periph-pwm5 {
pinmux = <&alt4_pwm5_sl>;
drive-supported;
};

/omit-if-no-ref/ pwm6_gpc0: periph-pwm6 {
pinmux = <&alt4_pwm6_sl>;
drive-supported;
};

/omit-if-no-ref/ pwm7_gp60: periph-pwm7 {
pinmux = <&alt4_pwm7_sl>;
drive-supported;
};

/* Keyboard peripheral interfaces. */
Expand Down
8 changes: 0 additions & 8 deletions dts/arm/nuvoton/npcx/npcx9/npcx9-pinctrl.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,42 +111,34 @@
/* PWM peripheral interfaces */
/omit-if-no-ref/ pwm0_gpc3: periph-pwm0 {
pinmux = <&alt4_pwm0_sl>;
drive-supported;
};

/omit-if-no-ref/ pwm1_gpc2: periph-pwm1 {
pinmux = <&alt4_pwm1_sl>;
drive-supported;
};

/omit-if-no-ref/ pwm2_gpc4: periph-pwm2 {
pinmux = <&alt4_pwm2_sl>;
drive-supported;
};

/omit-if-no-ref/ pwm3_gp80: periph-pwm3 {
pinmux = <&alt4_pwm3_sl>;
drive-supported;
};

/omit-if-no-ref/ pwm4_gpb6: periph-pwm4 {
pinmux = <&alt4_pwm4_sl>;
drive-supported;
};

/omit-if-no-ref/ pwm5_gpb7: periph-pwm5 {
pinmux = <&alt4_pwm5_sl>;
drive-supported;
};

/omit-if-no-ref/ pwm6_gpc0: periph-pwm6 {
pinmux = <&alt4_pwm6_sl>;
drive-supported;
};

/omit-if-no-ref/ pwm7_gp60: periph-pwm7 {
pinmux = <&alt4_pwm7_sl>;
drive-supported;
};

/* Keyboard peripheral interfaces. */
Expand Down
6 changes: 0 additions & 6 deletions dts/bindings/pinctrl/nuvoton,npcx-pinctrl.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,6 @@ child-binding:
description: |
A map to PUPD_ENn register/bit that enable pull-up/down of NPCX peripheral devices.
Please don't overwrite this property in the board-level DT driver.
drive-supported:
required: false
type: boolean
description: |
It indicates the pad's drive mode is selectable. So far, only PWM's pad has this
property in npcx series. Please don't overwrite it in the board-level DT driver.
pinmux-locked:
required: false
type: boolean
Expand Down
8 changes: 4 additions & 4 deletions dts/bindings/pwm/nuvoton,npcx-pwm.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ properties:
required: true
pinctrl-names:
required: true
drive-open-drain:
type: boolean
pwm-channel:
type: int
description: |
The PWM output will be configured as open-drain. If not set,
defaults to push-pull.
A index to indicate PWM module that generates a single PWM signal.
Please don't overwrite it in the board-level DT driver.
clock-bus:
required: false
type: string
Expand Down
15 changes: 9 additions & 6 deletions soc/arm/nuvoton_npcx/common/pinctrl_soc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,9 +102,9 @@ typedef struct npcx_pinctrl pinctrl_soc_pin_t;
UTIL_OR(DT_PROP(node_id, bias_pull_down), \
DT_PROP(node_id, bias_pull_up))

#define Z_PINCTRL_NPCX_HAS_DRIVE_PROP(node_id) \
UTIL_AND(DT_PROP(node_id, drive_open_drain), \
DT_PROP(node_id, drive_supported))
#define Z_PINCTRL_NPCX_HAS_DRIVE_PROP(node_id, node_periph) \
UTIL_AND(DT_PROP(node_id, drive_open_drain), \
DT_NODE_HAS_PROP(node_periph, pwm_channel))

/**
* @brief Utility macro to initialize a periphral pinmux configuration.
Expand Down Expand Up @@ -142,12 +142,14 @@ typedef struct npcx_pinctrl pinctrl_soc_pin_t;
* @brief Utility macro to initialize a periphral drive mode configuration.
*
* @param node_id Node identifier.
* @param node_periph Peripheral node identifier.
*/
#define Z_PINCTRL_NPCX_PERIPH_DRIVE_INIT(node_id) \
#define Z_PINCTRL_NPCX_PERIPH_DRIVE_INIT(node_id, node_periph) \
{ \
.flags.type = NPCX_PINCTRL_TYPE_PERIPH, \
.flags.io_drive_type = Z_PINCTRL_NPCX_DRIVE_TYPE(node_id), \
.cfg.periph.type = NPCX_PINCTRL_TYPE_PERIPH_DRIVE, \
.cfg.periph.group = DT_PROP(node_periph, pwm_channel), \
},

/**
Expand All @@ -158,9 +160,10 @@ typedef struct npcx_pinctrl pinctrl_soc_pin_t;
* @param idx Property entry index.
*/
#define Z_PINCTRL_STATE_PIN_INIT(node_id, prop, idx) \
COND_CODE_1(Z_PINCTRL_NPCX_HAS_DRIVE_PROP(DT_PROP_BY_IDX(node_id, prop, idx)), \
COND_CODE_1(Z_PINCTRL_NPCX_HAS_DRIVE_PROP( \
DT_PROP_BY_IDX(node_id, prop, idx), node_id), \
(Z_PINCTRL_NPCX_PERIPH_DRIVE_INIT( \
DT_PROP_BY_IDX(node_id, prop, idx))), ()) \
DT_PROP_BY_IDX(node_id, prop, idx), node_id)), ()) \
COND_CODE_1(Z_PINCTRL_NPCX_HAS_PUPD_PROP(DT_PROP_BY_IDX(node_id, prop, idx)), \
(Z_PINCTRL_NPCX_PERIPH_PUPD_INIT( \
DT_PROP_BY_IDX(node_id, prop, idx), periph_pupd)), ()) \
Expand Down