From patchwork Wed May 25 22:30:53 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 819322 Received: from canuck.infradead.org (canuck.infradead.org [134.117.69.58]) by demeter2.kernel.org (8.14.4/8.14.3) with ESMTP id p4Q4QRJp026072 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Thu, 26 May 2011 04:27:00 GMT Received: from localhost ([127.0.0.1] helo=canuck.infradead.org) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1QPMzC-0000dr-68; Wed, 25 May 2011 22:55:30 +0000 Received: from casper.infradead.org ([2001:770:15f::2]) by canuck.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QPMyN-0000Sq-DO for linux-arm-kernel@canuck.infradead.org; Wed, 25 May 2011 22:54:39 +0000 Received: from mail-iy0-f177.google.com ([209.85.210.177]) by casper.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QPMfk-0005eC-Kh for linux-arm-kernel@lists.infradead.org; Wed, 25 May 2011 22:35:25 +0000 Received: by iyb39 with SMTP id 39so184910iyb.36 for ; Wed, 25 May 2011 15:31:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:cc:subject:date:message-id:x-mailer; bh=6MeN0U2ZViEyHslvw5edhO/R7Os7MSmNctWu6ezqbZo=; b=n0gnHPSmNDAf6lrZDupmbyhM5IzHDjvQMaS5H6ZG5nbsqxfce4A9I3jgnIuMpanJlV EOQt2gldFx6n9IEoBrV0OIbbmJW5GyjlmrjxDab/QRGmajZxJvcn5x+EsZH0KmVq/0K1 anh8prEDCmxj/rFIdeK1OHhe61+NizsuXY5BU= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=wK6AsIAygeUM3Z4bF++rKNxokFTCf+CkpD+ZcsvdJpohKkMMVQy6I+bc1j4KJMHLby 8VzJXknA+zYe7ClreT/eo1Wod3p0nINlzdjQgznpxyLBK1ikOOZhonBac1NZvBFzTA6R MZ7f328nFBxlZwTz5bQYbInSZauDFO+SVW2P0= Received: by 10.231.91.16 with SMTP id k16mr108983ibm.124.1306362667791; Wed, 25 May 2011 15:31:07 -0700 (PDT) Received: from rob-laptop.i.smooth-stone.com ([173.226.190.126]) by mx.google.com with ESMTPS id x20sm28880iba.44.2011.05.25.15.31.06 (version=SSLv3 cipher=OTHER); Wed, 25 May 2011 15:31:07 -0700 (PDT) From: Rob Herring To: linux-arm-kernel@lists.infradead.org Subject: [PATCH] arm: vexpress: move v2m clock init to init_early Date: Wed, 25 May 2011 17:30:53 -0500 Message-Id: <1306362653-25668-1-git-send-email-robherring2@gmail.com> X-Mailer: git-send-email 1.7.4.1 X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20110525_233524_871317_E771862B X-CRM114-Status: GOOD ( 12.38 ) X-Spam-Score: -1.1 (-) X-Spam-Report: SpamAssassin version 3.3.2-r929478 on casper.infradead.org summary: Content analysis details: (-1.1 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.210.177 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is freemail (robherring2[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record 1.6 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit (robherring2[at]gmail.com) -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.0 RFC_ABUSE_POST Both abuse and postmaster missing on sender domain 0.0 T_TO_NO_BRKTS_FREEMAIL T_TO_NO_BRKTS_FREEMAIL Cc: Rob Herring X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Thu, 26 May 2011 04:27:00 +0000 (UTC) From: Rob Herring 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 --- arch/arm/mach-vexpress/v2m.c | 15 +++++++-------- include/linux/libata.h | 4 ++-- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/arch/arm/mach-vexpress/v2m.c b/arch/arm/mach-vexpress/v2m.c index 9d9d4af..cded33c 100644 --- a/arch/arm/mach-vexpress/v2m.c +++ b/arch/arm/mach-vexpress/v2m.c @@ -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); diff --git a/include/linux/libata.h b/include/linux/libata.h index 04f32a3..df6af22 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h @@ -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 */