| Message ID | 0df42247c3348e7f6aed945e5669cec87f96f7ac.1476951078.git-series.maxime.ripard@free-electrons.com |
|---|---|
| State | Not Applicable |
| Headers | show |
On Thu, Oct 20, 2016 at 4:12 PM, Maxime Ripard <maxime.ripard@free-electrons.com> wrote: > The PWM controller has two different channels, but only the first pin was > exposed in the DTSI. Add the other one. > > Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Acked-by: Chen-Yu Tsai <wens@csie.org> > --- > arch/arm/boot/dts/ntc-gr8.dtsi | 7 +++++++ > 1 file changed, 7 insertions(+), 0 deletions(-) > > diff --git a/arch/arm/boot/dts/ntc-gr8.dtsi b/arch/arm/boot/dts/ntc-gr8.dtsi > index 74aff795e723..fad7381630f3 100644 > --- a/arch/arm/boot/dts/ntc-gr8.dtsi > +++ b/arch/arm/boot/dts/ntc-gr8.dtsi > @@ -854,6 +854,13 @@ > allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; > }; > > + pwm1_pins_a: pwm1@0 { Nit: really don't need "_a" and "@0" here. > + allwinner,pins = "PG13"; > + allwinner,function = "pwm1"; > + allwinner,drive = <SUN4I_PINCTRL_10_MA>; > + allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; > + }; > + > spdif_tx_pins_a: spdif@0 { > allwinner,pins = "PB10"; > allwinner,function = "spdif"; > -- > git-series 0.8.10
On Thu, Oct 20, 2016 at 10:10:03PM +0800, Chen-Yu Tsai wrote: > On Thu, Oct 20, 2016 at 4:12 PM, Maxime Ripard > <maxime.ripard@free-electrons.com> wrote: > > The PWM controller has two different channels, but only the first pin was > > exposed in the DTSI. Add the other one. > > > > Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> > > Acked-by: Chen-Yu Tsai <wens@csie.org> > > > --- > > arch/arm/boot/dts/ntc-gr8.dtsi | 7 +++++++ > > 1 file changed, 7 insertions(+), 0 deletions(-) > > > > diff --git a/arch/arm/boot/dts/ntc-gr8.dtsi b/arch/arm/boot/dts/ntc-gr8.dtsi > > index 74aff795e723..fad7381630f3 100644 > > --- a/arch/arm/boot/dts/ntc-gr8.dtsi > > +++ b/arch/arm/boot/dts/ntc-gr8.dtsi > > @@ -854,6 +854,13 @@ > > allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; > > }; > > > > + pwm1_pins_a: pwm1@0 { > > Nit: really don't need "_a" and "@0" here. Fixed and applied. Thanks! Maxime
On Fri, Oct 21, 2016 at 1:07 AM, Maxime Ripard <maxime.ripard@free-electrons.com> wrote: > On Thu, Oct 20, 2016 at 10:10:03PM +0800, Chen-Yu Tsai wrote: >> On Thu, Oct 20, 2016 at 4:12 PM, Maxime Ripard >> <maxime.ripard@free-electrons.com> wrote: >> > The PWM controller has two different channels, but only the first pin was >> > exposed in the DTSI. Add the other one. >> > >> > Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> >> >> Acked-by: Chen-Yu Tsai <wens@csie.org> >> >> > --- >> > arch/arm/boot/dts/ntc-gr8.dtsi | 7 +++++++ >> > 1 file changed, 7 insertions(+), 0 deletions(-) >> > >> > diff --git a/arch/arm/boot/dts/ntc-gr8.dtsi b/arch/arm/boot/dts/ntc-gr8.dtsi >> > index 74aff795e723..fad7381630f3 100644 >> > --- a/arch/arm/boot/dts/ntc-gr8.dtsi >> > +++ b/arch/arm/boot/dts/ntc-gr8.dtsi >> > @@ -854,6 +854,13 @@ >> > allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; >> > }; >> > >> > + pwm1_pins_a: pwm1@0 { >> >> Nit: really don't need "_a" and "@0" here. > > Fixed and applied. Oops, you forgot to fix the label in the chip-pro dts: DTC arch/arm/boot/dts/ntc-gr8-chip-pro.dtb ERROR (phandle_references): Reference to non-existent node or label "pwm1_pins_a" ERROR: Input tree has errors, aborting (use -f to force output) scripts/Makefile.lib:313: recipe for target 'arch/arm/boot/dts/ntc-gr8-chip-pro.dtb' failed ChenYu
On Tue, Oct 25, 2016 at 12:10:26PM +0800, Chen-Yu Tsai wrote: > On Fri, Oct 21, 2016 at 1:07 AM, Maxime Ripard > <maxime.ripard@free-electrons.com> wrote: > > On Thu, Oct 20, 2016 at 10:10:03PM +0800, Chen-Yu Tsai wrote: > >> On Thu, Oct 20, 2016 at 4:12 PM, Maxime Ripard > >> <maxime.ripard@free-electrons.com> wrote: > >> > The PWM controller has two different channels, but only the first pin was > >> > exposed in the DTSI. Add the other one. > >> > > >> > Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> > >> > >> Acked-by: Chen-Yu Tsai <wens@csie.org> > >> > >> > --- > >> > arch/arm/boot/dts/ntc-gr8.dtsi | 7 +++++++ > >> > 1 file changed, 7 insertions(+), 0 deletions(-) > >> > > >> > diff --git a/arch/arm/boot/dts/ntc-gr8.dtsi b/arch/arm/boot/dts/ntc-gr8.dtsi > >> > index 74aff795e723..fad7381630f3 100644 > >> > --- a/arch/arm/boot/dts/ntc-gr8.dtsi > >> > +++ b/arch/arm/boot/dts/ntc-gr8.dtsi > >> > @@ -854,6 +854,13 @@ > >> > allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; > >> > }; > >> > > >> > + pwm1_pins_a: pwm1@0 { > >> > >> Nit: really don't need "_a" and "@0" here. > > > > Fixed and applied. > > Oops, you forgot to fix the label in the chip-pro dts: > > DTC arch/arm/boot/dts/ntc-gr8-chip-pro.dtb > ERROR (phandle_references): Reference to non-existent node or label > "pwm1_pins_a" > > ERROR: Input tree has errors, aborting (use -f to force output) > scripts/Makefile.lib:313: recipe for target > 'arch/arm/boot/dts/ntc-gr8-chip-pro.dtb' failed Yeah, it was noticed by linux-next too, and I fixed it... Sorry for that. Maxime
diff --git a/arch/arm/boot/dts/ntc-gr8.dtsi b/arch/arm/boot/dts/ntc-gr8.dtsi index 74aff795e723..fad7381630f3 100644 --- a/arch/arm/boot/dts/ntc-gr8.dtsi +++ b/arch/arm/boot/dts/ntc-gr8.dtsi @@ -854,6 +854,13 @@ allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; }; + pwm1_pins_a: pwm1@0 { + allwinner,pins = "PG13"; + allwinner,function = "pwm1"; + allwinner,drive = <SUN4I_PINCTRL_10_MA>; + allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; + }; + spdif_tx_pins_a: spdif@0 { allwinner,pins = "PB10"; allwinner,function = "spdif";
The PWM controller has two different channels, but only the first pin was exposed in the DTSI. Add the other one. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> --- arch/arm/boot/dts/ntc-gr8.dtsi | 7 +++++++ 1 file changed, 7 insertions(+), 0 deletions(-)