Skip to content

Commit 3bddf73

Browse files
hkallweitthierryreding
authored andcommitted
pwm: meson: don't use hdmi/video clock as mux parent
The meson_vclk code from the display driver may change the rate of the video clock. Therefore better don't use it as pwm mux parent. After removing this clock from the parent list pwm_gxbb_data and pwm_g12a_ee_data are the same as pwm_meson8b_data. So we can remove them. Reported-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> Reviewed-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> Signed-off-by: Thierry Reding <thierry.reding@gmail.com>
1 parent ed73300 commit 3bddf73

1 file changed

Lines changed: 3 additions & 21 deletions

File tree

drivers/pwm/pwm-meson.c

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -364,23 +364,14 @@ static const struct pwm_ops meson_pwm_ops = {
364364
};
365365

366366
static const char * const pwm_meson8b_parent_names[] = {
367-
"xtal", "vid_pll", "fclk_div4", "fclk_div3"
367+
"xtal", NULL, "fclk_div4", "fclk_div3"
368368
};
369369

370370
static const struct meson_pwm_data pwm_meson8b_data = {
371371
.parent_names = pwm_meson8b_parent_names,
372372
.num_parents = ARRAY_SIZE(pwm_meson8b_parent_names),
373373
};
374374

375-
static const char * const pwm_gxbb_parent_names[] = {
376-
"xtal", "hdmi_pll", "fclk_div4", "fclk_div3"
377-
};
378-
379-
static const struct meson_pwm_data pwm_gxbb_data = {
380-
.parent_names = pwm_gxbb_parent_names,
381-
.num_parents = ARRAY_SIZE(pwm_gxbb_parent_names),
382-
};
383-
384375
/*
385376
* Only the 2 first inputs of the GXBB AO PWMs are valid
386377
* The last 2 are grounded
@@ -430,23 +421,14 @@ static const struct meson_pwm_data pwm_g12a_ao_cd_data = {
430421
.num_parents = ARRAY_SIZE(pwm_g12a_ao_cd_parent_names),
431422
};
432423

433-
static const char * const pwm_g12a_ee_parent_names[] = {
434-
"xtal", "hdmi_pll", "fclk_div4", "fclk_div3"
435-
};
436-
437-
static const struct meson_pwm_data pwm_g12a_ee_data = {
438-
.parent_names = pwm_g12a_ee_parent_names,
439-
.num_parents = ARRAY_SIZE(pwm_g12a_ee_parent_names),
440-
};
441-
442424
static const struct of_device_id meson_pwm_matches[] = {
443425
{
444426
.compatible = "amlogic,meson8b-pwm",
445427
.data = &pwm_meson8b_data
446428
},
447429
{
448430
.compatible = "amlogic,meson-gxbb-pwm",
449-
.data = &pwm_gxbb_data
431+
.data = &pwm_meson8b_data
450432
},
451433
{
452434
.compatible = "amlogic,meson-gxbb-ao-pwm",
@@ -462,7 +444,7 @@ static const struct of_device_id meson_pwm_matches[] = {
462444
},
463445
{
464446
.compatible = "amlogic,meson-g12a-ee-pwm",
465-
.data = &pwm_g12a_ee_data
447+
.data = &pwm_meson8b_data
466448
},
467449
{
468450
.compatible = "amlogic,meson-g12a-ao-pwm-ab",

0 commit comments

Comments
 (0)