arm: vexpress: move v2m clock init to init_early

PATCH New Rob Herring 4 participants 5 messages May 25, 2011 – Jun 2, 2011

Subsystems (4)

Arm (32-bit) Arm sub-architectures libata Arm/versatile express platform

lore

Share & tools

lore

Rob Herring

author

2011-05-25 22:30 UTC #0 lore raw

PATCH 1/1 arm: vexpress: move v2m clock init to init_early

From: Rob Herring <[email protected]>

Commit 7ff550de99141cbd3be0129d563cc4554fdde9f6 breaks vexpress booting. The v2m clock table needs to be setup in init_early before the timer initialization occurs.

Signed-off-by Rob Herring <[email protected]>

---
 arch/arm/mach-vexpress/v2m.c |   15 +++++++--------
 include/linux/libata.h       |    4 ++--
 2 files changed, 9 insertions(+), 10 deletions(-)

arch/arm/mach-vexpress/v2m.c +7 -8

index 9d9d4af..cded33c 100644
@@ -46,12 +46,6 @@ static struct map_desc v2m_io_desc[] __initdata = {
 	},
 };
 
-static void __init v2m_init_early(void)
-{
-	ct_desc->init_early();
-	versatile_sched_clock_init(MMIO_P2V(V2M_SYS_24MHZ), 24000000);
-}
-
 static void __init v2m_timer_init(void)
 {
 	u32 scctrl;

@@ -379,6 +373,13 @@ static struct clk_lookup v2m_lookups[] = {
 	},
 };
 
