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

Commit e4077485 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'amlogic-dt' of... 

Merge tag 'amlogic-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into next/dt

Pull "Amlogic DT updates for v4.9" from Kevin Hilman:

- add PWM support

* tag 'amlogic-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic:
  ARM: dts: meson8b: Add Meson8b PWM Controller nodes
parents fb90bc50 a29c830a

arch/arm/boot/dts/meson8b.dtsi

+21 −0
Original line number Diff line number Diff line
@@ -162,6 +162,27 @@ 
			reg = <0xc1108000 0x4>, <0xc1104000 0x460>;

		};



		pwm_ab: pwm@8550 {

			compatible = "amlogic,meson8b-pwm";

			reg = <0xc1108550 0x10>;

			#pwm-cells = <3>;

			status = "disabled";

		};



		pwm_cd: pwm@8650 {

			compatible = "amlogic,meson8b-pwm";

			reg = <0xc1108650 0x10>;

			#pwm-cells = <3>;

			status = "disabled";

		};



		pwm_ef: pwm@86c0 {

			compatible = "amlogic,meson8b-pwm";

			reg = <0xc11086c0 0x10>;

			#pwm-cells = <3>;

			status = "disabled";

		};



		pinctrl_cbus: pinctrl@c1109880 {

			compatible = "amlogic,meson8b-cbus-pinctrl";

			reg = <0xc1109880 0x10>;