Skip to content

Commit e36f6de

Browse files
arndbarndb
committed
Merge tag 'amlogic-fixes-for-v6.15' of https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux into arm/fixes
Amlogic Fixes for v6.15: - fix reference to unknown/untested PWM clock on ARM/ARM64 boards - fix missing clkc_audio node on dreambox ARM64 DT * tag 'amlogic-fixes-for-v6.15' of https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux: arm64: dts: amlogic: dreambox: fix missing clkc_audio node arm64: dts: amlogic: g12: fix reference to unknown/untested PWM clock arm64: dts: amlogic: gx: fix reference to unknown/untested PWM clock ARM: dts: amlogic: meson8b: fix reference to unknown/untested PWM clock ARM: dts: amlogic: meson8: fix reference to unknown/untested PWM clock Link: https://lore.kernel.org/r/e9c520a1-b986-49e1-b9b1-67511c187716@linaro.org Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 81b7cf8 + 0f67578 commit e36f6de

6 files changed

Lines changed: 19 additions & 15 deletions

File tree

‎arch/arm/boot/dts/amlogic/meson8.dtsi‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -451,7 +451,7 @@
451451
pwm_ef: pwm@86c0 {
452452
compatible = "amlogic,meson8-pwm-v2";
453453
clocks = <&xtal>,
454-
<>, /* unknown/untested, the datasheet calls it "Video PLL" */
454+
<0>, /* unknown/untested, the datasheet calls it "Video PLL" */
455455
<&clkc CLKID_FCLK_DIV4>,
456456
<&clkc CLKID_FCLK_DIV3>;
457457
reg = <0x86c0 0x10>;
@@ -705,15 +705,15 @@
705705
&pwm_ab {
706706
compatible = "amlogic,meson8-pwm-v2";
707707
clocks = <&xtal>,
708-
<>, /* unknown/untested, the datasheet calls it "Video PLL" */
708+
<0>, /* unknown/untested, the datasheet calls it "Video PLL" */
709709
<&clkc CLKID_FCLK_DIV4>,
710710
<&clkc CLKID_FCLK_DIV3>;
711711
};
712712

713713
&pwm_cd {
714714
compatible = "amlogic,meson8-pwm-v2";
715715
clocks = <&xtal>,
716-
<>, /* unknown/untested, the datasheet calls it "Video PLL" */
716+
<0>, /* unknown/untested, the datasheet calls it "Video PLL" */
717717
<&clkc CLKID_FCLK_DIV4>,
718718
<&clkc CLKID_FCLK_DIV3>;
719719
};

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -406,7 +406,7 @@
406406
compatible = "amlogic,meson8b-pwm-v2", "amlogic,meson8-pwm-v2";
407407
reg = <0x86c0 0x10>;
408408
clocks = <&xtal>,
409-
<>, /* unknown/untested, the datasheet calls it "Video PLL" */
409+
<0>, /* unknown/untested, the datasheet calls it "Video PLL" */
410410
<&clkc CLKID_FCLK_DIV4>,
411411
<&clkc CLKID_FCLK_DIV3>;
412412
#pwm-cells = <3>;
@@ -680,15 +680,15 @@
680680
&pwm_ab {
681681
compatible = "amlogic,meson8b-pwm-v2", "amlogic,meson8-pwm-v2";
682682
clocks = <&xtal>,
683-
<>, /* unknown/untested, the datasheet calls it "Video PLL" */
683+
<0>, /* unknown/untested, the datasheet calls it "Video PLL" */
684684
<&clkc CLKID_FCLK_DIV4>,
685685
<&clkc CLKID_FCLK_DIV3>;
686686
};
687687

688688
&pwm_cd {
689689
compatible = "amlogic,meson8b-pwm-v2", "amlogic,meson8-pwm-v2";
690690
clocks = <&xtal>,
691-
<>, /* unknown/untested, the datasheet calls it "Video PLL" */
691+
<0>, /* unknown/untested, the datasheet calls it "Video PLL" */
692692
<&clkc CLKID_FCLK_DIV4>,
693693
<&clkc CLKID_FCLK_DIV3>;
694694
};

‎arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2313,7 +2313,7 @@
23132313
"amlogic,meson8-pwm-v2";
23142314
reg = <0x0 0x19000 0x0 0x20>;
23152315
clocks = <&xtal>,
2316-
<>, /* unknown/untested, the datasheet calls it "vid_pll" */
2316+
<0>, /* unknown/untested, the datasheet calls it "vid_pll" */
23172317
<&clkc CLKID_FCLK_DIV4>,
23182318
<&clkc CLKID_FCLK_DIV3>;
23192319
#pwm-cells = <3>;
@@ -2325,7 +2325,7 @@
23252325
"amlogic,meson8-pwm-v2";
23262326
reg = <0x0 0x1a000 0x0 0x20>;
23272327
clocks = <&xtal>,
2328-
<>, /* unknown/untested, the datasheet calls it "vid_pll" */
2328+
<0>, /* unknown/untested, the datasheet calls it "vid_pll" */
23292329
<&clkc CLKID_FCLK_DIV4>,
23302330
<&clkc CLKID_FCLK_DIV3>;
23312331
#pwm-cells = <3>;
@@ -2337,7 +2337,7 @@
23372337
"amlogic,meson8-pwm-v2";
23382338
reg = <0x0 0x1b000 0x0 0x20>;
23392339
clocks = <&xtal>,
2340-
<>, /* unknown/untested, the datasheet calls it "vid_pll" */
2340+
<0>, /* unknown/untested, the datasheet calls it "vid_pll" */
23412341
<&clkc CLKID_FCLK_DIV4>,
23422342
<&clkc CLKID_FCLK_DIV3>;
23432343
#pwm-cells = <3>;

‎arch/arm64/boot/dts/amlogic/meson-g12b-dreambox.dtsi‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,10 @@
116116
status = "okay";
117117
};
118118

