From patchwork Wed Sep 18 15:53:44 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean Pihet X-Patchwork-Id: 2907721 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id C1D409F23C for ; Wed, 18 Sep 2013 15:54:29 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id AC53D20381 for ; Wed, 18 Sep 2013 15:54:28 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6F48E20378 for ; Wed, 18 Sep 2013 15:54:27 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VMK5A-000433-Te; Wed, 18 Sep 2013 15:54:25 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VMK58-0007WV-5c; Wed, 18 Sep 2013 15:54:22 +0000 Received: from mail-ea0-f175.google.com ([209.85.215.175]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VMK55-0007Um-KP for linux-arm-kernel@lists.infradead.org; Wed, 18 Sep 2013 15:54:20 +0000 Received: by mail-ea0-f175.google.com with SMTP id m14so3531190eaj.6 for ; Wed, 18 Sep 2013 08:53:57 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=hr43+hoRl/dM8ZrM8GudMw0u0aklafuao0UZ9RElsG0=; b=icBKIF1iufDM6kcoabNCaA6DbasH27lsSxrhEVGzZwcFpH5OpsJ3dllEcFy0ueFQah XSg+K8TAClJxIlaETkkpeVRtse780XM4Xocx/0C6h3DbYuo4FEIi2Yrz6xY8izkhIglr +Y0Iw057uYx4pTH7TT9dls3/KFknwl4xHeebw/D+lzjnA+FEHbgUTBb/tRvT+3y4fVu0 KvGG8wLtdkrVEhkKOqtMQndIrjPZxJnSy4qVhqUybdYaQAbgoY1PgtXSIRDnVOn4SULr Koh98doWFbIYRJBUAs+RwuNcjzubGrec2sFUBuP3MSmUnVwEfll69osrcS95KR7bBJgA YzWg== X-Gm-Message-State: ALoCoQlCFOrzR27cYgqKB6x1o4SYEqCqOQubc9TJaXC8G4loN9XTDyBManiZ5ra+CqVR1OKDY3ZB X-Received: by 10.14.199.3 with SMTP id w3mr60706592een.33.1379519637060; Wed, 18 Sep 2013 08:53:57 -0700 (PDT) Received: from localhost.localdomain (71.63-241-81.adsl-dyn.isp.belgacom.be. [81.241.63.71]) by mx.google.com with ESMTPSA id r48sm3762722eev.14.1969.12.31.16.00.00 (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 18 Sep 2013 08:53:56 -0700 (PDT) From: Jean Pihet To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Jason Cooper , Ezequiel Garcia Subject: [PATCH] arm: mvebu: use the main timer as clock source from DT Date: Wed, 18 Sep 2013 17:53:44 +0200 Message-Id: <1379519624-4267-1-git-send-email-jean.pihet@linaro.org> X-Mailer: git-send-email 1.7.11.7 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130918_115419_792272_3F7D3F05 X-CRM114-Status: UNSURE ( 9.47 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.6 (--) Cc: Thomas Petazzoni , Gregory Clement , Jean Pihet , Andrew Lunn , patches@linaro.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This commit: 573145f08c2b92c45498468afbbba909f6ce6135 clocksource: armada-370-xp: Use CLOCKSOURCE_OF_DECLARE replaced a call to the driver's timer initialization by a call to clocksource_of_init(). However, it failed to select CONFIG_CLKSRC_OF. Fix this by selecting CONFIG_CLKSRC_OF for Armada370/XP machines. Without this change the kernel is stuck at: 'Calibrating delay loop...'. Signed-off-by: Jean Pihet Acked-by: Ezequiel Garcia --- arch/arm/mach-mvebu/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig index 9eb63d7..25e6c00 100644 --- a/arch/arm/mach-mvebu/Kconfig +++ b/arch/arm/mach-mvebu/Kconfig @@ -26,6 +26,7 @@ config MACH_ARMADA_370_XP select HAVE_SMP select CACHE_L2X0 select CPU_PJ4B + select CLKSRC_OF config MACH_ARMADA_370 bool "Marvell Armada 370 boards"