From: Alexandre Belloni <alexandre.belloni@free-electrons.com>
To: Nicolas Ferre <nicolas.ferre@atmel.com>
Cc: linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>,
Maxime Ripard <maxime.ripard@free-electrons.com>,
Gregory Clement <gregory.clement@free-electrons.com>,
b.brezillon@overkiz.com,
Alexandre Belloni <alexandre.belloni@free-electrons.com>
Subject: [PATCH 4/7] ARM: at91/dt: at91sam9260: remove useless adc properties
Date: Wed, 26 Feb 2014 18:01:11 +0100 [thread overview]
Message-ID: <1393434074-15600-4-git-send-email-alexandre.belloni@free-electrons.com> (raw)
In-Reply-To: <1393434074-15600-1-git-send-email-alexandre.belloni@free-electrons.com>
Remove the properties that are not used anymore by the at91_adc driver.
Also, stop using unit-addresses for the triggers as suggested by Mark
Rutland in
http://lists.infradead.org/pipermail/linux-arm-kernel/2014-February/234184.html
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
---
arch/arm/boot/dts/at91sam9260.dtsi | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/arch/arm/boot/dts/at91sam9260.dtsi b/arch/arm/boot/dts/at91sam9260.dtsi
index 997901f7ed73..ac1533368cb5 100644
--- a/arch/arm/boot/dts/at91sam9260.dtsi
+++ b/arch/arm/boot/dts/at91sam9260.dtsi
@@ -614,31 +614,26 @@
atmel,adc-use-external-triggers;
atmel,adc-channels-used = <0xf>;
atmel,adc-vref = <3300>;
- atmel,adc-num-channels = <4>;
atmel,adc-startup-time = <15>;
- atmel,adc-channel-base = <0x30>;
- atmel,adc-drdy-mask = <0x10000>;
- atmel,adc-status-register = <0x1c>;
- atmel,adc-trigger-register = <0x04>;
atmel,adc-res = <8 10>;
atmel,adc-res-names = "lowres", "highres";
atmel,adc-use-res = "highres";
- trigger@0 {
+ trigger0 {
trigger-name = "timer-counter-0";
trigger-value = <0x1>;
};
- trigger@1 {
+ trigger1 {
trigger-name = "timer-counter-1";
trigger-value = <0x3>;
};
- trigger@2 {
+ trigger2 {
trigger-name = "timer-counter-2";
trigger-value = <0x5>;
};
- trigger@3 {
+ trigger3 {
trigger-name = "external";
trigger-value = <0x13>;
trigger-external;
--
1.8.3.2
next prev parent reply other threads:[~2014-02-26 17:02 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-26 17:01 [PATCH 1/7] Documentation: dt: iio: improve atmel-adc documentation Alexandre Belloni
2014-02-26 17:01 ` [PATCH 2/7] Documentation: dt: iio: move arm/atmel-adc.txt to iio/adc/at91_adc.txt Alexandre Belloni
2014-02-26 17:01 ` [PATCH 3/7] ARM: at91/dt: at91-ariag25: remove useless adc properties Alexandre Belloni
2014-02-26 17:01 ` Alexandre Belloni [this message]
2014-02-26 17:01 ` [PATCH 5/7] ARM: at91/dt: at91sam9g45: " Alexandre Belloni
2014-02-26 17:01 ` [PATCH 6/7] ARM: at91/dt: at91sam9x5: " Alexandre Belloni
2014-02-26 17:01 ` [PATCH 7/7] ARM: at91/dt: sama5d3: " Alexandre Belloni
2014-02-26 17:39 ` [PATCH 1/7] Documentation: dt: iio: improve atmel-adc documentation Maxime Ripard
2014-02-26 21:00 ` Alexandre Belloni
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=1393434074-15600-4-git-send-email-alexandre.belloni@free-electrons.com \
--to=alexandre.belloni@free-electrons.com \
--cc=b.brezillon@overkiz.com \
--cc=gregory.clement@free-electrons.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=maxime.ripard@free-electrons.com \
--cc=nicolas.ferre@atmel.com \
--cc=plagnioj@jcrosoft.com \
/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
all inboxes | Powered by JetHome®