github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-27 16:44:58 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

arm64: dts: amlogic: g12: switch to the new PWM controller binding

Browse Source 
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-6-martin.blumenstingl@googlemail.com
Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
This commit is contained in:
Martin Blumenstingl 2024-12-27 22:25:14 +01:00 committed by Neil Armstrong
parent 0322ff45bd
commit e6884f2e41
19 changed files with 28 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
View File

@ -2060,8 +2060,11 @@ cecb_AO: cec@280 {
}; };
pwm_AO_cd: pwm@2000 { pwm_AO_cd: pwm@2000 {
compatible = "amlogic,meson-g12a-ao-pwm-cd"; compatible = "amlogic,meson-g12-pwm-v2",
"amlogic,meson8-pwm-v2";
reg = <0x0 0x2000 0x0 0x20>; reg = <0x0 0x2000 0x0 0x20>;
clocks = <&xtal>,
<&clkc_AO CLKID_AO_CLK81>;
#pwm-cells = <3>; #pwm-cells = <3>;
status = "disabled"; status = "disabled";
}; };
@ -2099,8 +2102,13 @@ i2c_AO: i2c@5000 {
}; };
pwm_AO_ab: pwm@7000 { pwm_AO_ab: pwm@7000 {
compatible = "amlogic,meson-g12a-ao-pwm-ab"; compatible = "amlogic,meson-g12-pwm-v2",
"amlogic,meson8-pwm-v2";
reg = <0x0 0x7000 0x0 0x20>; reg = <0x0 0x7000 0x0 0x20>;
clocks = <&xtal>,
<&clkc_AO CLKID_AO_CLK81>,
<&clkc CLKID_FCLK_DIV4>,
<&clkc CLKID_FCLK_DIV5>;
#pwm-cells = <3>; #pwm-cells = <3>;
status = "disabled"; status = "disabled";
}; };
@ -2301,22 +2309,37 @@ spifc: spi@14000 {
}; };
pwm_ef: pwm@19000 { pwm_ef: pwm@19000 {
compatible = "amlogic,meson-g12a-ee-pwm"; compatible = "amlogic,meson-g12-pwm-v2",
"amlogic,meson8-pwm-v2";
reg = <0x0 0x19000 0x0 0x20>; reg = <0x0 0x19000 0x0 0x20>;
clocks = <&xtal>,
<>, /* unknown/untested, the datasheet calls it "vid_pll" */
<&clkc CLKID_FCLK_DIV4>,
<&clkc CLKID_FCLK_DIV3>;
#pwm-cells = <3>; #pwm-cells = <3>;
status = "disabled"; status = "disabled";
}; };
pwm_cd: pwm@1a000 { pwm_cd: pwm@1a000 {
compatible = "amlogic,meson-g12a-ee-pwm"; compatible = "amlogic,meson-g12-pwm-v2",
"amlogic,meson8-pwm-v2";
reg = <0x0 0x1a000 0x0 0x20>; reg = <0x0 0x1a000 0x0 0x20>;
clocks = <&xtal>,
<>, /* unknown/untested, the datasheet calls it "vid_pll" */
<&clkc CLKID_FCLK_DIV4>,
<&clkc CLKID_FCLK_DIV3>;
#pwm-cells = <3>; #pwm-cells = <3>;
status = "disabled"; status = "disabled";
}; };
pwm_ab: pwm@1b000 { pwm_ab: pwm@1b000 {
compatible = "amlogic,meson-g12a-ee-pwm"; compatible = "amlogic,meson-g12-pwm-v2",
"amlogic,meson8-pwm-v2";
reg = <0x0 0x1b000 0x0 0x20>; reg = <0x0 0x1b000 0x0 0x20>;
clocks = <&xtal>,
<>, /* unknown/untested, the datasheet calls it "vid_pll" */
<&clkc CLKID_FCLK_DIV4>,
<&clkc CLKID_FCLK_DIV3>;
#pwm-cells = <3>; #pwm-cells = <3>;
status = "disabled"; status = "disabled";
}; };

4
arch/arm64/boot/dts/amlogic/meson-g12a-fbx8am.dts
View File

