tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

pwm: meson: Use separate device id data for axg and g12

Add separate devce id data for compatibles: amlogic,meson-g12a-ee-pwm,
amlogic,meson-axg-pwm-v2, amlogic,meson-g12-pwm-v2 due to those PWM
modules have different set of features than meson8.

Signed-off-by: George Stark <gnstark@salutedevices.com>
Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
Link: https://lore.kernel.org/r/20241119125318.3492261-4-gnstark@salutedevices.com
Signed-off-by: Uwe Kleine-König <ukleinek@kernel.org>

authored by

George Stark and committed by
Uwe Kleine-König 3a44aacf dd4d280a

+18 -1
+18 -1
drivers/pwm/pwm-meson.c
··· 561 561 .channels_init = meson_pwm_init_channels_meson8b_legacy, 562 562 }; 563 563 564 + static const struct meson_pwm_data pwm_g12a_ee_data = { 565 + .parent_names = { "xtal", NULL, "fclk_div4", "fclk_div3" }, 566 + .channels_init = meson_pwm_init_channels_meson8b_legacy, 567 + }; 568 + 564 569 static const struct meson_pwm_data pwm_g12a_ao_ab_data = { 565 570 .parent_names = { "xtal", "g12a_ao_clk81", "fclk_div4", "fclk_div5" }, 566 571 .channels_init = meson_pwm_init_channels_meson8b_legacy, ··· 580 575 .channels_init = meson_pwm_init_channels_meson8b_v2, 581 576 }; 582 577 578 + static const struct meson_pwm_data pwm_meson_axg_v2_data = { 579 + .channels_init = meson_pwm_init_channels_meson8b_v2, 580 + }; 581 + 583 582 static const struct meson_pwm_data pwm_s4_data = { 584 583 .channels_init = meson_pwm_init_channels_s4, 585 584 }; ··· 592 583 { 593 584 .compatible = "amlogic,meson8-pwm-v2", 594 585 .data = &pwm_meson8_v2_data 586 + }, 587 + { 588 + .compatible = "amlogic,meson-axg-pwm-v2", 589 + .data = &pwm_meson_axg_v2_data 590 + }, 591 + { 592 + .compatible = "amlogic,meson-g12-pwm-v2", 593 + .data = &pwm_meson_axg_v2_data 595 594 }, 596 595 /* The following compatibles are obsolete */ 597 596 { ··· 624 607 }, 625 608 { 626 609 .compatible = "amlogic,meson-g12a-ee-pwm", 627 - .data = &pwm_meson8b_data 610 + .data = &pwm_g12a_ee_data 628 611 }, 629 612 { 630 613 .compatible = "amlogic,meson-g12a-ao-pwm-ab",