Skip to content

Commit 0322ff4

Browse files
xdarklightsuperna9999
authored andcommitted
arm64: dts: amlogic: axg: switch to the new PWM controller binding
Use the new PWM controller binding which now relies on passing all clock inputs available on the SoC (instead of passing the "wanted" clock input for a given board). Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com> Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org> Link: https://lore.kernel.org/r/20241227212514.1376682-5-martin.blumenstingl@googlemail.com Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
1 parent a526eee commit 0322ff4

1 file changed

Lines changed: 20 additions & 4 deletions

File tree

arch/arm64/boot/dts/amlogic/meson-axg.dtsi

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1693,8 +1693,12 @@
16931693
};
16941694

16951695
pwm_AO_cd: pwm@2000 {
1696-
compatible = "amlogic,meson-axg-ao-pwm";
1696+
compatible = "amlogic,meson-axg-pwm-v2", "amlogic,meson8-pwm-v2";
16971697
reg = <0x0 0x02000 0x0 0x20>;
1698+
clocks = <&xtal>,
1699+
<&clkc_AO CLKID_AO_CLK81>,
1700+
<&clkc CLKID_FCLK_DIV4>,
1701+
<&clkc CLKID_FCLK_DIV5>;
16981702
#pwm-cells = <3>;
16991703
status = "disabled";
17001704
};
@@ -1728,8 +1732,12 @@
17281732
};
17291733

17301734
pwm_AO_ab: pwm@7000 {
1731-
compatible = "amlogic,meson-axg-ao-pwm";
1735+
compatible = "amlogic,meson-axg-pwm-v2", "amlogic,meson8-pwm-v2";
17321736
reg = <0x0 0x07000 0x0 0x20>;
1737+
clocks = <&xtal>,
1738+
<&clkc_AO CLKID_AO_CLK81>,
1739+
<&clkc CLKID_FCLK_DIV4>,
1740+
<&clkc CLKID_FCLK_DIV5>;
17331741
#pwm-cells = <3>;
17341742
status = "disabled";
17351743
};
@@ -1806,15 +1814,23 @@
18061814
};
18071815

18081816
pwm_ab: pwm@1b000 {
1809-
compatible = "amlogic,meson-axg-ee-pwm";
1817+
compatible = "amlogic,meson-axg-pwm-v2", "amlogic,meson8-pwm-v2";
18101818
reg = <0x0 0x1b000 0x0 0x20>;
1819+
clocks = <&xtal>,
1820+
<&clkc CLKID_FCLK_DIV5>,
1821+
<&clkc CLKID_FCLK_DIV4>,
1822+
<&clkc CLKID_FCLK_DIV3>;
18111823
#pwm-cells = <3>;
18121824
status = "disabled";
18131825
};
18141826

18151827
pwm_cd: pwm@1a000 {
1816-
compatible = "amlogic,meson-axg-ee-pwm";
1828+
compatible = "amlogic,meson-axg-pwm-v2", "amlogic,meson8-pwm-v2";
18171829
reg = <0x0 0x1a000 0x0 0x20>;
1830+
clocks = <&xtal>,
1831+
<&clkc CLKID_FCLK_DIV5>,
1832+
<&clkc CLKID_FCLK_DIV4>,
1833+
<&clkc CLKID_FCLK_DIV3>;
18181834
#pwm-cells = <3>;
18191835
status = "disabled";
18201836
};

0 commit comments

Comments
 (0)