diff --git a/arch/arm64/boot/dts/amlogic/mesong12a.dtsi b/arch/arm64/boot/dts/amlogic/mesong12a.dtsi index 407e5e10d110..d6ad119f8666 100644 --- a/arch/arm64/boot/dts/amlogic/mesong12a.dtsi +++ b/arch/arm64/boot/dts/amlogic/mesong12a.dtsi @@ -396,7 +396,7 @@ }; pwm_ab: pwm@1b000 { - compatible = "amlogic,txlx-ee-pwm"; + compatible = "amlogic,g12a-ee-pwm"; reg = <0x0 0x1b000 0x0 0x20>; #pwm-cells = <3>; clocks = <&xtal>, @@ -414,7 +414,7 @@ }; pwm_cd: pwm@1a000 { - compatible = "amlogic,txlx-ee-pwm"; + compatible = "amlogic,g12a-ee-pwm"; reg = <0x0 0x1a000 0x0 0x20>; #pwm-cells = <3>; clocks = <&xtal>, @@ -429,7 +429,7 @@ }; pwm_ef: pwm@19000 { - compatible = "amlogic,txlx-ee-pwm"; + compatible = "amlogic,g12a-ee-pwm"; reg = <0x0 0x19000 0x0 0x20>; #pwm-cells = <3>; clocks = <&xtal>, @@ -515,7 +515,7 @@ }; pwm_AO_ab: pwm@7000 { - compatible = "amlogic,txlx-ao-pwm"; + compatible = "amlogic,g12a-ao-pwm"; reg = <0x0 0x7000 0x0 0x20>; #pwm-cells = <3>; clocks = <&xtal>, @@ -530,7 +530,7 @@ }; pwm_AO_cd: pwm@2000 { - compatible = "amlogic,txlx-ao-pwm"; + compatible = "amlogic,g12a-ao-pwm"; reg = <0x0 0x2000 0x0 0x20>; #pwm-cells = <3>; clocks = <&xtal>, diff --git a/drivers/amlogic/pwm/pwm_meson.c b/drivers/amlogic/pwm/pwm_meson.c index 3bdc2f2a1bbc..af658ac83974 100644 --- a/drivers/amlogic/pwm/pwm_meson.c +++ b/drivers/amlogic/pwm/pwm_meson.c @@ -419,7 +419,7 @@ static const char * const pwm_g12a_ee_parent_names[] = { }; static const char * const pwm_g12a_ao_parent_names[] = { - "clk81", "xtal", "fclk_div4", "fclk_div5" + "xtal", "clk81", "fclk_div4", "fclk_div5" }; static const char * const pwm_txlx_ee_parent_names[] = {