From: heiko@sntech.de (Heiko Stübner)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v5 2/3] ARM: dts: Add main PWM info to rk3288
Date: Wed, 27 Aug 2014 23:32:49 +0200 [thread overview]
Message-ID: <3711416.XmBfSOmzxP@diego> (raw)
In-Reply-To: <1409007567-23523-3-git-send-email-dianders@chromium.org>
Am Montag, 25. August 2014, 15:59:26 schrieb Doug Anderson:
> This adds the PWM info (other than the VOP PWM) to the main rk3288
> dtsi file.
>
> Signed-off-by: Caesar Wang <caesar.wang@rock-chips.com>
> Signed-off-by: Doug Anderson <dianders@chromium.org>
> ---
Applied to my v3.18-next/dts branch.
I've changed the RK_FUNC_3 to its numerical equivalent for now, as the pinctrl
binding change is probably going through the pinctrl tree at some point.
> Changes in v5:
> - Back to version 3 (no rockchip,grf).
>
> Changes in v4:
> - Add rockchip,grf to pwm nodes.
>
> Changes in v3: None
>
> arch/arm/boot/dts/rk3288.dtsi | 68
> +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68
> insertions(+)
>
> diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
> index 36be7bb..9c9d9c5 100644
> --- a/arch/arm/boot/dts/rk3288.dtsi
> +++ b/arch/arm/boot/dts/rk3288.dtsi
> @@ -261,6 +261,50 @@
> status = "disabled";
> };
>
> + pwm0: pwm at ff680000 {
> + compatible = "rockchip,rk3288-pwm";
> + reg = <0xff680000 0x10>;
> + #pwm-cells = <3>;
> + pinctrl-names = "default";
> + pinctrl-0 = <&pwm0_pin>;
> + clocks = <&cru PCLK_PWM>;
> + clock-names = "pwm";
> + status = "disabled";
> + };
> +
> + pwm1: pwm at ff680010 {
> + compatible = "rockchip,rk3288-pwm";
> + reg = <0xff680010 0x10>;
> + #pwm-cells = <3>;
> + pinctrl-names = "default";
> + pinctrl-0 = <&pwm1_pin>;
> + clocks = <&cru PCLK_PWM>;
> + clock-names = "pwm";
> + status = "disabled";
> + };
> +
> + pwm2: pwm at ff680020 {
> + compatible = "rockchip,rk3288-pwm";
> + reg = <0xff680020 0x10>;
> + #pwm-cells = <3>;
> + pinctrl-names = "default";
> + pinctrl-0 = <&pwm2_pin>;
> + clocks = <&cru PCLK_PWM>;
> + clock-names = "pwm";
> + status = "disabled";
> + };
> +
> + pwm3: pwm at ff680030 {
> + compatible = "rockchip,rk3288-pwm";
> + reg = <0xff680030 0x10>;
> + #pwm-cells = <2>;
> + pinctrl-names = "default";
> + pinctrl-0 = <&pwm3_pin>;
> + clocks = <&cru PCLK_PWM>;
> + clock-names = "pwm";
> + status = "disabled";
> + };
> +
> pmu: power-management at ff730000 {
> compatible = "rockchip,rk3288-pmu", "syscon";
> reg = <0xff730000 0x100>;
> @@ -611,5 +655,29 @@
> rockchip,pins = <5 15 3 &pcfg_pull_none>;
> };
> };
> +
> + pwm0 {
> + pwm0_pin: pwm0-pin {
> + rockchip,pins = <7 0 RK_FUNC_1 &pcfg_pull_none>;
> + };
> + };
> +
> + pwm1 {
> + pwm1_pin: pwm1-pin {
> + rockchip,pins = <7 1 RK_FUNC_1 &pcfg_pull_none>;
> + };
> + };
> +
> + pwm2 {
> + pwm2_pin: pwm2-pin {
> + rockchip,pins = <7 22 RK_FUNC_3 &pcfg_pull_none>;
> + };
> + };
> +
> + pwm3 {
> + pwm3_pin: pwm3-pin {
> + rockchip,pins = <7 23 RK_FUNC_3 &pcfg_pull_none>;
> + };
> + };
> };
> };
next prev parent reply other threads:[~2014-08-27 21:32 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-25 22:59 [PATCH v5 0/3] PWM changes for rk3288-evb Doug Anderson
2014-08-25 22:59 ` [PATCH v5 1/3] pwm: rockchip: Allow polarity invert on rk3288 Doug Anderson
2014-08-26 13:41 ` Thierry Reding
2014-08-25 22:59 ` [PATCH v5 2/3] ARM: dts: Add main PWM info to rk3288 Doug Anderson
2014-08-27 21:32 ` Heiko Stübner [this message]
2014-08-25 22:59 ` [PATCH v5 3/3] ARM: dts: Enable PWM backlight on rk3288-evb Doug Anderson
2014-08-27 21:33 ` Heiko Stübner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=3711416.XmBfSOmzxP@diego \
--to=heiko@sntech.de \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).