| Message ID | 1396267649-18009-4-git-send-email-alexandre.belloni@free-electrons.com |
|---|---|
| State | Superseded |
| Headers | show |
On Mon, Mar 31, 2014 at 02:07:28PM +0200, Alexandre Belloni wrote: > Adds the PWM bindings for the Allwinner A20. > Also adds the pinctrl descriptions for both PWM channels. > > Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> > --- > arch/arm/boot/dts/sun7i-a20.dtsi | 22 ++++++++++++++++++++++ > 1 file changed, 22 insertions(+) > > diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi > index 6f25cf559ad0..0dd15fcb8955 100644 > --- a/arch/arm/boot/dts/sun7i-a20.dtsi > +++ b/arch/arm/boot/dts/sun7i-a20.dtsi > @@ -366,6 +366,20 @@ > #size-cells = <0>; > #gpio-cells = <3>; > > + pwm0_pins_a: pwm0@0 { > + allwinner,pins = "PB2"; > + allwinner,function = "pwm"; > + allwinner,drive = <0>; > + allwinner,pull = <0>; > + }; > + > + pwm1_pins_a: pwm1@0 { > + allwinner,pins = "PI3"; > + allwinner,function = "pwm"; > + allwinner,drive = <0>; > + allwinner,pull = <0>; > + }; > + > uart0_pins_a: uart0@0 { > allwinner,pins = "PB22", "PB23"; > allwinner,function = "uart0"; > @@ -446,6 +460,14 @@ > clocks = <&osc24M>; > }; > > + pwm: pwm@01c20e00 { > + compatible = "allwinner,sun7i-pwm"; > + reg = <0x01c20e00 0xc>; > + clocks = <&osc24M>; > + #pwm-cells = <3>; > + status = "disabled"; > + }; > + Can you make this two separate patches? One for the muxing options and one for the introduction of the new IP. Thanks! Maxime
diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi index 6f25cf559ad0..0dd15fcb8955 100644 --- a/arch/arm/boot/dts/sun7i-a20.dtsi +++ b/arch/arm/boot/dts/sun7i-a20.dtsi @@ -366,6 +366,20 @@ #size-cells = <0>; #gpio-cells = <3>; + pwm0_pins_a: pwm0@0 { + allwinner,pins = "PB2"; + allwinner,function = "pwm"; + allwinner,drive = <0>; + allwinner,pull = <0>; + }; + + pwm1_pins_a: pwm1@0 { + allwinner,pins = "PI3"; + allwinner,function = "pwm"; + allwinner,drive = <0>; + allwinner,pull = <0>; + }; + uart0_pins_a: uart0@0 { allwinner,pins = "PB22", "PB23"; allwinner,function = "uart0"; @@ -446,6 +460,14 @@ clocks = <&osc24M>; }; + pwm: pwm@01c20e00 { + compatible = "allwinner,sun7i-pwm"; + reg = <0x01c20e00 0xc>; + clocks = <&osc24M>; + #pwm-cells = <3>; + status = "disabled"; + }; + wdt: watchdog@01c20c90 { compatible = "allwinner,sun4i-wdt"; reg = <0x01c20c90 0x10>;
Adds the PWM bindings for the Allwinner A20. Also adds the pinctrl descriptions for both PWM channels. Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> --- arch/arm/boot/dts/sun7i-a20.dtsi | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+)