All of lore.kernel.org
 help / color / mirror / Atom feed
From: Alexandre Belloni <alexandre.belloni@bootlin.com>
To: Jonathan Cameron <jic23@kernel.org>
Cc: Lars-Peter Clausen <lars@metafoo.de>,
	Peter Meerwald-Stadler <pmeerw@pmeerw.net>,
	Nicolas Ferre <nicolas.ferre@microchip.com>,
	Ludovic Desroches <ludovic.desroches@microchip.com>,
	linux-iio@vger.kernel.org, devicetree@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org,
	linux-kernel@vger.kernel.org,
	Alexandre Belloni <alexandre.belloni@bootlin.com>
Subject: [PATCH v3 09/10] ARM: dts: at91: at91sam9rl: fix ADC triggers
Date: Sat, 28 Nov 2020 23:28:17 +0100	[thread overview]
Message-ID: <20201128222818.1910764-10-alexandre.belloni@bootlin.com> (raw)
In-Reply-To: <20201128222818.1910764-1-alexandre.belloni@bootlin.com>

The triggers for the ADC were taken from at91sam9260 dtsi but are not
correct.

Fixes: a4c1d6c75822 ("ARM: at91/dt: sam9rl: add lcd, adc, usb gadget and pwm support")
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
---
 arch/arm/boot/dts/at91sam9rl.dtsi | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/arch/arm/boot/dts/at91sam9rl.dtsi b/arch/arm/boot/dts/at91sam9rl.dtsi
index 4d70194fd808..bf85a9419c69 100644
--- a/arch/arm/boot/dts/at91sam9rl.dtsi
+++ b/arch/arm/boot/dts/at91sam9rl.dtsi
@@ -278,23 +278,26 @@ adc0: adc@fffd0000 {
 				atmel,adc-use-res = "highres";
 
 				trigger0 {
-					trigger-name = "timer-counter-0";
+					trigger-name = "external-rising";
 					trigger-value = <0x1>;
+					trigger-external;
 				};
+
 				trigger1 {
-					trigger-name = "timer-counter-1";
-					trigger-value = <0x3>;
+					trigger-name = "external-falling";
+					trigger-value = <0x2>;
+					trigger-external;
 				};
 
 				trigger2 {
-					trigger-name = "timer-counter-2";
-					trigger-value = <0x5>;
+					trigger-name = "external-any";
+					trigger-value = <0x3>;
+					trigger-external;
 				};
 
 				trigger3 {
-					trigger-name = "external";
-					trigger-value = <0x13>;
-					trigger-external;
+					trigger-name = "continuous";
+					trigger-value = <0x6>;
 				};
 			};
 
-- 
2.28.0


WARNING: multiple messages have this Message-ID (diff)
From: Alexandre Belloni <alexandre.belloni@bootlin.com>
To: Jonathan Cameron <jic23@kernel.org>
Cc: devicetree@vger.kernel.org,
	Alexandre Belloni <alexandre.belloni@bootlin.com>,
	Lars-Peter Clausen <lars@metafoo.de>,
	linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org,
	Ludovic Desroches <ludovic.desroches@microchip.com>,
	Peter Meerwald-Stadler <pmeerw@pmeerw.net>,
	linux-arm-kernel@lists.infradead.org
Subject: [PATCH v3 09/10] ARM: dts: at91: at91sam9rl: fix ADC triggers
Date: Sat, 28 Nov 2020 23:28:17 +0100	[thread overview]
Message-ID: <20201128222818.1910764-10-alexandre.belloni@bootlin.com> (raw)
In-Reply-To: <20201128222818.1910764-1-alexandre.belloni@bootlin.com>

The triggers for the ADC were taken from at91sam9260 dtsi but are not
correct.

Fixes: a4c1d6c75822 ("ARM: at91/dt: sam9rl: add lcd, adc, usb gadget and pwm support")
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
---
 arch/arm/boot/dts/at91sam9rl.dtsi | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/arch/arm/boot/dts/at91sam9rl.dtsi b/arch/arm/boot/dts/at91sam9rl.dtsi