@ -346,8 +346,6 @@ &ir {
&pwm_AO_cd { &pwm_AO_cd {
pinctrl-0 = <&pwm_ao_d_e_pins>; pinctrl-0 = <&pwm_ao_d_e_pins>;
pinctrl-names = "default"; pinctrl-names = "default";
clocks = <&xtal>;
clock-names = "clkin1";
status = "okay"; status = "okay";
}; };
@ -355,8 +353,6 @@ &pwm_ef {
status = "okay"; status = "okay";
pinctrl-0 = <&pwm_e_pins>; pinctrl-0 = <&pwm_e_pins>;
pinctrl-names = "default"; pinctrl-names = "default";
clocks = <&xtal>;
clock-names = "clkin0";
}; };
&pdm { &pdm {

4
arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts
View File

@ -284,8 +284,6 @@ &ir {
&pwm_AO_cd { &pwm_AO_cd {
pinctrl-0 = <&pwm_ao_d_e_pins>; pinctrl-0 = <&pwm_ao_d_e_pins>;
pinctrl-names = "default"; pinctrl-names = "default";
clocks = <&xtal>;
clock-names = "clkin1";
status = "okay"; status = "okay";
}; };
@ -293,8 +291,6 @@ &pwm_ef {
status = "okay"; status = "okay";
pinctrl-0 = <&pwm_e_pins>; pinctrl-0 = <&pwm_e_pins>;
pinctrl-names = "default"; pinctrl-names = "default";
clocks = <&xtal>;
clock-names = "clkin0";
}; };
&saradc { &saradc {

4
arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts
View File

@ -389,8 +389,6 @@ &ir {
&pwm_AO_cd { &pwm_AO_cd {
pinctrl-0 = <&pwm_ao_d_e_pins>; pinctrl-0 = <&pwm_ao_d_e_pins>;
pinctrl-names = "default"; pinctrl-names = "default";
clocks = <&xtal>;
clock-names = "clkin1";
status = "okay"; status = "okay";
}; };
@ -398,8 +396,6 @@ &pwm_ef {
status = "okay"; status = "okay";
pinctrl-0 = <&pwm_e_pins>; pinctrl-0 = <&pwm_e_pins>;
pinctrl-names = "default"; pinctrl-names = "default";
clocks = <&xtal>;
clock-names = "clkin0";
}; };
&pdm { &pdm {

2
arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts
View File

@ -502,8 +502,6 @@ &i2c3 {
&pwm_AO_cd { &pwm_AO_cd {
pinctrl-0 = <&pwm_ao_d_e_pins>; pinctrl-0 = <&pwm_ao_d_e_pins>;
pinctrl-names = "default"; pinctrl-names = "default";
clocks = <&xtal>;
clock-names = "clkin1";
status = "okay"; status = "okay";
}; };

4
arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts
View File

@ -328,8 +328,6 @@ &ir {
&pwm_AO_cd { &pwm_AO_cd {
pinctrl-0 = <&pwm_ao_d_e_pins>; pinctrl-0 = <&pwm_ao_d_e_pins>;
pinctrl-names = "default"; pinctrl-names = "default";
clocks = <&xtal>;
clock-names = "clkin1";
status = "okay"; status = "okay";
}; };
@ -363,8 +361,6 @@ &pwm_ef {
status = "okay"; status = "okay";
pinctrl-0 = <&pwm_e_pins>; pinctrl-0 = <&pwm_e_pins>;
pinctrl-names = "default"; pinctrl-names = "default";
clocks = <&xtal>;
clock-names = "clkin0";
}; };
&uart_A { &uart_A {

2
arch/arm64/boot/dts/amlogic/meson-g12b-a311d-libretech-cc.dts
View File

@ -116,6 +116,4 @@ &cpu103 {
&pwm_ab { &pwm_ab {
pinctrl-0 = <&pwm_a_e_pins>, <&pwm_b_x7_pins>; pinctrl-0 = <&pwm_a_e_pins>, <&pwm_b_x7_pins>;
clocks = <&xtal>, <&xtal>;
clock-names = "clkin0", "clkin1";
}; };

4
arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi
View File

@ -257,8 +257,6 @@ &pcie {
&pwm_ab { &pwm_ab {
pinctrl-0 = <&pwm_a_e_pins>; pinctrl-0 = <&pwm_a_e_pins>;
pinctrl-names = "default"; pinctrl-names = "default";
clocks = <&xtal>;
clock-names = "clkin0";
status = "okay"; status = "okay";
}; };
@ -273,8 +271,6 @@ &pwm_ef {
&pwm_AO_cd { &pwm_AO_cd {
pinctrl-0 = <&pwm_ao_d_e_pins>; pinctrl-0 = <&pwm_ao_d_e_pins>;
pinctrl-names = "default"; pinctrl-names = "default";
clocks = <&xtal>;
clock-names = "clkin1";
status = "okay"; status = "okay";
}; };

4
arch/arm64/boot/dts/amlogic/meson-g12b-bananapi.dtsi
View File

@ -367,8 +367,6 @@ &pwm_ab {
status = "okay"; status = "okay";
pinctrl-0 = <&pwm_a_e_pins>; pinctrl-0 = <&pwm_a_e_pins>;
pinctrl-names = "default"; pinctrl-names = "default";
clocks = <&xtal>;
clock-names = "clkin0";
}; };
&pwm_ef { &pwm_ef {
@ -380,8 +378,6 @@ &pwm_ef {
&pwm_AO_cd { &pwm_AO_cd {
pinctrl-0 = <&pwm_ao_d_e_pins>; pinctrl-0 = <&pwm_ao_d_e_pins>;
pinctrl-names = "default"; pinctrl-names = "default";
clocks = <&xtal>;
clock-names = "clkin1";
status = "okay"; status = "okay";
}; };

4
arch/arm64/boot/dts/amlogic/meson-g12b-khadas-vim3.dtsi
View File

@ -92,16 +92,12 @@ &cpu103 {
&pwm_ab { &pwm_ab {
pinctrl-0 = <&pwm_a_e_pins>; pinctrl-0 = <&pwm_a_e_pins>;
pinctrl-names = "default"; pinctrl-names = "default";
clocks = <&xtal>;
clock-names = "clkin0";
status = "okay"; status = "okay";
}; };
&pwm_AO_cd { &pwm_AO_cd {
pinctrl-0 = <&pwm_ao_d_e_pins>; pinctrl-0 = <&pwm_ao_d_e_pins>;
pinctrl-names = "default"; pinctrl-names = "default";
clocks = <&xtal>;
clock-names = "clkin1";
status = "okay"; status = "okay";
}; };

4
arch/arm64/boot/dts/amlogic/meson-g12b-odroid.dtsi
View File

@ -327,16 +327,12 @@ hdmi_tx_tmds_out: endpoint {
&pwm_ab { &pwm_ab {
pinctrl-0 = <&pwm_a_e_pins>; pinctrl-0 = <&pwm_a_e_pins>;
pinctrl-names = "default"; pinctrl-names = "default";
clocks = <&xtal>;
clock-names = "clkin0";
status = "okay"; status = "okay";
}; };
&pwm_AO_cd { &pwm_AO_cd {
pinctrl-0 = <&pwm_ao_d_e_pins>; pinctrl-0 = <&pwm_ao_d_e_pins>;
pinctrl-names = "default"; pinctrl-names = "default";
clocks = <&xtal>;
clock-names = "clkin1";
status = "okay"; status = "okay";
}; };

8
arch/arm64/boot/dts/amlogic/meson-g12b-radxa-zero2.dts
View File

@ -379,32 +379,24 @@ &ir {
&pwm_ab { &pwm_ab {
pinctrl-0 = <&pwm_a_e_pins>; pinctrl-0 = <&pwm_a_e_pins>;
pinctrl-names = "default"; pinctrl-names = "default";
clocks = <&xtal>;
clock-names = "clkin0";
status = "okay"; status = "okay";
}; };
&pwm_ef { &pwm_ef {
pinctrl-0 = <&pwm_e_pins>; pinctrl-0 = <&pwm_e_pins>;
pinctrl-names = "default"; pinctrl-names = "default";
clocks = <&xtal>;
clock-names = "clkin0";
status = "okay"; status = "okay";
}; };
&pwm_AO_ab { &pwm_AO_ab {
pinctrl-0 = <&pwm_ao_a_pins>; pinctrl-0 = <&pwm_ao_a_pins>;
pinctrl-names = "default"; pinctrl-names = "default";
clocks = <&xtal>;
clock-names = "clkin0";
status = "okay"; status = "okay";
}; };
&pwm_AO_cd { &pwm_AO_cd {
pinctrl-0 = <&pwm_ao_d_e_pins>; pinctrl-0 = <&pwm_ao_d_e_pins>;
pinctrl-names = "default"; pinctrl-names = "default";
clocks = <&xtal>;
clock-names = "clkin1";
status = "okay"; status = "okay";
}; };

6
arch/arm64/boot/dts/amlogic/meson-g12b-w400.dtsi
View File

@ -304,24 +304,18 @@ &ir {
&pwm_ab { &pwm_ab {
pinctrl-0 = <&pwm_a_e_pins>; pinctrl-0 = <&pwm_a_e_pins>;
pinctrl-names = "default"; pinctrl-names = "default";
clocks = <&xtal>;
clock-names = "clkin0";
status = "okay"; status = "okay";
}; };
&pwm_AO_cd { &pwm_AO_cd {
pinctrl-0 = <&pwm_ao_d_e_pins>; pinctrl-0 = <&pwm_ao_d_e_pins>;
pinctrl-names = "default"; pinctrl-names = "default";
clocks = <&xtal>;
clock-names = "clkin1";
status = "okay"; status = "okay";
}; };
&pwm_ef { &pwm_ef {
pinctrl-0 = <&pwm_e_pins>; pinctrl-0 = <&pwm_e_pins>;
pinctrl-names = "default"; pinctrl-names = "default";
clocks = <&xtal>;
clock-names = "clkin0";
status = "okay"; status = "okay";
}; };

6
arch/arm64/boot/dts/amlogic/meson-libretech-cottonwood.dtsi
View File

@ -458,24 +458,18 @@ &pwm_AO_cd {
status = "okay"; status = "okay";
pinctrl-0 = <&pwm_ao_d_e_pins>; pinctrl-0 = <&pwm_ao_d_e_pins>;
pinctrl-names = "default"; pinctrl-names = "default";
clocks = <&xtal>;
clock-names = "clkin1";
}; };
&pwm_ab { &pwm_ab {
status = "okay"; status = "okay";
pinctrl-0 = <&pwm_b_x7_pins>; pinctrl-0 = <&pwm_b_x7_pins>;
pinctrl-names = "default"; pinctrl-names = "default";
clocks = <&xtal>;
clock-names = "clkin1";
}; };
&pwm_cd { &pwm_cd {
status = "okay"; status = "okay";
pinctrl-0 = <&pwm_d_x3_pins>; pinctrl-0 = <&pwm_d_x3_pins>;
pinctrl-names = "default"; pinctrl-names = "default";
clocks = <&xtal>;
clock-names = "clkin1";
}; };
&saradc { &saradc {

6
arch/arm64/boot/dts/amlogic/meson-sm1-ac2xx.dtsi
View File

@ -199,15 +199,11 @@ &pwm_AO_ab {
status = "okay"; status = "okay";
pinctrl-0 = <&pwm_ao_a_pins>; pinctrl-0 = <&pwm_ao_a_pins>;
pinctrl-names = "default"; pinctrl-names = "default";
clocks = <&xtal>;
clock-names = "clkin0";
}; };
&pwm_AO_cd { &pwm_AO_cd {
pinctrl-0 = <&pwm_ao_d_e_pins>; pinctrl-0 = <&pwm_ao_d_e_pins>;
pinctrl-names = "default"; pinctrl-names = "default";
clocks = <&xtal>;
clock-names = "clkin1";
status = "okay"; status = "okay";
}; };
@ -215,8 +211,6 @@ &pwm_ef {
status = "okay"; status = "okay";
pinctrl-0 = <&pwm_e_pins>; pinctrl-0 = <&pwm_e_pins>;
pinctrl-names = "default"; pinctrl-names = "default";
clocks = <&xtal>;
clock-names = "clkin0";
}; };
&saradc { &saradc {

2
arch/arm64/boot/dts/amlogic/meson-sm1-bananapi.dtsi
View File

@ -367,8 +367,6 @@ &ir {
&pwm_AO_cd { &pwm_AO_cd {
pinctrl-0 = <&pwm_ao_d_e_pins>; pinctrl-0 = <&pwm_ao_d_e_pins>;
pinctrl-names = "default"; pinctrl-names = "default";
clocks = <&xtal>;
clock-names = "clkin1";
status = "okay"; status = "okay";
}; };

2
arch/arm64/boot/dts/amlogic/meson-sm1-khadas-vim3l.dts
View File

@ -78,8 +78,6 @@ &cpu3 {
&pwm_AO_cd { &pwm_AO_cd {
pinctrl-0 = <&pwm_ao_d_e_pins>; pinctrl-0 = <&pwm_ao_d_e_pins>;
pinctrl-names = "default"; pinctrl-names = "default";
clocks = <&xtal>;
clock-names = "clkin1";
status = "okay"; status = "okay";
}; };

2
arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi
View File

@ -392,8 +392,6 @@ &ir {
&pwm_AO_cd { &pwm_AO_cd {
pinctrl-0 = <&pwm_ao_d_e_pins>; pinctrl-0 = <&pwm_ao_d_e_pins>;
pinctrl-names = "default"; pinctrl-names = "default";
clocks = <&xtal>;
clock-names = "clkin1";
status = "okay"; status = "okay";
}; };

6
arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts
View File

@ -435,15 +435,11 @@ &pwm_AO_ab {
status = "okay"; status = "okay";
pinctrl-0 = <&pwm_ao_a_pins>; pinctrl-0 = <&pwm_ao_a_pins>;
pinctrl-names = "default"; pinctrl-names = "default";
clocks = <&xtal>;
clock-names = "clkin0";
}; };
&pwm_AO_cd { &pwm_AO_cd {
pinctrl-0 = <&pwm_ao_d_e_pins>; pinctrl-0 = <&pwm_ao_d_e_pins>;
pinctrl-names = "default"; pinctrl-names = "default";
clocks = <&xtal>;
clock-names = "clkin1";
status = "okay"; status = "okay";
}; };
@ -451,8 +447,6 @@ &pwm_ef {
status = "okay"; status = "okay";
pinctrl-0 = <&pwm_e_pins>; pinctrl-0 = <&pwm_e_pins>;
pinctrl-names = "default"; pinctrl-names = "default";
clocks = <&xtal>;
clock-names = "clkin0";
}; };
&saradc { &saradc {