All of lore.kernel.org
 help / color / mirror / Atom feed
From: Markus Pargmann <mpa@pengutronix.de>
To: Shawn Guo <shawn.guo@linaro.org>,
	Samuel Ortiz <sameo@linux.intel.com>,
	Dmitry Torokhov <dmitry.torokhov@gmail.com>,
	Jonathan Cameron <jic23@kernel.org>,
	Fabio Estevam <festevam@gmail.com>,
	Peter Meerwald <pmeerw@pmeerw.net>,
	Hartmut Knaack <knaack.h@gmx.de>
Cc: "Denis Carikli" <denis@eukrea.com>,
	"Eric Bénard" <eric@eukrea.com>,
	"Sascha Hauer" <kernel@pengutronix.de>,
	linux-arm-kernel@lists.infradead.org,
	"Lee Jones" <lee.jones@linaro.org>,
	linux-input@vger.kernel.org, linux-iio@vger.kernel.org,
	"Lars-Peter Clausen" <lars@metafoo.de>,
	devicetree@vger.kernel.org, "Rob Herring" <robh+dt@kernel.org>,
	"Pawel Moll" <pawel.moll@arm.com>,
	"Mark Rutland" <mark.rutland@arm.com>,
	"Ian Campbell" <ijc+devicetree@hellion.org.uk>,
	"Kumar Gala" <galak@codeaurora.org>,
	"Markus Pargmann" <mpa@pengutronix.de>
Subject: [PATCH v6 7/8] ARM: dts: imx25: Add TSC and ADC support
Date: Thu, 29 Jan 2015 15:09:15 +0100	[thread overview]
Message-ID: <1422540556-14828-8-git-send-email-mpa@pengutronix.de> (raw)
In-Reply-To: <1422540556-14828-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 | 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 e4d3aecc4ed2..4780926fa20e 100644
--- a/arch/arm/boot/dts/imx25.dtsi
+++ b/arch/arm/boot/dts/imx25.dtsi
@@ -265,13 +265,37 @@
 				status = "disabled";
 			};
 
