From: lee.jones@linaro.org (Lee Jones)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 4/9] ARM: STi: STiH407: Move PWM nodes STiH407 => STiH407-family
Date: Tue, 7 Jul 2015 16:06:48 +0100 [thread overview]
Message-ID: <1436281613-899-5-git-send-email-lee.jones@linaro.org> (raw)
In-Reply-To: <1436281613-899-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 | 30 ++++++++++++++++++++++++++++++
arch/arm/boot/dts/stih407.dtsi | 28 ----------------------------
2 files changed, 30 insertions(+), 28 deletions(-)
diff --git a/arch/arm/boot/dts/stih407-family.dtsi b/arch/arm/boot/dts/stih407-family.dtsi
index 838b812..64a1a26 100644
--- a/arch/arm/boot/dts/stih407-family.dtsi
+++ b/arch/arm/boot/dts/stih407-family.dtsi
@@ -539,6 +539,7 @@
status = "disabled";
};
+
st_dwc3: dwc3 at 8f94000 {
compatible = "st,stih407-dwc3";
reg = <0x08f94000 0x1000>, <0x110 0x4>;
@@ -565,5 +566,34 @@
<&phy_port2 PHY_TYPE_USB3>;
};
};
+
+ /* COMMS PWM Module */
+ pwm0: pwm at 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 at 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 at 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 at 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-07-07 15:06 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-07 15:06 [PATCH v2 0/9] regulator: pwm-regulator: Introduce continuous-mode Lee Jones
2015-07-07 15:06 ` [PATCH v2 1/9] ARM: multi_v7_defconfig: Enable ST's PWM driver Lee Jones
2015-07-07 15:06 ` [PATCH v2 2/9] ARM: multi_v7_defconfig: Enable ST's Power Reset driver Lee Jones
2015-07-07 15:06 ` [PATCH v2 3/9] ARM: multi_v7_defconfig: Enable support for PWM Regulators Lee Jones
2015-07-07 15:06 ` Lee Jones [this message]
2015-07-07 15:06 ` [PATCH v2 5/9] ARM: STi: STiH407: Add PWM Regulator node Lee Jones
2015-07-07 15:06 ` [PATCH v2 6/9] regulator: pwm-regulator: Re-write bindings Lee Jones
2015-07-09 8:01 ` Boris Brezillon
2015-07-07 15:06 ` [PATCH v2 7/9] regulator: pwm-regulator: Add support for continuous-voltage Lee Jones
2015-07-07 15:06 ` [PATCH v2 8/9] regulator: pwm-regulator: Simplify voltage to duty-cycle call Lee Jones
2015-07-07 15:06 ` [PATCH v2 9/9] regulator: pwm-regulator: Don't assign structure attributes right away Lee Jones
2015-07-09 6:30 ` [PATCH v2 0/9] regulator: pwm-regulator: Introduce continuous-mode Boris Brezillon
2015-07-09 11:51 ` Lee Jones
2015-07-09 13:14 ` Boris Brezillon
2015-07-09 15:44 ` Lee Jones
2015-07-09 16:25 ` Doug Anderson
2015-07-09 17:20 ` Lee Jones
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=1436281613-899-5-git-send-email-lee.jones@linaro.org \
--to=lee.jones@linaro.org \
--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).