[PATCH v2 1/4] pwm: meson: switch to using struct clk_parent_data for mux parents

Heiner Kallweit
2023-04-11T19:27:30Z

We'll use struct clk_parent_data for mux/div/gate initialization in the
follow-up patches. As a first step switch the mux from using
parent_names to clk_parent_data.

Suggested-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
---
drivers/pwm/pwm-meson.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/drivers/pwm/pwm-meson.c b/drivers/pwm/pwm-meson.c
index 4e5605c9d..52a2104f0 100644
--- a/drivers/pwm/pwm-meson.c
+++ b/drivers/pwm/pwm-meson.c
@@ -61,6 +61,7 @@
#define MISC_A_EN BIT(0)

#define MESON_NUM_PWMS 2
+#define MESON_MAX_MUX_PARENTS 4

static struct meson_pwm_channel_data {
u8 reg_offset;
@@ -485,20 +486,27 @@ MODULE_DEVICE_TABLE(of, meson_pwm_matches);
static int meson_pwm_init_channels(struct meson_pwm *meson)
{
struct device *dev = meson->chip.dev;
- struct clk_init_data init;
unsigned int i;
char name[255];
int err;

for (i = 0; i < meson->chip.npwm; i++) {
struct meson_pwm_channel *channel = &meson->channels[i];
+ struct clk_parent_data mux_parent_data[MESON_MAX_MUX_PARENTS] = {};
+ struct clk_init_data init = {};
+ int j;

snprintf(name, sizeof(name), "%s#mux%u", dev_name(dev), i);

+ for (j = 0; j < meson->data->num_parents; j++) {
+ mux_parent_data[j].index = -1;
+ mux_parent_data[j].name = meson->data->parent_names[j];
+ }
+
init.name = name;
init.ops = &clk_mux_ops;
init.flags = 0;
- init.parent_names = meson->data->parent_names;
+ init.parent_data = mux_parent_data;
init.num_parents = meson->data->num_parents;

channel->mux.reg = meson->base + REG_MISC_AB;
--
2.40.0