-			tsc: tsc@50030000 {
-				compatible = "fsl,imx25-adc", "fsl,imx21-tsc";
-				reg = <0x50030000 0x4000>;
+			tscadc: tscadc@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@50030800 {
+					compatible = "fsl,imx25-gcq";
+					reg = <0x50030800 0x60>;
+					interrupt-parent = <&tscadc>;
+					interrupts = <1>;
+					#address-cells = <1>;
+					#size-cells = <0>;
+					status = "disabled";
+				};
+
+				tsc: tcq@50030400 {
+					compatible = "fsl,imx25-tcq";
+					reg = <0x50030400 0x60>;
+					interrupt-parent = <&tscadc>;
+					interrupts = <0>;
+					fsl,wires = <4>;
+					status = "disabled";
+				};
 			};
 
 			ssi1: ssi@50034000 {
-- 
2.1.4


WARNING: multiple messages have this Message-ID (diff)
From: mpa@pengutronix.de (Markus Pargmann)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v6 7/8] ARM: dts: imx25: Add TSC and ADC support
Date: Thu, 29 Jan 2015 15:09:15 +0100	[thread overview]
Message-ID: <1422540556-14828-8-git-send-email-mpa@pengutronix.de> (raw)
In-Reply-To: <1422540556-14828-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 | 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 e4d3aecc4ed2..4780926fa20e 100644
--- a/arch/arm/boot/dts/imx25.dtsi
+++ b/arch/arm/boot/dts/imx25.dtsi
@@ -265,13 +265,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 {
-- 
2.1.4

  parent reply	other threads:[~2015-01-29 14:09 UTC|newest]

Thread overview: 52+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-01-29 14:09 [PATCH v6 0/8] imx25 adc and touchscreen driver Markus Pargmann
2015-01-29 14:09 ` Markus Pargmann
2015-01-29 14:09 ` [PATCH v6 1/8] ARM: dt: Binding documentation for imx25 ADC/TSC Markus Pargmann
2015-01-29 14:09   ` Markus Pargmann
2015-01-29 14:09 ` [PATCH v6 3/8] ARM: dt: Binding documentation for imx25 touchscreen controller Markus Pargmann
2015-01-29 14:09   ` Markus Pargmann
     [not found] ` <1422540556-14828-1-git-send-email-mpa-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
2015-01-29 14:09   ` [PATCH v6 2/8] ARM: dt: Binding documentation for imx25 GCQ Markus Pargmann
2015-01-29 14:09     ` Markus Pargmann
2015-01-29 14:09     ` Markus Pargmann
2015-02-04 16:48     ` Jonathan Cameron
2015-02-04 16:48       ` Jonathan Cameron
2015-01-29 14:09   ` [PATCH v6 4/8] mfd: fsl imx25 Touchscreen ADC driver Markus Pargmann
2015-01-29 14:09     ` Markus Pargmann
2015-01-29 14:09     ` Markus Pargmann
2015-01-30  6:43     ` Lothar Waßmann
2015-01-30  6:43       ` Lothar Waßmann
2015-01-30  6:43       ` Lothar Waßmann
     [not found]       ` <20150130074324.3e4d868f-VjFSrY7JcPWvSplVBqRQBQ@public.gmane.org>
2015-01-30  7:20         ` Markus Pargmann
2015-01-30  7:20           ` Markus Pargmann
2015-01-30  7:20           ` Markus Pargmann
2015-01-29 14:09   ` [PATCH v6 5/8] iio: adc: fsl,imx25-gcq driver Markus Pargmann
2015-01-29 14:09     ` Markus Pargmann
2015-01-29 14:09     ` Markus Pargmann
2015-01-29 14:30     ` Varka Bhadram
2015-01-29 14:30       ` Varka Bhadram
     [not found]       ` <54CA4419.1060207-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2015-01-30  8:16         ` Markus Pargmann
2015-01-30  8:16           ` Markus Pargmann
2015-01-30  8:16           ` Markus Pargmann
2015-02-04 16:42       ` Jonathan Cameron
2015-02-04 16:42         ` Jonathan Cameron
2015-02-04 16:48     ` Jonathan Cameron
2015-02-04 16:48       ` Jonathan Cameron
2015-02-26 15:23       ` Markus Pargmann
2015-02-26 15:23         ` Markus Pargmann
2015-01-29 14:09 ` [PATCH v6 6/8] input: touchscreen: imx25 tcq driver Markus Pargmann
2015-01-29 14:09   ` Markus Pargmann
     [not found]   ` <1422540556-14828-7-git-send-email-mpa-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
2015-01-29 14:26     ` Varka Bhadram
2015-01-29 14:26       ` Varka Bhadram
2015-01-29 14:26       ` Varka Bhadram
2015-01-30 18:57       ` Dmitry Torokhov
2015-01-30 18:57         ` Dmitry Torokhov
2015-02-02 16:05         ` Markus Pargmann
2015-02-02 16:05           ` Markus Pargmann
     [not found]           ` <20150202160539.GS16879-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
2015-02-02 17:51             ` Dmitry Torokhov
2015-02-02 17:51               ` Dmitry Torokhov
2015-02-02 17:51               ` Dmitry Torokhov
2015-02-26 14:30               ` Markus Pargmann
2015-02-26 14:30                 ` Markus Pargmann
2015-01-29 14:09 ` Markus Pargmann [this message]
2015-01-29 14:09   ` [PATCH v6 7/8] ARM: dts: imx25: Add TSC and ADC support Markus Pargmann
2015-01-29 14:09 ` [PATCH v6 8/8] ARM: imx_v4_v5_defconfig: Add I.MX25 Touchscreen controller " Markus Pargmann
2015-01-29 14:09   ` Markus Pargmann

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=1422540556-14828-8-git-send-email-mpa@pengutronix.de \
    --to=mpa@pengutronix.de \
    --cc=denis@eukrea.com \
    --cc=devicetree@vger.kernel.org \
    --cc=dmitry.torokhov@gmail.com \
    --cc=eric@eukrea.com \
    --cc=festevam@gmail.com \
    --cc=galak@codeaurora.org \
    --cc=ijc+devicetree@hellion.org.uk \
    --cc=jic23@kernel.org \
    --cc=kernel@pengutronix.de \
    --cc=knaack.h@gmx.de \
    --cc=lars@metafoo.de \
    --cc=lee.jones@linaro.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-iio@vger.kernel.org \
    --cc=linux-input@vger.kernel.org \
    --cc=mark.rutland@arm.com \
    --cc=pawel.moll@arm.com \
    --cc=pmeerw@pmeerw.net \
    --cc=robh+dt@kernel.org \
    --cc=sameo@linux.intel.com \
    --cc=shawn.guo@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.