From: mpa@pengutronix.de (Markus Pargmann)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v10 7/8] ARM: dts: imx25: Add TSC and ADC support
Date: Mon, 14 Dec 2015 14:53:53 +0100 [thread overview]
Message-ID: <1450101234-2191-8-git-send-email-mpa@pengutronix.de> (raw)
In-Reply-To: <1450101234-2191-1-git-send-email-mpa@pengutronix.de>
From: Denis Carikli <denis@eukrea.com>
Signed-off-by: Denis Carikli <denis@eukrea.com>
Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
---
arch/arm/boot/dts/imx25.dtsi | 29 ++++++++++++++++++++++++++---
1 file changed, 26 insertions(+), 3 deletions(-)
diff --git a/arch/arm/boot/dts/imx25.dtsi b/arch/arm/boot/dts/imx25.dtsi
index 677f81d9dcd5..6ac5e71d312b 100644
--- a/arch/arm/boot/dts/imx25.dtsi
+++ b/arch/arm/boot/dts/imx25.dtsi
@@ -265,13 +265,36 @@
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>;
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 {
--
2.6.2
next prev parent reply other threads:[~2015-12-14 13:53 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-14 13:53 [PATCH v10 0/8] imx25 adc and touchscreen driver Markus Pargmann
2015-12-14 13:53 ` [PATCH v10 1/8] ARM: dt: Binding documentation for imx25 ADC/TSC Markus Pargmann
2016-01-11 7:29 ` Lee Jones
2015-12-14 13:53 ` [PATCH v10 2/8] ARM: dt: Binding documentation for imx25 GCQ Markus Pargmann
2015-12-14 13:53 ` [PATCH v10 3/8] ARM: dt: Binding documentation for imx25 touchscreen controller Markus Pargmann
2015-12-20 3:39 ` Rob Herring
2015-12-14 13:53 ` [PATCH v10 4/8] mfd: fsl imx25 Touchscreen ADC driver Markus Pargmann
2016-01-11 6:54 ` Lee Jones
2016-02-02 11:41 ` Markus Pargmann
2016-02-09 10:35 ` Lee Jones
2016-02-15 9:25 ` Markus Pargmann
2015-12-14 13:53 ` [PATCH v10 5/8] iio: adc: fsl,imx25-gcq driver Markus Pargmann
2015-12-14 13:53 ` [PATCH v10 6/8] input: touchscreen: imx25 tcq driver Markus Pargmann
2015-12-17 23:30 ` Dmitry Torokhov
2015-12-14 13:53 ` Markus Pargmann [this message]
2016-02-14 1:57 ` [PATCH v10 7/8] ARM: dts: imx25: Add TSC and ADC support Shawn Guo
2015-12-14 13:53 ` [PATCH v10 8/8] ARM: imx_v4_v5_defconfig: Add I.MX25 Touchscreen controller " Markus Pargmann
2016-02-11 15:56 ` [GIT PULL] Immutable branch between MFD, Input and IIO Lee Jones
2016-02-15 9:57 ` Lee Jones
2016-03-09 5:55 ` [GIT PULL v2] Immutable branch between MFD, Input and IIO [with fix] 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=1450101234-2191-8-git-send-email-mpa@pengutronix.de \
--to=mpa@pengutronix.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).