index 4d70194fd808..bf85a9419c69 100644
--- a/arch/arm/boot/dts/at91sam9rl.dtsi
+++ b/arch/arm/boot/dts/at91sam9rl.dtsi
@@ -278,23 +278,26 @@ adc0: adc@fffd0000 {
 				atmel,adc-use-res = "highres";
 
 				trigger0 {
-					trigger-name = "timer-counter-0";
+					trigger-name = "external-rising";
 					trigger-value = <0x1>;
+					trigger-external;
 				};
+
 				trigger1 {
-					trigger-name = "timer-counter-1";
-					trigger-value = <0x3>;
+					trigger-name = "external-falling";
+					trigger-value = <0x2>;
+					trigger-external;
 				};
 
 				trigger2 {
-					trigger-name = "timer-counter-2";
-					trigger-value = <0x5>;
+					trigger-name = "external-any";
+					trigger-value = <0x3>;
+					trigger-external;
 				};
 
 				trigger3 {
-					trigger-name = "external";
-					trigger-value = <0x13>;
-					trigger-external;
+					trigger-name = "continuous";
+					trigger-value = <0x6>;
 				};
 			};
 
-- 
2.28.0


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

  parent reply	other threads:[~2020-11-28 22:29 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-11-28 22:28 [PATCH v3 00/10] iio: adc: at91_adc: cleanup DT bindings Alexandre Belloni
2020-11-28 22:28 ` Alexandre Belloni
2020-11-28 22:28 ` [PATCH v3 01/10] iio: adc: at91_adc: remove at91_adc_ids Alexandre Belloni
2020-11-28 22:28   ` Alexandre Belloni
2020-11-28 22:28 ` [PATCH v3 02/10] iio: adc: at91_adc: rework resolution selection Alexandre Belloni
2020-11-28 22:28   ` Alexandre Belloni
2020-11-28 22:28 ` [PATCH v3 03/10] dt-bindings:iio:adc:remove atmel,adc-res and atmel,adc-res-names Alexandre Belloni
2020-11-28 22:28   ` [PATCH v3 03/10] dt-bindings:iio:adc:remove atmel, adc-res and atmel, adc-res-names Alexandre Belloni
2020-12-08 21:35   ` Rob Herring
2020-12-08 21:35     ` Rob Herring
2020-11-28 22:28 ` [PATCH v3 04/10] dt-bindings:iio:adc:atmel,sama9260-adc: conversion to yaml from at91_adc.txt Alexandre Belloni
2020-11-28 22:28   ` [PATCH v3 04/10] dt-bindings:iio:adc:atmel, sama9260-adc: " Alexandre Belloni
2020-11-29 12:01   ` [PATCH v3 04/10] dt-bindings:iio:adc:atmel,sama9260-adc: " Jonathan Cameron
2020-11-29 12:01     ` Jonathan Cameron
2020-11-28 22:28 ` [PATCH v3 05/10] iio: adc: at91_adc: rework trigger definition Alexandre Belloni
2020-11-28 22:28   ` Alexandre Belloni
2020-11-28 22:28 ` [PATCH v3 06/10] dt-bindings:iio:adc:remove triggers Alexandre Belloni
2020-11-28 22:28   ` Alexandre Belloni
2020-11-28 22:28 ` [PATCH v3 07/10] iio: adc: at91_adc: merge at91_adc_probe_dt back in at91_adc_probe Alexandre Belloni
2020-11-28 22:28   ` Alexandre Belloni
2020-11-28 22:28 ` [PATCH v3 08/10] ARM: dts: at91: sama5d3: use proper ADC compatible Alexandre Belloni
2020-11-28 22:28   ` Alexandre Belloni
2020-11-28 22:28 ` Alexandre Belloni [this message]
2020-11-28 22:28   ` [PATCH v3 09/10] ARM: dts: at91: at91sam9rl: fix ADC triggers Alexandre Belloni
2020-11-28 22:28 ` [PATCH v3 10/10] ARM: dts: at91: remove deprecated ADC properties Alexandre Belloni
2020-11-28 22:28   ` Alexandre Belloni
2020-11-29 13:01 ` [PATCH v3 00/10] iio: adc: at91_adc: cleanup DT bindings Jonathan Cameron
2020-11-29 13:01   ` Jonathan Cameron

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=20201128222818.1910764-10-alexandre.belloni@bootlin.com \
    --to=alexandre.belloni@bootlin.com \
    --cc=devicetree@vger.kernel.org \
    --cc=jic23@kernel.org \
    --cc=lars@metafoo.de \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-iio@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=ludovic.desroches@microchip.com \
    --cc=nicolas.ferre@microchip.com \
    --cc=pmeerw@pmeerw.net \
    /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.