From: Lee Jones <lee.jones@linaro.org>
To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org
Cc: kernel@stlinux.com, rjw@rjwysocki.net, viresh.kumar@linaro.org,
linux-pm@vger.kernel.org, devicetree@vger.kernel.org,
ajitpal.singh@st.com, Lee Jones <lee.jones@linaro.org>
Subject: [PATCH v2 6/9] ARM: STi: STiH407: Move PWM nodes STiH407 => STiH407-family
Date: Wed, 24 Jun 2015 14:59:05 +0100 [thread overview]
Message-ID: <1435154348-28840-7-git-send-email-lee.jones@linaro.org> (raw)
In-Reply-To: <1435154348-28840-1-git-send-email-lee.jones@linaro.org>
This also incorporates the STiH410.
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
arch/arm/boot/dts/stih407-family.dtsi | 29 +++++++++++++++++++++++++++++
arch/arm/boot/dts/stih407.dtsi | 28 ----------------------------
2 files changed, 29 insertions(+), 28 deletions(-)
diff --git a/arch/arm/boot/dts/stih407-family.dtsi b/arch/arm/boot/dts/stih407-family.dtsi
index 838f1c3..477e92a 100644
--- a/arch/arm/boot/dts/stih407-family.dtsi
+++ b/arch/arm/boot/dts/stih407-family.dtsi
@@ -565,5 +565,34 @@
status = "disabled";
};
+
+ /* COMMS PWM Module */
+ pwm0: pwm@9810000 {
+ compatible = "st,sti-pwm";
+ status = "okay";
+ #pwm-cells = <2>;
+ reg = <0x9810000 0x68>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_pwm0_chan0_default>;
+ clock-names = "pwm";
+ clocks = <&clk_sysin>;
+ st,pwm-num-chan = <1>;
+ };
+
+ /* SBC PWM Module */
+ pwm1: pwm@9510000 {
+ compatible = "st,sti-pwm";
+ status = "okay";
+ #pwm-cells = <2>;
+ reg = <0x9510000 0x68>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_pwm1_chan0_default
+ &pinctrl_pwm1_chan1_default
+ &pinctrl_pwm1_chan2_default
+ &pinctrl_pwm1_chan3_default>;
+ clock-names = "pwm";
+ clocks = <&clk_sysin>;
+ st,pwm-num-chan = <4>;
+ };
};
};
diff --git a/arch/arm/boot/dts/stih407.dtsi b/arch/arm/boot/dts/stih407.dtsi
index 2c560fc3..3efa3b2 100644
--- a/arch/arm/boot/dts/stih407.dtsi
+++ b/arch/arm/boot/dts/stih407.dtsi
@@ -147,33 +147,5 @@
};
};
};
-
- /* COMMS PWM Module */
- pwm0: pwm@9810000 {
- compatible = "st,sti-pwm";
- status = "disabled";
- #pwm-cells = <2>;
- reg = <0x9810000 0x68>;
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_pwm0_chan0_default>;
- clock-names = "pwm";
- clocks = <&clk_sysin>;
- };
-
- /* SBC PWM Module */
- pwm1: pwm@9510000 {
- compatible = "st,sti-pwm";
- status = "disabled";
- #pwm-cells = <2>;
- reg = <0x9510000 0x68>;
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_pwm1_chan0_default
- &pinctrl_pwm1_chan1_default
- &pinctrl_pwm1_chan2_default
- &pinctrl_pwm1_chan3_default>;
- clock-names = "pwm";
- clocks = <&clk_sysin>;
- st,pwm-num-chan = <4>;
- };
};
};
--
1.9.1
next prev parent reply other threads:[~2015-06-24 13:59 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-24 13:58 [PATCH v2 0/9] cpufreq: Introduce support for ST's cpufreq functionality Lee Jones
2015-06-24 13:59 ` [PATCH v2 1/9] ARM: STi: STiH407: Provide generic (safe) DVFS configuration Lee Jones
2015-06-24 13:59 ` [PATCH v2 2/9] ARM: STi: STiH407: Provide CPU with clocking information Lee Jones
2015-06-24 13:59 ` [PATCH v2 3/9] ARM: STi: STiH407: Link CPU with its voltage supply Lee Jones
2015-06-24 13:59 ` [PATCH v2 4/9] ARM: STi: STiH407: Provide CPU with a means to look-up Major number Lee Jones
2015-06-24 13:59 ` [PATCH v2 5/9] ARM: STi: Register CPUFreq device Lee Jones
2015-06-24 13:59 ` Lee Jones [this message]
2015-06-24 13:59 ` [PATCH v2 8/9] dt: cpufreq: st: Provide bindings for ST's CPUFreq implementation Lee Jones
2015-06-24 13:59 ` [PATCH v2 9/9] cpufreq: st: Provide runtime initialised driver for ST's platforms Lee Jones
[not found] ` <1435154348-28840-1-git-send-email-lee.jones-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
2015-06-24 13:59 ` [PATCH v2 7/9] ARM: multi_v7_defconfig: Enable support for PWM Regulators Lee Jones
2015-06-24 14:52 ` Javier Martinez Canillas
2015-06-25 8:42 ` Lee Jones
2015-06-25 9:18 ` Javier Martinez Canillas
2015-06-25 15:02 ` Lee Jones
2015-06-25 16:29 ` Javier Martinez Canillas
2015-07-01 12:31 ` Lee Jones
2015-07-08 10:50 ` [PATCH v2 0/9] cpufreq: Introduce support for ST's cpufreq functionality Viresh Kumar
2015-07-08 10:59 ` Lee Jones
2015-07-08 11:12 ` Viresh Kumar
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=1435154348-28840-7-git-send-email-lee.jones@linaro.org \
--to=lee.jones@linaro.org \
--cc=ajitpal.singh@st.com \
--cc=devicetree@vger.kernel.org \
--cc=kernel@stlinux.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=rjw@rjwysocki.net \
--cc=viresh.kumar@linaro.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).