Commit e6884f2e authored by Martin Blumenstingl's avatar Martin Blumenstingl Committed by Neil Armstrong
Browse files

arm64: dts: amlogic: g12: 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: default avatarMartin Blumenstingl <martin.blumenstingl@googlemail.com>
Reviewed-by: default avatarNeil Armstrong <neil.armstrong@linaro.org>
Link: https://lore.kernel.org/r/20241227212514.1376682-6-martin.blumenstingl@googlemail.com


Signed-off-by: default avatarNeil Armstrong <neil.armstrong@linaro.org>
parent 0322ff45

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

+28 −5
Original line number Diff line number Diff line
@@ -2060,8 +2060,11 @@ cecb_AO: cec@280 { 
			};



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

				clocks = <&xtal>,

					 <&clkc_AO CLKID_AO_CLK81>;

				#pwm-cells = <3>;

				status = "disabled";

			};
@@ -2099,8 +2102,13 @@ i2c_AO: i2c@5000 { 
			};



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

				clocks = <&xtal>,

					 <&clkc_AO CLKID_AO_CLK81>,

					 <&clkc CLKID_FCLK_DIV4>,

					 <&clkc CLKID_FCLK_DIV5>;

				#pwm-cells = <3>;

				status = "disabled";

			};
@@ -2301,22 +2309,37 @@ spifc: spi@14000 { 
			};



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

				clocks = <&xtal>,

					 <>, /* unknown/untested, the datasheet calls it "vid_pll" */

					 <&clkc CLKID_FCLK_DIV4>,

					 <&clkc CLKID_FCLK_DIV3>;

				#pwm-cells = <3>;

				status = "disabled";

			};



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

				clocks = <&xtal>,

					 <>, /* unknown/untested, the datasheet calls it "vid_pll" */

					 <&clkc CLKID_FCLK_DIV4>,

					 <&clkc CLKID_FCLK_DIV3>;

				#pwm-cells = <3>;

				status = "disabled";

			};



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

				clocks = <&xtal>,

					 <>, /* unknown/untested, the datasheet calls it "vid_pll" */

					 <&clkc CLKID_FCLK_DIV4>,

					 <&clkc CLKID_FCLK_DIV3>;

				#pwm-cells = <3>;

				status = "disabled";

			};

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

+0 −4
Original line number Diff line number Diff line
@@ -346,8 +346,6 @@ &ir { 
&pwm_AO_cd {

	pinctrl-0 = <&pwm_ao_d_e_pins>;

	pinctrl-names = "default";

	clocks = <&xtal>;

	clock-names = "clkin1";

	status = "okay";

};
@@ -355,8 +353,6 @@ &pwm_ef { 
	status = "okay";

	pinctrl-0 = <&pwm_e_pins>;

	pinctrl-names = "default";

	clocks = <&xtal>;

	clock-names = "clkin0";

};



&pdm {

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

+0 −4
Original line number Diff line number Diff line
@@ -284,8 +284,6 @@ &ir { 
&pwm_AO_cd {

	pinctrl-0 = <&pwm_ao_d_e_pins>;

	pinctrl-names = "default";

	clocks = <&xtal>;

	clock-names = "clkin1";

	status = "okay";

};
@@ -293,8 +291,6 @@ &pwm_ef { 
	status = "okay";

	pinctrl-0 = <&pwm_e_pins>;

	pinctrl-names = "default";

	clocks = <&xtal>;

	clock-names = "clkin0";

};



&saradc {

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

+0 −4
Original line number Diff line number Diff line
@@ -389,8 +389,6 @@ &ir { 
&pwm_AO_cd {

	pinctrl-0 = <&pwm_ao_d_e_pins>;

	pinctrl-names = "default";

	clocks = <&xtal>;

	clock-names = "clkin1";

	status = "okay";

};
@@ -398,8 +396,6 @@ &pwm_ef { 
	status = "okay";

	pinctrl-0 = <&pwm_e_pins>;

	pinctrl-names = "default";

	clocks = <&xtal>;

	clock-names = "clkin0";

};



&pdm {

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

+0 −2
Original line number Diff line number Diff line
@@ -502,8 +502,6 @@ &i2c3 { 
&pwm_AO_cd {

	pinctrl-0 = <&pwm_ao_d_e_pins>;

	pinctrl-names = "default";

	clocks = <&xtal>;

	clock-names = "clkin1";

	status = "okay";

};