From: b-cousson@ti•com (Cousson, Benoit)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH 1/4] ARM: OMAP2+: board-generic: Remove un-needed .atag_offset for DT_MACHINE
Date: Thu, 16 Feb 2012 12:00:34 +0100 [thread overview]
Message-ID: <4F3CE1D2.5010202@ti.com> (raw)
In-Reply-To: <20120215181313.GY1426@atomide.com>
On 2/15/2012 7:13 PM, Tony Lindgren wrote:
> * Cousson, Benoit<b-cousson@ti•com> [120215 04:43]:
>> On 2/14/2012 8:52 PM, Tony Lindgren wrote:
>>> * Benoit Cousson<b-cousson@ti•com> [120213 07:59]:
>>>> Some .atag_offset entries were wrongly added during a merge conflict
>>>> resolution in 3.3.
>>>> Remove them all, since DT boot does not use that attribute anymore.
>>>>
>>>> Replace as well the #if... by #ifdef for consistency.
>>>
>>> How about let's also remove the 0x from the serial at 0x.. in the .dts
>>> files in this clean-up patch?
>>
>> In the same patch?
>>
>> I'm fine with fixing that as well, but since this is not in the same
>> file / directory, I'd rather do a different patch.
>>
>> I'll do the fix anyway, it is up to you for the proper location.
>
> OK separate patch is fine with me.
Please find the patch below, I'll include it in the branch for the pull request.
Thanks,
Benoit
---
>From edc05cc7396228f21d169dd34f1871464f0a00b8 Mon Sep 17 00:00:00 2001
From: Benoit Cousson <b-cousson@ti•com>
Date: Thu, 16 Feb 2012 11:55:27 +0100
Subject: [PATCH] arm/dts: OMAP3&4: Remove the '0x' prefix for serial nodes
Follow the DTS convention and thus name the nodes <name>@<address> without
any '0x' prefix in the physical address.
Suggested-by: Tony Lindgren <tony@atomide•com>
Signed-off-by: Benoit Cousson <b-cousson@ti•com>
---
arch/arm/boot/dts/omap3.dtsi | 8 ++++----
arch/arm/boot/dts/omap4.dtsi | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/arch/arm/boot/dts/omap3.dtsi b/arch/arm/boot/dts/omap3.dtsi
index 216c331..1c9d10a 100644
--- a/arch/arm/boot/dts/omap3.dtsi
+++ b/arch/arm/boot/dts/omap3.dtsi
@@ -67,25 +67,25 @@
#interrupt-cells = <1>;
};
- uart1: serial at 0x4806a000 {
+ uart1: serial at 4806a000 {
compatible = "ti,omap3-uart";
ti,hwmods = "uart1";
clock-frequency = <48000000>;
};
- uart2: serial at 0x4806c000 {
+ uart2: serial at 4806c000 {
compatible = "ti,omap3-uart";
ti,hwmods = "uart2";
clock-frequency = <48000000>;
};
- uart3: serial at 0x49020000 {
+ uart3: serial at 49020000 {
compatible = "ti,omap3-uart";
ti,hwmods = "uart3";
clock-frequency = <48000000>;
};
- uart4: serial at 0x49042000 {
+ uart4: serial at 49042000 {
compatible = "ti,omap3-uart";
ti,hwmods = "uart4";
clock-frequency = <48000000>;
diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi
index e8fe75f..f40af04 100644
--- a/arch/arm/boot/dts/omap4.dtsi
+++ b/arch/arm/boot/dts/omap4.dtsi
@@ -104,25 +104,25 @@
<0x48240100 0x0100>;
};
- uart1: serial at 0x4806a000 {
+ uart1: serial at 4806a000 {
compatible = "ti,omap4-uart";
ti,hwmods = "uart1";
clock-frequency = <48000000>;
};
- uart2: serial at 0x4806c000 {
+ uart2: serial at 4806c000 {
compatible = "ti,omap4-uart";
ti,hwmods = "uart2";
clock-frequency = <48000000>;
};
- uart3: serial at 0x48020000 {
+ uart3: serial at 48020000 {
compatible = "ti,omap4-uart";
ti,hwmods = "uart3";
clock-frequency = <48000000>;
};
- uart4: serial at 0x4806e000 {
+ uart4: serial at 4806e000 {
compatible = "ti,omap4-uart";
ti,hwmods = "uart4";
clock-frequency = <48000000>;
--
1.7.0.4
prev parent reply other threads:[~2012-02-16 11:00 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-13 16:30 [PATCH 1/4] ARM: OMAP2+: board-generic: Remove un-needed .atag_offset for DT_MACHINE Benoit Cousson
2012-02-13 16:30 ` [PATCH 2/4] ARM: OMAP2+: omap_device: Replace dev_warn by dev_dbg in omap_device_build_from_dt Benoit Cousson
2012-02-16 18:13 ` Kevin Hilman
2012-02-13 16:30 ` [PATCH 3/4] ARM: OMAP2+: pm: Do not init statically the SR and voltage layer with DT Benoit Cousson
2012-02-13 16:30 ` [PATCH 4/4] ARM: OMAP1: kconfig: Enable IRQ_DOMAIN by default for OMAP1 platforms Benoit Cousson
2012-02-14 19:52 ` [PATCH 1/4] ARM: OMAP2+: board-generic: Remove un-needed .atag_offset for DT_MACHINE Tony Lindgren
2012-02-15 13:14 ` Cousson, Benoit
2012-02-15 18:13 ` Tony Lindgren
2012-02-16 11:00 ` Cousson, Benoit [this message]
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=4F3CE1D2.5010202@ti.com \
--to=b-cousson@ti$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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