119+
&clkc_audio {
120+
status = "okay";
121+
};
122+
119123
&frddr_a {
120124
status = "okay";
121125
};

‎arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -741,7 +741,7 @@
741741

742742
&pwm_ab {
743743
clocks = <&xtal>,
744-
<>, /* unknown/untested, the datasheet calls it "vid_pll" */
744+
<0>, /* unknown/untested, the datasheet calls it "vid_pll" */
745745
<&clkc CLKID_FCLK_DIV4>,
746746
<&clkc CLKID_FCLK_DIV3>;
747747
};
@@ -752,14 +752,14 @@
752752

753753
&pwm_cd {
754754
clocks = <&xtal>,
755-
<>, /* unknown/untested, the datasheet calls it "vid_pll" */
755+
<0>, /* unknown/untested, the datasheet calls it "vid_pll" */
756756
<&clkc CLKID_FCLK_DIV4>,
757757
<&clkc CLKID_FCLK_DIV3>;
758758
};
759759

760760
&pwm_ef {
761761
clocks = <&xtal>,
762-
<>, /* unknown/untested, the datasheet calls it "vid_pll" */
762+
<0>, /* unknown/untested, the datasheet calls it "vid_pll" */
763763
<&clkc CLKID_FCLK_DIV4>,
764764
<&clkc CLKID_FCLK_DIV3>;
765765
};

‎arch/arm64/boot/dts/amlogic/meson-gxl.dtsi‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -811,7 +811,7 @@
811811

812812
&pwm_ab {
813813
clocks = <&xtal>,
814-
<>, /* unknown/untested, the datasheet calls it "vid_pll" */
814+
<0>, /* unknown/untested, the datasheet calls it "vid_pll" */
815815
<&clkc CLKID_FCLK_DIV4>,
816816
<&clkc CLKID_FCLK_DIV3>;
817817
};
@@ -822,14 +822,14 @@
822822

823823
&pwm_cd {
824824
clocks = <&xtal>,
825-
<>, /* unknown/untested, the datasheet calls it "vid_pll" */
825+
<0>, /* unknown/untested, the datasheet calls it "vid_pll" */
826826
<&clkc CLKID_FCLK_DIV4>,
827827
<&clkc CLKID_FCLK_DIV3>;
828828
};
829829

830830
&pwm_ef {
831831
clocks = <&xtal>,
832-
<>, /* unknown/untested, the datasheet calls it "vid_pll" */
832+
<0>, /* unknown/untested, the datasheet calls it "vid_pll" */
833833
<&clkc CLKID_FCLK_DIV4>,
834834
<&clkc CLKID_FCLK_DIV3>;
835835
};

0 commit comments

Comments
 (0)