ARM: OMAP2+: board-generic: Remove un-needed .atag_offset for DT_MACHINE

PATCH New Benoit Cousson 3 participants 9 messages Feb 13, 2012 – Feb 16, 2012

Subsystems (5)

Device tree bindings Arm (32-bit) Arm sub-architectures OMAP2+ support +1 more subsystems

lore

Share & tools

lore

Benoit Cousson

author

2012-02-13 16:30 UTC #0 lore raw

PATCH 1/4 ARM: OMAP2+: board-generic: Remove un-needed .atag_offset for DT_MACHINE

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.

Signed-off-by Benoit Cousson <[email protected]>

Cc Tony Lindgren <[email protected]>

---
 arch/arm/mach-omap2/board-generic.c |   12 ++++--------
 1 files changed, 4 insertions(+), 8 deletions(-)

arch/arm/mach-omap2/board-generic.c +4 -8

index ad49762..d32b593 100644
@@ -91,14 +91,13 @@ static void __init omap3_init(void)
 }
 #endif
 
-#if defined(CONFIG_SOC_OMAP2420)
+#ifdef CONFIG_SOC_OMAP2420
 static const char *omap242x_boards_compat[] __initdata = {
 	"ti,omap2420",
 	NULL,
 };
 
 DT_MACHINE_START(OMAP242X_DT, "Generic OMAP2420 (Flattened Device Tree)")
-	.atag_offset	= 0x100,
 	.reserve	= omap_reserve,
 	.map_io		= omap242x_map_io,
 	.init_early	= omap2420_init_early,

@@ -111,14 +110,13 @@ DT_MACHINE_START(OMAP242X_DT, "Generic OMAP2420 (Flattened Device Tree)")
 MACHINE_END
 #endif
 
-#if defined(CONFIG_SOC_OMAP2430)
+#ifdef CONFIG_SOC_OMAP2430
 static const char *omap243x_boards_compat[] __initdata = {
 	"ti,omap2430",
 	NULL,
 };
 
 DT_MACHINE_START(OMAP243X_DT, "Generic OMAP2430 (Flattened Device Tree)")
-	.atag_offset	= 0x100,
 	.reserve	= omap_reserve,
 	.map_io		= omap243x_map_io,
 	.init_early	= omap2430_init_early,

@@ -131,14 +129,13 @@ DT_MACHINE_START(OMAP243X_DT, "Generic OMAP2430 (Flattened Device Tree)")
 MACHINE_END
 #endif
 
-#if defined(CONFIG_ARCH_OMAP3)
+#ifdef CONFIG_ARCH_OMAP3
 static const char *omap3_boards_compat[] __initdata = {
 	"ti,omap3",
 	NULL,
 };
 
 DT_MACHINE_START(OMAP3_DT, "Generic OMAP3 (Flattened Device Tree)")
-	.atag_offset	= 0x100,
 	.reserve	= omap_reserve,
 	.map_io		= omap3_map_io,
 	.init_early	= omap3430_init_early,

@@ -151,14 +148,13 @@ DT_MACHINE_START(OMAP3_DT, "Generic OMAP3 (Flattened Device Tree)")
 MACHINE_END
 #endif
 
-#if defined(CONFIG_ARCH_OMAP4)
+#ifdef CONFIG_ARCH_OMAP4
 static const char *omap4_boards_compat[] __initdata = {
 	"ti,omap4",
 	NULL,
 };
 
 DT_MACHINE_START(OMAP4_DT, "Generic OMAP4 (Flattened Device Tree)")
-	.atag_offset	= 0x100,
 	.reserve	= omap_reserve,
 	.map_io		= omap4_map_io,
 	.init_early	= omap4430_init_early,

Signature · 1 line

1.7.0.4

Benoit Cousson

author

2012-02-13 16:30 UTC #1 lore raw

PATCH 2/4 ARM: OMAP2+: omap_device: Replace dev_warn by dev_dbg in omap_device_build_from_dt

This warning becomes a little bit too verbose with the increase of device nodes in some DTS files.

Change it to debug only.

Signed-off-by Benoit Cousson <[email protected]>

Cc Kevin Hilman <[email protected]>

---
 arch/arm/plat-omap/omap_device.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

arch/arm/plat-omap/omap_device.c +1 -1

index 80d5e4c..125de17 100644
@@ -343,7 +343,7 @@ static int omap_device_build_from_dt(struct platform_device *pdev)
 
 	oh_cnt = of_property_count_strings(node, "ti,hwmods");
 	if (!oh_cnt || IS_ERR_VALUE(oh_cnt)) {
-		dev_warn(&pdev->dev, "No 'hwmods' to build omap_device\n");
+		dev_dbg(&pdev->dev, "No 'hwmods' to build omap_device\n");
 		return -ENODEV;
 	}

Signature · 1 line

1.7.0.4

Kevin Hilman

2012-02-16 18:13 UTC #2 lore raw

PATCH 2/4 ARM: OMAP2+: omap_device: Replace dev_warn by dev_dbg in omap_device_build_from_dt

Quoted 7 lines · Benoit Cousson

This warning becomes a little bit too verbose with the increase of device nodes in some DTS files.
Change it to debug only.
Signed-off-by Benoit Cousson <[email protected]>
Cc Kevin Hilman <[email protected]>

Acked-by Kevin Hilman <[email protected]>

