Skip to content

Commit 519b8df

Browse files
arndbarndb
committed
Merge tag 'amlogic-arm64-dt-for-v6.15-v2' of https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux into soc/dt
Amlogic ARM64 DT changes for v6.15 (v2): - switch to the new PWM controller binding - Add gpio_intc node for Amlogic A4 & A5 SoCs * tag 'amlogic-arm64-dt-for-v6.15-v2' of https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux: arm64: dts: Add gpio_intc node for Amlogic A5 SoCs arm64: dts: Add gpio_intc node for Amlogic A4 SoCs arm64: dts: amlogic: g12: switch to the new PWM controller binding arm64: dts: amlogic: axg: switch to the new PWM controller binding arm64: dts: amlogic: gx: switch to the new PWM controller binding Link: https://lore.kernel.org/r/f6fb1b2b-955d-4271-b772-0a75fdba1e48@linaro.org Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 86ef293 + 67c2799 commit 519b8df

40 files changed

Lines changed: 135 additions & 123 deletions

‎arch/arm64/boot/dts/amlogic/amlogic-a4.dtsi‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,3 +48,24 @@
4848
};
4949
};
5050
};
51+
52+
&apb {
53+
gpio_intc: interrupt-controller@4080 {
54+
compatible = "amlogic,a4-gpio-intc",
55+
"amlogic,meson-gpio-intc";
56+
reg = <0x0 0x4080 0x0 0x20>;
57+
interrupt-controller;
58+
#interrupt-cells = <2>;
59+
amlogic,channel-interrupts =
60+
<10 11 12 13 14 15 16 17 18 19 20 21>;
61+
};
62+
63+
gpio_ao_intc: interrupt-controller@8e72c {
64+
compatible = "amlogic,a4-gpio-ao-intc",
65+
"amlogic,meson-gpio-intc";
66+
reg = <0x0 0x8e72c 0x0 0x0c>;
67+
interrupt-controller;
68+
#interrupt-cells = <2>;
69+
amlogic,channel-interrupts = <140 141>;
70+
};
71+
};

‎arch/arm64/boot/dts/amlogic/amlogic-a5.dtsi‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,3 +48,15 @@
4848
};
4949
};
5050
};
51+
52+
&apb {
53+
gpio_intc: interrupt-controller@4080 {
54+
compatible = "amlogic,a5-gpio-intc",
55+
"amlogic,meson-gpio-intc";
56+
reg = <0x0 0x4080 0x0 0x20>;
57+
interrupt-controller;
58+
#interrupt-cells = <2>;
59+
amlogic,channel-interrupts =
60+
<10 11 12 13 14 15 16 17 18 19 20 21>;
61+
};
62+
};

‎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
};

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

Lines changed: 28 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2060,8 +2060,11 @@
20602060
};
20612061

20622062
pwm_AO_cd: pwm@2000 {
2063-
compatible = "amlogic,meson-g12a-ao-pwm-cd";
2063+
compatible = "amlogic,meson-g12-pwm-v2",
2064+
"amlogic,meson8-pwm-v2";
20642065
reg = <0x0 0x2000 0x0 0x20>;
2066+
clocks = <&xtal>,
2067+
<&clkc_AO CLKID_AO_CLK81>;
20652068
#pwm-cells = <3>;
20662069
status = "disabled";
20672070
};
@@ -2099,8 +2102,13 @@
20992102
};
21002103

21012104
pwm_AO_ab: pwm@7000 {
2102-
compatible = "amlogic,meson-g12a-ao-pwm-ab";
2105+
compatible = "amlogic,meson-g12-pwm-v2",
2106+
"amlogic,meson8-pwm-v2";
21032107
reg = <0x0 0x7000 0x0 0x20>;
2108+
clocks = <&xtal>,
2109+
<&clkc_AO CLKID_AO_CLK81>,
2110+
<&clkc CLKID_FCLK_DIV4>,
2111+
<&clkc CLKID_FCLK_DIV5>;
21042112
#pwm-cells = <3>;
21052113
status = "disabled";
21062114
};
@@ -2301,22 +2309,37 @@
23012309
};
23022310

23032311
pwm_ef: pwm@19000 {
2304-
compatible = "amlogic,meson-g12a-ee-pwm";
2312+
compatible = "amlogic,meson-g12-pwm-v2",
2313+
"amlogic,meson8-pwm-v2";
23052314
reg = <0x0 0x19000 0x0 0x20>;
2315+
clocks = <&xtal>,
2316+
<>, /* unknown/untested, the datasheet calls it "vid_pll" */
2317+
<&clkc CLKID_FCLK_DIV4>,
2318+
<&clkc CLKID_FCLK_DIV3>;
23062319
#pwm-cells = <3>;
23072320
status = "disabled";
23082321
};
23092322

