| Message ID | 1424254056-5904-5-git-send-email-l.majewski@samsung.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Eduardo Valentin |
| Headers | show |
Am 18.02.2015 um 11:07 schrieb Lukasz Majewski: > From: Kamil Debski <k.debski@samsung.com> > > Add pwm-fan node to the Odroid-U3 board file to enable PWM control of the > cooling fan. In addition, add the "pwm" label to the pwm@139D0000 node > in the exynos4412.dtsi. > > Signed-off-by: Kamil Debski <k.debski@samsung.com> > [Rebased on the newest mainline by l.majewski@samsung.com] You need to sign off patches you submit. > --- > Changes since v1: > - added pwm label to the pwm@139D0000 node in exynos4.dtsi > - use the pwm label in the exynos4412-odroidu3.dts > - change order or properties in the pwn-fan node, to be sorted > in alphabetical order > > --- > arch/arm/boot/dts/exynos4.dtsi | 2 +- > arch/arm/boot/dts/exynos4412-odroidu3.dts | 13 +++++++++++++ > 2 files changed, 14 insertions(+), 1 deletion(-) > > diff --git a/arch/arm/boot/dts/exynos4.dtsi b/arch/arm/boot/dts/exynos4.dtsi > index f18d746..75266e3 100644 > --- a/arch/arm/boot/dts/exynos4.dtsi > +++ b/arch/arm/boot/dts/exynos4.dtsi > @@ -582,7 +582,7 @@ > status = "disabled"; > }; > > - pwm@139D0000 { > + pwm: pwm@139D0000 { > compatible = "samsung,exynos4210-pwm"; > reg = <0x139D0000 0x1000>; > interrupts = <0 37 0>, <0 38 0>, <0 39 0>, <0 40 0>, <0 41 0>; > diff --git a/arch/arm/boot/dts/exynos4412-odroidu3.dts b/arch/arm/boot/dts/exynos4412-odroidu3.dts > index c8a64be..60bd1e4 100644 > --- a/arch/arm/boot/dts/exynos4412-odroidu3.dts > +++ b/arch/arm/boot/dts/exynos4412-odroidu3.dts > @@ -31,6 +31,19 @@ > linux,default-trigger = "heartbeat"; > }; > }; > + > + pwm-fan { > + compatible = "pwm-fan"; > + pwms = <&pwm 0 10000 0>; > + status = "okay"; Status "okay" is only needed for pre-existing nodes that would have status "disabled" otherwise, such as below. Just drop it here. Regards, Andreas > + }; > +}; > + > +&pwm { > + pinctrl-0 = <&pwm0_out>; > + pinctrl-names = "default"; > + samsung,pwm-outputs = <0>; > + status = "okay"; > }; > > &usb3503 { >
diff --git a/arch/arm/boot/dts/exynos4.dtsi b/arch/arm/boot/dts/exynos4.dtsi index f18d746..75266e3 100644 --- a/arch/arm/boot/dts/exynos4.dtsi +++ b/arch/arm/boot/dts/exynos4.dtsi @@ -582,7 +582,7 @@ status = "disabled"; }; - pwm@139D0000 { + pwm: pwm@139D0000 { compatible = "samsung,exynos4210-pwm"; reg = <0x139D0000 0x1000>; interrupts = <0 37 0>, <0 38 0>, <0 39 0>, <0 40 0>, <0 41 0>; diff --git a/arch/arm/boot/dts/exynos4412-odroidu3.dts b/arch/arm/boot/dts/exynos4412-odroidu3.dts index c8a64be..60bd1e4 100644 --- a/arch/arm/boot/dts/exynos4412-odroidu3.dts +++ b/arch/arm/boot/dts/exynos4412-odroidu3.dts @@ -31,6 +31,19 @@ linux,default-trigger = "heartbeat"; }; }; + + pwm-fan { + compatible = "pwm-fan"; + pwms = <&pwm 0 10000 0>; + status = "okay"; + }; +}; + +&pwm { + pinctrl-0 = <&pwm0_out>; + pinctrl-names = "default"; + samsung,pwm-outputs = <0>; + status = "okay"; }; &usb3503 {