From: denis@eukrea.com (Denis Carikli)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v4 4/6] ARM: dts: imx25: Add TSC and ADC support
Date: Tue, 24 Jun 2014 16:46:33 +0200 [thread overview]
Message-ID: <1403621195-9622-4-git-send-email-denis@eukrea.com> (raw)
In-Reply-To: <1403621195-9622-1-git-send-email-denis@eukrea.com>
Signed-off-by: Denis Carikli <denis@eukrea.com>
---
Changelog v3->v4:
- None
Changelog v2->v3:
- Added ADC controller support: making a separate patch
for it would have been overkill.
- Moved the common TSC and ADC sub-nodes inside this patch
instead of having a copy in each dts using it.
---
arch/arm/boot/dts/imx25.dtsi | 30 +++++++++++++++++++++++++++---
1 file changed, 27 insertions(+), 3 deletions(-)
diff --git a/arch/arm/boot/dts/imx25.dtsi b/arch/arm/boot/dts/imx25.dtsi
index c174039..358c78a 100644
--- a/arch/arm/boot/dts/imx25.dtsi
+++ b/arch/arm/boot/dts/imx25.dtsi
@@ -264,13 +264,37 @@
status = "disabled";
};
- tsc: tsc at 50030000 {
- compatible = "fsl,imx25-adc", "fsl,imx21-tsc";
- reg = <0x50030000 0x4000>;
+ tscadc: tscadc at 50030000 {
+ compatible = "fsl,imx25-tsadc";
+ reg = <0x50030000 0xc>;
interrupts = <46>;
clocks = <&clks 119>;
clock-names = "ipg";
+ interrupt-controller;
+ #interrupt-cells = <1>;
+ #address-cells = <1>;
+ #size-cells = <1>;
+ ranges;
status = "disabled";
+
+ adc: adc at 50030800 {
+ compatible = "fsl,imx25-gcq";
+ reg = <0x50030800 0x60>;
+ interrupt-parent = <&tscadc>;
+ interrupts = <1>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+ status = "disabled";
+ };
+
+ tsc: tcq at 50030400 {
+ compatible = "fsl,imx25-tcq";
+ reg = <0x50030400 0x60>;
+ interrupt-parent = <&tscadc>;
+ interrupts = <0>;
+ fsl,wires = <4>;
+ status = "disabled";
+ };
};
ssi1: ssi at 50034000 {
--
1.7.9.5
next prev parent reply other threads:[~2014-06-24 14:46 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-24 14:46 [PATCH v4 1/6] mfd: fsl imx25 Touchscreen ADC driver Denis Carikli
2014-06-24 14:46 ` [PATCH v4 2/6] input: touchscreen: imx25 tcq driver Denis Carikli
2014-07-09 16:47 ` Dmitry Torokhov
2014-06-24 14:46 ` [PATCH v4 3/6] iio: adc: fsl,imx25-gcq driver Denis Carikli
2014-06-29 11:32 ` Jonathan Cameron
2014-06-24 14:46 ` Denis Carikli [this message]
2014-06-24 14:46 ` [PATCH v4 5/6] ARM: dts: imx25: mbimxsd25: Add touchscreen support Denis Carikli
2014-06-24 14:46 ` [PATCH v4 6/6] ARM: imx_v4_v5_defconfig: Add I.MX25 Touchscreen controller and ADC support Denis Carikli
2014-07-09 13:06 ` [PATCH v4 1/6] mfd: fsl imx25 Touchscreen ADC driver 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=1403621195-9622-4-git-send-email-denis@eukrea.com \
--to=denis@eukrea.com \
--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).