23102323
pwm_cd: pwm@1a000 {
2311-
compatible = "amlogic,meson-g12a-ee-pwm";
2324+
compatible = "amlogic,meson-g12-pwm-v2",
2325+
"amlogic,meson8-pwm-v2";
23122326
reg = <0x0 0x1a000 0x0 0x20>;
2327+
clocks = <&xtal>,
2328+
<>, /* unknown/untested, the datasheet calls it "vid_pll" */
2329+
<&clkc CLKID_FCLK_DIV4>,
2330+
<&clkc CLKID_FCLK_DIV3>;
23132331
#pwm-cells = <3>;
23142332
status = "disabled";
23152333
};
23162334

23172335
pwm_ab: pwm@1b000 {
2318-
compatible = "amlogic,meson-g12a-ee-pwm";
2336+
compatible = "amlogic,meson-g12-pwm-v2",
2337+
"amlogic,meson8-pwm-v2";
23192338
reg = <0x0 0x1b000 0x0 0x20>;
2339+
clocks = <&xtal>,
2340+
<>, /* unknown/untested, the datasheet calls it "vid_pll" */
2341+
<&clkc CLKID_FCLK_DIV4>,
2342+
<&clkc CLKID_FCLK_DIV3>;
23202343
#pwm-cells = <3>;
23212344
status = "disabled";
23222345
};

‎arch/arm64/boot/dts/amlogic/meson-g12a-fbx8am.dts‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -346,17 +346,13 @@
346346
&pwm_AO_cd {
347347
pinctrl-0 = <&pwm_ao_d_e_pins>;
348348
pinctrl-names = "default";
349-
clocks = <&xtal>;
350-
clock-names = "clkin1";
351349
status = "okay";
352350
};
353351

354352
&pwm_ef {
355353
status = "okay";
356354
pinctrl-0 = <&pwm_e_pins>;
357355
pinctrl-names = "default";
358-
clocks = <&xtal>;
359-
clock-names = "clkin0";
360356
};
361357

362358
&pdm {

‎arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -284,17 +284,13 @@
284284
&pwm_AO_cd {
285285
pinctrl-0 = <&pwm_ao_d_e_pins>;
286286
pinctrl-names = "default";
287-
clocks = <&xtal>;
288-
clock-names = "clkin1";
289287
status = "okay";
290288
};
291289

292290
&pwm_ef {
293291
status = "okay";
294292
pinctrl-0 = <&pwm_e_pins>;
295293
pinctrl-names = "default";
296-
clocks = <&xtal>;
297-
clock-names = "clkin0";
298294
};
299295

300296
&saradc {

‎arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -389,17 +389,13 @@
389389
&pwm_AO_cd {
390390
pinctrl-0 = <&pwm_ao_d_e_pins>;
391391
pinctrl-names = "default";
392-
clocks = <&xtal>;
393-
clock-names = "clkin1";
394392
status = "okay";
395393
};
396394

397395
&pwm_ef {
398396
status = "okay";
399397
pinctrl-0 = <&pwm_e_pins>;
400398
pinctrl-names = "default";
401-
clocks = <&xtal>;
402-
clock-names = "clkin0";
403399
};
404400

405401
&pdm {

‎arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -502,8 +502,6 @@
502502
&pwm_AO_cd {
503503
pinctrl-0 = <&pwm_ao_d_e_pins>;
504504
pinctrl-names = "default";
505-
clocks = <&xtal>;
506-
clock-names = "clkin1";
507505
status = "okay";
508506
};
509507

‎arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -328,8 +328,6 @@
328328
&pwm_AO_cd {
329329
pinctrl-0 = <&pwm_ao_d_e_pins>;
330330
pinctrl-names = "default";
331-
clocks = <&xtal>;
332-
clock-names = "clkin1";
333331
status = "okay";
334332
};
335333

@@ -363,8 +361,6 @@
363361
status = "okay";
364362
pinctrl-0 = <&pwm_e_pins>;
365363
pinctrl-names = "default";
366-
clocks = <&xtal>;
367-
clock-names = "clkin0";
368364
};
369365

370366
&uart_A {

‎arch/arm64/boot/dts/amlogic/meson-g12b-a311d-libretech-cc.dts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,4 @@
116116

117117
&pwm_ab {
118118
pinctrl-0 = <&pwm_a_e_pins>, <&pwm_b_x7_pins>;
119-
clocks = <&xtal>, <&xtal>;
120-
clock-names = "clkin0", "clkin1";
121119
};

0 commit comments

Comments
 (0)