Skip to contentSkip to conversation

pwm: meson: fix axg ao mux parents

PATCH In review Heiner Kallweit 3 participants 3 messages Apr 9, 2023 – Apr 13, 2023

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 pwm: meson: fix axg ao mux parents

This fix is basically the same as 9bce02ef0dfa ("pwm: meson: Fix the G12A AO clock parents order"). Vendor driver referenced there has xtal as first parent also for axg ao. In addition fix the name of the aoclk81 clock. Apparently name aoclk81 as used by the vendor driver was changed when mainlining the axg clock driver.

Fixes bccaa3f917c9 ("pwm: meson: Add clock source configuration for Meson-AXG")
---
 drivers/pwm/pwm-meson.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pwm/pwm-meson.c +1 -1
index b5c746fab..0fe0400c2 100644
@@ -381,7 +381,7 @@ static const struct meson_pwm_data pwm_axg_ee_data = {
 };
 
 static const char * const pwm_axg_ao_parent_names[] = {
-	"aoclk81", "xtal", "fclk_div4", "fclk_div5"
+	"xtal", "axg_ao_clk81", "fclk_div4", "fclk_div5"
 };
 
 static const struct meson_pwm_data pwm_axg_ao_data = {
Signature · 1 line
2.40.0
reviewer Reviewed-by on v2 1/1
#1 lore raw
Quoted 11 lines · Heiner Kallweit

This fix is basically the same as 9bce02ef0dfa ("pwm: meson: Fix the G12A AO clock parents order"). Vendor driver referenced there has xtal as first parent also for axg ao. In addition fix the name of the aoclk81 clock. Apparently name aoclk81 as used by the vendor driver was changed when mainlining the axg clock driver.

Fixes bccaa3f917c9 ("pwm: meson: Add clock source configuration for Meson-AXG")
#2 lore raw
In reply to Heiner Kallweit
Quoted 6 lines · Heiner Kallweit

This fix is basically the same as 9bce02ef0dfa ("pwm: meson: Fix the G12A AO clock parents order"). Vendor driver referenced there has xtal as first parent also for axg ao. In addition fix the name of the aoclk81 clock. Apparently name aoclk81 as used by the vendor driver was changed when mainlining the axg clock driver.

Quoted 7 lines
Fixes bccaa3f917c9 ("pwm: meson: Add clock source configuration for Meson-AXG")
---
 drivers/pwm/pwm-meson.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

This looks like it supersedes this one:

	https://patchwork.ozlabs.org/project/linux-pwm/patch/[email protected]/

I don't see any discussion on on that one, nor does v2 here have a changelog and the commit subject is slightly changed, so you're making it more difficult than necessary to correlate the two.

Anyway, since both patches conflict, I've picked up v2. Let me know if that's not what you intended.

Thierry

Quoted 17 lines
drivers/pwm/pwm-meson.c +1 -1
index b5c746fab..0fe0400c2 100644
@@ -381,7 +381,7 @@ static const struct meson_pwm_data pwm_axg_ee_data = {
 };
 
 static const char * const pwm_axg_ao_parent_names[] = {
-	"aoclk81", "xtal", "fclk_div4", "fclk_div5"
+	"xtal", "axg_ao_clk81", "fclk_div4", "fclk_div5"
 };
 
 static const struct meson_pwm_data pwm_axg_ao_data = {
Signature · 1 line
2.40.0