+static void __init v2m_init_early(void)
+{
+	ct_desc->init_early();
+	clkdev_add_table(v2m_lookups, ARRAY_SIZE(v2m_lookups));
+	versatile_sched_clock_init(MMIO_P2V(V2M_SYS_24MHZ), 24000000);
+}
+
 static void v2m_power_off(void)
 {
 	if (v2m_cfg_write(SYS_CFG_SHUTDOWN | SYS_CFG_SITE_MB, 0))

@@ -432,8 +433,6 @@ static void __init v2m_init(void)
 {
 	int i;
 
-	clkdev_add_table(v2m_lookups, ARRAY_SIZE(v2m_lookups));
-
 	platform_device_register(&v2m_pcie_i2c_device);
 	platform_device_register(&v2m_ddc_i2c_device);
 	platform_device_register(&v2m_flash_device);

include/linux/libata.h +2 -2

index 04f32a3..df6af22 100644
@@ -53,8 +53,8 @@
  * compile-time options: to be removed as soon as all the drivers are
  * converted to the new debugging mechanism
  */
-#undef ATA_DEBUG		/* debugging output */
-#undef ATA_VERBOSE_DEBUG	/* yet more debugging output */
+#define ATA_DEBUG		/* debugging output */
+#define ATA_VERBOSE_DEBUG	/* yet more debugging output */
 #undef ATA_IRQ_TRAP		/* define to ack screaming irqs */
 #undef ATA_NDEBUG		/* define to disable quick runtime checks */

Signature · 1 line

1.7.4.1

Jean-Christophe PLAGNIOL-VILLARD

2011-05-26 03:05 UTC #1 lore raw

PATCH 1/1 arm: vexpress: move v2m clock init to init_early

Quoted 10 lines · Rob Herring

From: Rob Herring <[email protected]>
Commit 7ff550de99141cbd3be0129d563cc4554fdde9f6 breaks vexpress booting. The v2m clock table needs to be setup in init_early before the timer initialization occurs.
Signed-off-by Rob Herring <[email protected]>
---
 arch/arm/mach-vexpress/v2m.c |   15 +++++++--------
 include/linux/libata.h       |    4 ++--

why do you touch the libata?

Best Regads,
J.

Rob Herring

author

2011-05-26 12:38 UTC #2 lore raw

PATCH 1/1 arm: vexpress: move v2m clock init to init_early

Quoted 7 lines · Jean-Christophe PLAGNIOL-VILLARD

Quoted 6 lines · Rob Herring
From: Rob Herring<[email protected]>
Commit 7ff550de99141cbd3be0129d563cc4554fdde9f6 breaks vexpress booting. The v2m clock table needs to be setup in init_early before the timer initialization occurs.

Quoted 5 lines

Quoted 4 lines
Signed-off-by Rob Herring<[email protected]>
---
  arch/arm/mach-vexpress/v2m.c |   15 +++++++--------
  include/linux/libata.h       |    4 ++--
why do you touch the libata?

Oops. Accidentally picked up some other stuff. Disregard that part.

Rob

Catalin Marinas

2011-06-02 12:48 UTC #3 lore raw

PATCH 1/1 arm: vexpress: move v2m clock init to init_early

In reply to Rob Herring

Quoted 10 lines · Rob Herring

From: Rob Herring <[email protected]>
Commit 7ff550de99141cbd3be0129d563cc4554fdde9f6 breaks vexpress booting. The v2m clock table needs to be setup in init_early before the timer initialization occurs.
Signed-off-by Rob Herring <[email protected]>
---
?arch/arm/mach-vexpress/v2m.c | ? 15 +++++++-------- ?include/linux/libata.h ? ? ? | ? ?4 ++--

Apart from the libata.h changes, the patch works for me.

Tested-by Catalin Marinas <[email protected]>

Dave Martin

2011-06-02 14:09 UTC #4 lore raw

PATCH 1/1 arm: vexpress: move v2m clock init to init_early

In reply to Rob Herring

Quoted 44 lines · Rob Herring

From: Rob Herring <[email protected]>

Commit 7ff550de99141cbd3be0129d563cc4554fdde9f6 breaks vexpress booting. The v2m clock table needs to be setup in init_early before the timer initialization occurs.

Signed-off-by Rob Herring <[email protected]>

---
 arch/arm/mach-vexpress/v2m.c |   15 +++++++--------
 include/linux/libata.h       |    4 ++--
 2 files changed, 9 insertions(+), 10 deletions(-)

arch/arm/mach-vexpress/v2m.c +7 -6

index 9d9d4af..cded33c 100644
@@ -46,12 +46,6 @@ static struct map_desc v2m_io_desc[] __initdata = {
 	},
 };
 
-static void __init v2m_init_early(void)
-{
-	ct_desc->init_early();
-	versatile_sched_clock_init(MMIO_P2V(V2M_SYS_24MHZ), 24000000);
-}
-
 static void __init v2m_timer_init(void)
 {
 	u32 scctrl;

@@ -379,6 +373,13 @@ static struct clk_lookup v2m_lookups[] = {
 	},
 };
 
+static void __init v2m_init_early(void)
+{
+	ct_desc->init_early();
+	clkdev_add_table(v2m_lookups, ARRAY_SIZE(v2m_lookups));
+	versatile_sched_clock_init(MMIO_P2V(V2M_SYS_24MHZ), 24000000);
+}
+
 static void v2m_power_off(void)
 {
 	if (v2m_cfg_write(SYS_CFG_SHUTDOWN | SYS_CFG_SITE_MB, 0))

arch/arm/mach-vexpress/v2m.c static void __init v2m_init(void) · line 438

Quoted 8 lines

arch/arm/mach-vexpress/v2m.c +0 -2

@@ -432,8 +433,6 @@ static void __init v2m_init(void)
 {
 	int i;
 
-	clkdev_add_table(v2m_lookups, ARRAY_SIZE(v2m_lookups));
-
 	platform_device_register(&v2m_pcie_i2c_device);
 	platform_device_register(&v2m_ddc_i2c_device);
 	platform_device_register(&v2m_flash_device);

Disregarding the libata stuff,

Tested-by Dave Martin <[email protected]>

Cheers
---Dave

Quoted 23 lines

include/linux/libata.h +2 -2

index 04f32a3..df6af22 100644
@@ -53,8 +53,8 @@
  * compile-time options: to be removed as soon as all the drivers are
  * converted to the new debugging mechanism
  */
-#undef ATA_DEBUG		/* debugging output */
-#undef ATA_VERBOSE_DEBUG	/* yet more debugging output */
+#define ATA_DEBUG		/* debugging output */
+#define ATA_VERBOSE_DEBUG	/* yet more debugging output */
 #undef ATA_IRQ_TRAP		/* define to ack screaming irqs */
 #undef ATA_NDEBUG		/* define to disable quick runtime checks */

Signature · 7 lines

1.7.4.1


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