Skip to content

Commit dbf9218

Browse files
xdarklightsuperna9999
authored andcommitted
ARM: dts: amlogic: meson8b: 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-3-martin.blumenstingl@googlemail.com Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
1 parent 802cff4 commit dbf9218

4 files changed

Lines changed: 15 additions & 9 deletions

File tree

arch/arm/boot/dts/amlogic/meson8b-ec100.dts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -443,8 +443,6 @@
443443
status = "okay";
444444
pinctrl-0 = <&pwm_c1_pins>, <&pwm_d_pins>;
445445
pinctrl-names = "default";
446-
clocks = <&xtal>, <&xtal>;
447-
clock-names = "clkin0", "clkin1";
448446
};
449447

450448
&rtc {

arch/arm/boot/dts/amlogic/meson8b-mxq.dts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,8 +162,6 @@
162162
status = "okay";
163163
pinctrl-0 = <&pwm_c1_pins>, <&pwm_d_pins>;
164164
pinctrl-names = "default";
165-
clocks = <&xtal>, <&xtal>;
166-
clock-names = "clkin0", "clkin1";
167165
};
168166

169167
&uart_AO {

arch/arm/boot/dts/amlogic/meson8b-odroidc1.dts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -347,8 +347,6 @@
347347
status = "okay";
348348
pinctrl-0 = <&pwm_c1_pins>, <&pwm_d_pins>;
349349
pinctrl-names = "default";
350-
clocks = <&xtal>, <&xtal>;
351-
clock-names = "clkin0", "clkin1";
352350
};
353351

354352
&rtc {

arch/arm/boot/dts/amlogic/meson8b.dtsi

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -403,8 +403,12 @@
403403
};
404404

405405
pwm_ef: pwm@86c0 {
406-
compatible = "amlogic,meson8b-pwm";
406+
compatible = "amlogic,meson8b-pwm-v2", "amlogic,meson8-pwm-v2";
407407
reg = <0x86c0 0x10>;
408+
clocks = <&xtal>,
409+
<>, /* unknown/untested, the datasheet calls it "Video PLL" */
410+
<&clkc CLKID_FCLK_DIV4>,
411+
<&clkc CLKID_FCLK_DIV3>;
408412
#pwm-cells = <3>;
409413
status = "disabled";
410414
};
@@ -674,11 +678,19 @@
674678
};
675679

676680
&pwm_ab {
677-
compatible = "amlogic,meson8b-pwm";
681+
compatible = "amlogic,meson8b-pwm-v2", "amlogic,meson8-pwm-v2";
682+
clocks = <&xtal>,
683+
<>, /* unknown/untested, the datasheet calls it "Video PLL" */
684+
<&clkc CLKID_FCLK_DIV4>,
685+
<&clkc CLKID_FCLK_DIV3>;
678686
};
679687

680688
&pwm_cd {
681-
compatible = "amlogic,meson8b-pwm";
689+
compatible = "amlogic,meson8b-pwm-v2", "amlogic,meson8-pwm-v2";
690+
clocks = <&xtal>,
691+
<>, /* unknown/untested, the datasheet calls it "Video PLL" */
692+
<&clkc CLKID_FCLK_DIV4>,
693+
<&clkc CLKID_FCLK_DIV3>;
682694
};
683695

684696
&rtc {

0 commit comments

Comments
 (0)