Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 440bdcdb authored by Martin Blumenstingl's avatar Martin Blumenstingl Committed by Kevin Hilman
Browse files

ARM: dts: move the pwm_ab and pwm_cd nodes to meson.dtsi 



According to the vendor kernel sources these also exist (at the same
address) on Meson6 and Meson8. This can be found by running
$ grep -R "define PWM_PWM_[A-D]" arch/arm/
in the Amlogic GPL kernel tree (arm-src-kernel-2015-01-15-321cfb5a46).
pwm_ef does not seem to exist on older SoCs, so we keep it in
meson8b.dtsi for now.

Signed-off-by: default avatarMartin Blumenstingl <martin.blumenstingl@googlemail.com>
Signed-off-by: default avatarKevin Hilman <khilman@baylibre.com>
parent 5771a8c0

arch/arm/boot/dts/meson.dtsi

+14 −0
Original line number Original line Diff line number Diff line
@@ -108,6 +108,20 @@ 
				status = "disabled";

				status = "disabled";

			};

			};





			pwm_ab: pwm@8550 {

				compatible = "amlogic,meson-pwm";

				reg = <0x8550 0x10>;

				#pwm-cells = <3>;

				status = "disabled";

			};



			pwm_cd: pwm@8650 {

				compatible = "amlogic,meson-pwm";

				reg = <0x8650 0x10>;

				#pwm-cells = <3>;

				status = "disabled";

			};



			saradc: adc@8680 {

			saradc: adc@8680 {

				compatible = "amlogic,meson-saradc";

				compatible = "amlogic,meson-saradc";

				reg = <0x8680 0x34>;

				reg = <0x8680 0x34>;

arch/arm/boot/dts/meson8b.dtsi

+8 −14
Original line number Original line Diff line number Diff line
@@ -129,20 +129,6 @@ 
		#reset-cells = <1>;

		#reset-cells = <1>;

	};

	};





	pwm_ab: pwm@8550 {

		compatible = "amlogic,meson8b-pwm";

		reg = <0x8550 0x10>;

		#pwm-cells = <3>;

		status = "disabled";

	};



	pwm_cd: pwm@8650 {

		compatible = "amlogic,meson8b-pwm";

		reg = <0x8650 0x10>;

		#pwm-cells = <3>;

		status = "disabled";

	};



	pwm_ef: pwm@86c0 {

	pwm_ef: pwm@86c0 {

		compatible = "amlogic,meson8b-pwm";

		compatible = "amlogic,meson8b-pwm";

		reg = <0x86c0 0x10>;

		reg = <0x86c0 0x10>;
@@ -193,6 +179,14 @@ 
	arm,filter-ranges = <0x100000 0xc0000000>;

	arm,filter-ranges = <0x100000 0xc0000000>;

};

};





&pwm_ab {

	compatible = "amlogic,meson8b-pwm";

};



&pwm_cd {

	compatible = "amlogic,meson8b-pwm";

};



&saradc {

&saradc {

	compatible = "amlogic,meson8b-saradc", "amlogic,meson-saradc";

	compatible = "amlogic,meson8b-saradc", "amlogic,meson-saradc";

	clocks = <&clkc CLKID_XTAL>,

	clocks = <&clkc CLKID_XTAL>,