From patchwork Thu Mar 13 09:50:08 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Phil Edworthy X-Patchwork-Id: 329833 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 8A4DD2C00B7 for ; Thu, 13 Mar 2014 20:50:52 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753592AbaCMJuq (ORCPT ); Thu, 13 Mar 2014 05:50:46 -0400 Received: from relmlor2.renesas.com ([210.160.252.172]:34652 "EHLO relmlie1.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753589AbaCMJua (ORCPT ); Thu, 13 Mar 2014 05:50:30 -0400 Received: from unknown (HELO relmlir1.idc.renesas.com) ([10.200.68.151]) by relmlie1.idc.renesas.com with ESMTP; 13 Mar 2014 18:50:27 +0900 Received: from relmlac1.idc.renesas.com (relmlac1.idc.renesas.com [10.200.69.21]) by relmlir1.idc.renesas.com (Postfix) with ESMTP id D118A49B20; Thu, 13 Mar 2014 18:50:27 +0900 (JST) Received: by relmlac1.idc.renesas.com (Postfix, from userid 0) id B8C8980193; Thu, 13 Mar 2014 18:50:27 +0900 (JST) Received: from relmlac1.idc.renesas.com (localhost [127.0.0.1]) by relmlac1.idc.renesas.com (Postfix) with ESMTP id B349380177; Thu, 13 Mar 2014 18:50:27 +0900 (JST) Received: from relmlii1.idc.renesas.com [10.200.68.65] by relmlac1.idc.renesas.com with ESMTP id UAU07498; Thu, 13 Mar 2014 18:50:27 +0900 X-IronPort-AV: E=Sophos;i="4.97,646,1389711600"; d="scan'208";a="155318471" Received: from unknown (HELO relay41.aps.necel.com) ([10.29.19.9]) by relmlii1.idc.renesas.com with ESMTP; 13 Mar 2014 18:50:27 +0900 Received: from DU0NOTES13.ad.ree.renesas.com ([172.29.24.131]) by relay41.aps.necel.com (8.14.4+Sun/8.14.4) with ESMTP id s2D9oOBL008754; Thu, 13 Mar 2014 18:50:26 +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 2014031310502524-5632 ; Thu, 13 Mar 2014 10:50:25 +0100 From: Phil Edworthy To: linux-pci@vger.kernel.org Cc: linux-sh@vger.kernel.org, Bjorn Helgaas , Valentine Barshak , Simon Horman , Magnus Damm , Ben Dooks , Phil Edworthy X-Mailer: git-send-email 1.9.0 In-Reply-To: <1394704208-7490-1-git-send-email-phil.edworthy@renesas.com> References: <1394704208-7490-1-git-send-email-phil.edworthy@renesas.com> X-TNEFEvaluated: 1 Message-ID: <1394704208-7490-10-git-send-email-phil.edworthy@renesas.com> Date: Thu, 13 Mar 2014 09:50:08 +0000 Subject: [PATCH 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 13.03.2014 10:50:25, Serialize by Router on DU0NOTES13/SERVER/REE(Release 8.5.3 HF466|March 09, 2012) at 13.03.2014 10:50:26, Serialize complete at 13.03.2014 10:50:26 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org 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