Quoted 16 lines

---
 arch/arm/plat-omap/omap_device.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

arch/arm/plat-omap/omap_device.c +1 -1

index 80d5e4c..125de17 100644
@@ -343,7 +343,7 @@ static int omap_device_build_from_dt(struct platform_device *pdev)
 
 	oh_cnt = of_property_count_strings(node, "ti,hwmods");
 	if (!oh_cnt || IS_ERR_VALUE(oh_cnt)) {
-		dev_warn(&pdev->dev, "No 'hwmods' to build omap_device\n");
+		dev_dbg(&pdev->dev, "No 'hwmods' to build omap_device\n");
 		return -ENODEV;
 	}

Benoit Cousson

author

2012-02-13 16:30 UTC #3 lore raw

PATCH 3/4 ARM: OMAP2+: pm: Do not init statically the SR and voltage layer with DT

In reply to Benoit Cousson

In the case of DT, the PMIC and SR initialization will be done using a completely different mechanism.

Disable this part if a DT blob is available.

Signed-off-by Benoit Cousson <[email protected]>

Acked-by Kevin Hilman <[email protected]>

Acked-by Rob Herring <[email protected]>

Acked-by Grant Likely <[email protected]>

---
 arch/arm/mach-omap2/pm.c |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

arch/arm/mach-omap2/pm.c +8 -0

index 1881fe9..ad4f693 100644
@@ -227,6 +227,14 @@ postcore_initcall(omap2_common_pm_init);
 
 static int __init omap2_common_pm_late_init(void)
 {
+	/*
+	 * In the case of DT, the PMIC and SR initialization will be done using
+	 * a completely different mechanism.
+	 * Disable this part if a DT blob is available.
+	 */
+	if (of_have_populated_dt())
+		return 0;
+
 	/* Init the voltage layer */
 	omap_pmic_late_init();
 	omap_voltage_late_init();

Signature · 1 line

1.7.0.4

Benoit Cousson

author

2012-02-13 16:30 UTC #4 lore raw

PATCH 4/4 ARM: OMAP1: kconfig: Enable IRQ_DOMAIN by default for OMAP1 platforms

In reply to Benoit Cousson

The devices that can act as an interrupt controller like the GPIO are going to be handled using the IRQ domain mechanism in order to avoid the static IRQ mapping done so far inside plat-omap/irqs.h.

Enable IRQ_DOMAIN by default to allow the drivers shared with OMAP2+ to compile properly on OMAP1 platforms.

Signed-off-by Benoit Cousson <[email protected]>

Cc Tony Lindgren <[email protected]>

---
 arch/arm/plat-omap/Kconfig |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

arch/arm/plat-omap/Kconfig +1 -0

index 734009a..e289dd2 100644
@@ -14,6 +14,7 @@ config ARCH_OMAP1
 	select CLKDEV_LOOKUP
 	select CLKSRC_MMIO
 	select GENERIC_IRQ_CHIP
+	select IRQ_DOMAIN
 	select HAVE_IDE
 	select NEED_MACH_MEMORY_H
 	help

Signature · 1 line

1.7.0.4

Tony Lindgren

maintainer

2012-02-14 19:52 UTC #5 lore raw

PATCH 1/4 ARM: OMAP2+: board-generic: Remove un-needed .atag_offset for DT_MACHINE

In reply to Benoit Cousson

Quoted 5 lines · Benoit Cousson

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?

Regards,

Tony

Cousson, Benoit

author

2012-02-15 13:14 UTC #6 lore raw

PATCH 1/4 ARM: OMAP2+: board-generic: Remove un-needed .atag_offset for DT_MACHINE

Quoted 9 lines · Tony Lindgren

Quoted 5 lines · Benoit Cousson
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.

Thanks,
Benoit

Tony Lindgren

maintainer

2012-02-15 18:13 UTC #7 lore raw

PATCH 1/4 ARM: OMAP2+: board-generic: Remove un-needed .atag_offset for DT_MACHINE

Quoted 11 lines · Cousson, Benoit

Quoted 9 lines · Tony Lindgren
Quoted 5 lines · Benoit Cousson
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?

Quoted 6 lines

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.

Tony

Cousson, Benoit

author

2012-02-16 11:00 UTC #8 lore raw

PATCH 1/4 ARM: OMAP2+: board-generic: Remove un-needed .atag_offset for DT_MACHINE

Quoted 12 lines · Tony Lindgren

Quoted 11 lines · Cousson, Benoit
Quoted 9 lines · Tony Lindgren
Quoted 5 lines · Benoit Cousson
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?

Quoted 8 lines

Quoted 6 lines
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

---

Quoted 1 line

From edc05cc7396228f21d169dd34f1871464f0a00b8 Mon Sep 17 00:00:00 2001

From: Benoit Cousson <[email protected]>
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.

Signed-off-by Benoit Cousson <[email protected]>

---
 arch/arm/boot/dts/omap3.dtsi |    8 ++++----
 arch/arm/boot/dts/omap4.dtsi |    8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

arch/arm/boot/dts/omap3.dtsi +4 -4

index 216c331..1c9d10a 100644
@@ -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>;

arch/arm/boot/dts/omap4.dtsi +4 -4

index e8fe75f..f40af04 100644
@@ -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>;

Signature · 1 line

1.7.0.4