From patchwork Tue Mar 25 16:56:44 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Phil Edworthy X-Patchwork-Id: 3889511 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 679259F2B6 for ; Tue, 25 Mar 2014 17:54:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7874F2017B for ; Tue, 25 Mar 2014 17:54:52 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 800F6200E3 for ; Tue, 25 Mar 2014 17:54:51 +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 1WSUhG-0006r4-Lq; Tue, 25 Mar 2014 16:59:31 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WSUgc-0002Me-Nr; Tue, 25 Mar 2014 16:58:50 +0000 Received: from relmlor2.renesas.com ([210.160.252.172] helo=relmlie1.idc.renesas.com) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WSUfT-0002EE-Er for linux-arm-kernel@lists.infradead.org; Tue, 25 Mar 2014 16:57:41 +0000 Received: from unknown (HELO relmlir4.idc.renesas.com) ([10.200.68.154]) by relmlie1.idc.renesas.com with ESMTP; 26 Mar 2014 01:56:55 +0900 Received: from relmlac2.idc.renesas.com (relmlac2.idc.renesas.com [10.200.69.22]) by relmlir4.idc.renesas.com (Postfix) with ESMTP id 4CEAC3E313; Wed, 26 Mar 2014 01:56:55 +0900 (JST) Received: by relmlac2.idc.renesas.com (Postfix, from userid 0) id 2A985280A0; Wed, 26 Mar 2014 01:56:55 +0900 (JST) Received: from relmlac2.idc.renesas.com (localhost [127.0.0.1]) by relmlac2.idc.renesas.com (Postfix) with ESMTP id 2859A280A6; Wed, 26 Mar 2014 01:56:55 +0900 (JST) Received: from relmlii1.idc.renesas.com [10.200.68.65] by relmlac2.idc.renesas.com with ESMTP id BAQ31002; Wed, 26 Mar 2014 01:56:55 +0900 X-IronPort-AV: E=Sophos;i="4.97,728,1389711600"; d="scan'208";a="156250267" Received: from unknown (HELO relay51.aps.necel.com) ([10.29.19.60]) by relmlii1.idc.renesas.com with ESMTP; 26 Mar 2014 01:56:54 +0900 Received: from DU0NOTES13.ad.ree.renesas.com ([172.29.24.131]) by relay51.aps.necel.com (8.14.4+Sun/8.14.4) with ESMTP id s2PGtg3F027433; Wed, 26 Mar 2014 01:56:53 +0900 (JST) Received: from duacsls.ad.ree.renesas.com ([172.29.43.47]) by DU0NOTES13.ad.ree.renesas.com (Lotus Domino Release 8.5.3 HF466) with ESMTP id 2014032517565185-136780 ; Tue, 25 Mar 2014 17:56:51 +0100 From: Phil Edworthy To: linux-pci@vger.kernel.org X-Mailer: git-send-email 1.9.0 In-Reply-To: <1395766604-30926-1-git-send-email-phil.edworthy@renesas.com> References: <1395766604-30926-1-git-send-email-phil.edworthy@renesas.com> X-TNEFEvaluated: 1 Message-ID: <1395766604-30926-10-git-send-email-phil.edworthy@renesas.com> Date: Tue, 25 Mar 2014 16:56:44 +0000 Subject: [PATCH v5 9/9] ARM: koelsch: Add HAVE_ARM_ARCH_TIMER to defconfig X-MIMETrack: Itemize by SMTP Server on DU0NOTES13/SERVER/REE(Release 8.5.3 HF466|March 09, 2012) at 25.03.2014 17:56:52, Serialize by Router on DU0NOTES13/SERVER/REE(Release 8.5.3 HF466|March 09, 2012) at 25.03.2014 17:56:53, Serialize complete at 25.03.2014 17:56:53 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140325_125739_906099_8DA51D77 X-CRM114-Status: UNSURE ( 8.71 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.3 (--) Cc: Phil Edworthy , linux-sh@vger.kernel.org, Magnus Damm , Valentine Barshak , Simon Horman , Bjorn Helgaas , Ben Dooks , LAKML 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.6 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 is fixes a boot problem when the R-Car PCIe driver is enabled. Signed-off-by: Phil Edworthy --- arch/arm/configs/koelsch_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/configs/koelsch_defconfig b/arch/arm/configs/koelsch_defconfig index ec14547..67666b6 100644 --- a/arch/arm/configs/koelsch_defconfig +++ b/arch/arm/configs/koelsch_defconfig @@ -15,6 +15,7 @@ CONFIG_MACH_KOELSCH=y CONFIG_CPU_BPREDICT_DISABLE=y CONFIG_PL310_ERRATA_588369=y CONFIG_ARM_ERRATA_754322=y +CONFIG_HAVE_ARM_ARCH_TIMER=y CONFIG_PCI=y CONFIG_PCI_MSI=y CONFIG_PCI_RCAR_GEN2_PCIE=y