From patchwork Thu Mar 14 22:07:33 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 15359 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id B3C7B23E39 for ; Thu, 14 Mar 2013 22:12:46 +0000 (UTC) Received: from mail-ve0-f175.google.com (mail-ve0-f175.google.com [209.85.128.175]) by fiordland.canonical.com (Postfix) with ESMTP id 5333AA1814D for ; Thu, 14 Mar 2013 22:12:46 +0000 (UTC) Received: by mail-ve0-f175.google.com with SMTP id cy12so2116393veb.20 for ; Thu, 14 Mar 2013 15:12:45 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :received-spf:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-provags-id:x-gm-message-state; bh=xYG5ny/3uDSPgKqhHQuQqkJPjGjpPZ6B5Zs/Y1dTtw0=; b=JCQP3lwgvQwZYYPeVXoXK0J/MBffTMHT/6KHPIFKJQUS6IWJCUGzatDF2IHrzIE7tG A5YLRhX1IVRDJ6VPD9NJ69jsRiN242kPNFneIX0fOjcZefoPYVJmLV8vZVvCxL2v/cSd 844QuIz+VVvyCgnpuBlnBB0crzWu+ZoZu4MWFMPmfnBvTOi8ANAwtAGn5RB8gydQm94l +U+T1+DUAiiMA00dpl7/ro3Za8Q8dJdy0qrpByjQzk7flgDt0b3IeILSqRcCTnYWNXB6 0nhILaOls63afpPwztSr4koQu9RCI3kKy+wQDduebXsHZrP4/C4gShyMGXg37Mj9kbvs OAsQ== X-Received: by 10.58.188.48 with SMTP id fx16mr4145546vec.22.1363299165794; Thu, 14 Mar 2013 15:12:45 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.58.127.98 with SMTP id nf2csp93837veb; Thu, 14 Mar 2013 15:12:45 -0700 (PDT) X-Received: by 10.14.193.134 with SMTP id k6mr11198880een.37.1363299163528; Thu, 14 Mar 2013 15:12:43 -0700 (PDT) Received: from moutng.kundenserver.de (moutng.kundenserver.de. [212.227.126.187]) by mx.google.com with ESMTPS id w44si7482934eeg.6.2013.03.14.15.12.42 (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 14 Mar 2013 15:12:43 -0700 (PDT) Received-SPF: neutral (google.com: 212.227.126.187 is neither permitted nor denied by best guess record for domain of arnd@arndb.de) client-ip=212.227.126.187; Authentication-Results: mx.google.com; spf=neutral (google.com: 212.227.126.187 is neither permitted nor denied by best guess record for domain of arnd@arndb.de) smtp.mail=arnd@arndb.de Received: from wuerfel.lan (HSI-KBW-46-223-90-92.hsi.kabel-badenwuerttemberg.de [46.223.90.92]) by mrelayeu.kundenserver.de (node=mrbap2) with ESMTP (Nemesis) id 0MWPgw-1UDU6C3smQ-00XrYm; Thu, 14 Mar 2013 23:07:39 +0100 From: Arnd Bergmann To: Anton Vorontsov Cc: linux-arm-kernel@vger.kernel.org, patches@linaro.org, Olof Johansson , Florian Fainelli , Imre Kaloz , Arnd Bergmann Subject: [PATCH 1/5] ARM: cns3xxx: make mach header files local Date: Thu, 14 Mar 2013 23:07:33 +0100 Message-Id: <1363298857-8131-2-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1363298857-8131-1-git-send-email-arnd@arndb.de> References: <1363298857-8131-1-git-send-email-arnd@arndb.de> X-Provags-ID: V02:K0:HM7dKalPEHhiYcYqPNAzkW2uhPHtqHCUWxSI7KfLe1y UIQP4/W5Zp+oovub6JoDgy38puTJzT63wMlU0o0RtPn84AXSRC vxEQdcTWvjwqkK3riUrpB8+wgYlwPqx3bk9tM/mLtbdqSUHrqM k8vFPD2SxPbGqwRbvjzg2P7afBMHd/L0tM48WKI/hfBaMWaCxU 5Akrnz1p/guG229q10f7q56xA4eaTQwFZQ0ATAT/LnR9PACEG7 pmHqhh6xvtqhSzJHDAb98ClS2ZkB+R1x9NUd6lWf9RLFeUelTD VGQRNkLCv6fAnsW/DelRDKIFut5u2klFCS1BVXAmtkotfCpYUD m4KUUJB+kN6fItSTg49S7Dqcl/N5mYF5oTYLDaasR X-Gm-Message-State: ALoCoQlgzNjo0lhKl3FGXBgGIfBV9Mg/igvb2kQvwJSQBvZtyKtaUEIqEYuB8oI/31kcJIUOgxU/ The mach/cns3xxx.h and mach/pm.h header files are used only in the platform code itself, so there is no need to make them globally visible. This gets us closer to multiplatform configuration for cns3xxx. Signed-off-by: Arnd Bergmann --- arch/arm/mach-cns3xxx/cns3420vb.c | 5 ++--- arch/arm/mach-cns3xxx/{include/mach => }/cns3xxx.h | 7 ++----- arch/arm/mach-cns3xxx/core.c | 2 +- arch/arm/mach-cns3xxx/devices.c | 5 ++--- arch/arm/mach-cns3xxx/include/mach/uncompress.h | 2 +- arch/arm/mach-cns3xxx/pcie.c | 2 +- arch/arm/mach-cns3xxx/pm.c | 4 ++-- arch/arm/mach-cns3xxx/{include/mach => }/pm.h | 0 drivers/mmc/host/sdhci-cns3xxx.c | 1 - 9 files changed, 11 insertions(+), 17 deletions(-) rename arch/arm/mach-cns3xxx/{include/mach => }/cns3xxx.h (99%) rename arch/arm/mach-cns3xxx/{include/mach => }/pm.h (100%) diff --git a/arch/arm/mach-cns3xxx/cns3420vb.c b/arch/arm/mach-cns3xxx/cns3420vb.c index a71867e..d863d87 100644 --- a/arch/arm/mach-cns3xxx/cns3420vb.c +++ b/arch/arm/mach-cns3xxx/cns3420vb.c @@ -31,9 +31,8 @@ #include #include #include -#include -#include -#include +#include "cns3xxx.h" +#include "pm.h" #include "core.h" #include "devices.h" diff --git a/arch/arm/mach-cns3xxx/include/mach/cns3xxx.h b/arch/arm/mach-cns3xxx/cns3xxx.h similarity index 99% rename from arch/arm/mach-cns3xxx/include/mach/cns3xxx.h rename to arch/arm/mach-cns3xxx/cns3xxx.h index 191c8e5..d7d3a8d 100644 --- a/arch/arm/mach-cns3xxx/include/mach/cns3xxx.h +++ b/arch/arm/mach-cns3xxx/cns3xxx.h @@ -553,6 +553,8 @@ int cns3xxx_cpu_clock(void); /* * ARM11 MPCore interrupt sources (primary GIC) */ +#define IRQ_TC11MP_GIC_START 32 + #define IRQ_CNS3XXX_PMU (IRQ_TC11MP_GIC_START + 0) #define IRQ_CNS3XXX_SDIO (IRQ_TC11MP_GIC_START + 1) #define IRQ_CNS3XXX_L2CC (IRQ_TC11MP_GIC_START + 2) @@ -624,9 +626,4 @@ int cns3xxx_cpu_clock(void); #define NR_IRQS_CNS3XXX (IRQ_TC11MP_GIC_START + 64) -#if !defined(NR_IRQS) || (NR_IRQS < NR_IRQS_CNS3XXX) -#undef NR_IRQS -#define NR_IRQS NR_IRQS_CNS3XXX -#endif - #endif /* __MACH_BOARD_CNS3XXX_H */ diff --git a/arch/arm/mach-cns3xxx/core.c b/arch/arm/mach-cns3xxx/core.c index e698f26..012ffdb 100644 --- a/arch/arm/mach-cns3xxx/core.c +++ b/arch/arm/mach-cns3xxx/core.c @@ -17,7 +17,7 @@ #include #include #include -#include +#include "cns3xxx.h" #include "core.h" static struct map_desc cns3xxx_io_desc[] __initdata = { diff --git a/arch/arm/mach-cns3xxx/devices.c b/arch/arm/mach-cns3xxx/devices.c index 1e40c99..7da78a2 100644 --- a/arch/arm/mach-cns3xxx/devices.c +++ b/arch/arm/mach-cns3xxx/devices.c @@ -16,9 +16,8 @@ #include #include #include -#include -#include -#include +#include "cns3xxx.h" +#include "pm.h" #include "core.h" #include "devices.h" diff --git a/arch/arm/mach-cns3xxx/include/mach/uncompress.h b/arch/arm/mach-cns3xxx/include/mach/uncompress.h index 7a030b9..e2c642c 100644 --- a/arch/arm/mach-cns3xxx/include/mach/uncompress.h +++ b/arch/arm/mach-cns3xxx/include/mach/uncompress.h @@ -8,7 +8,7 @@ */ #include -#include +#include "cns3xxx.h" #define AMBA_UART_DR(base) (*(volatile unsigned char *)((base) + 0x00)) #define AMBA_UART_LCRH(base) (*(volatile unsigned char *)((base) + 0x2c)) diff --git a/arch/arm/mach-cns3xxx/pcie.c b/arch/arm/mach-cns3xxx/pcie.c index 3113283..c7b204b 100644 --- a/arch/arm/mach-cns3xxx/pcie.c +++ b/arch/arm/mach-cns3xxx/pcie.c @@ -20,7 +20,7 @@ #include #include #include -#include +#include "cns3xxx.h" #include "core.h" enum cns3xxx_access_type { diff --git a/arch/arm/mach-cns3xxx/pm.c b/arch/arm/mach-cns3xxx/pm.c index 3645808..79e3d47 100644 --- a/arch/arm/mach-cns3xxx/pm.c +++ b/arch/arm/mach-cns3xxx/pm.c @@ -11,8 +11,8 @@ #include #include #include -#include -#include +#include "cns3xxx.h" +#include "pm.h" #include "core.h" void cns3xxx_pwr_clk_en(unsigned int block) diff --git a/arch/arm/mach-cns3xxx/include/mach/pm.h b/arch/arm/mach-cns3xxx/pm.h similarity index 100% rename from arch/arm/mach-cns3xxx/include/mach/pm.h rename to arch/arm/mach-cns3xxx/pm.h diff --git a/drivers/mmc/host/sdhci-cns3xxx.c b/drivers/mmc/host/sdhci-cns3xxx.c index 30bfdc4..6ba8502 100644 --- a/drivers/mmc/host/sdhci-cns3xxx.c +++ b/drivers/mmc/host/sdhci-cns3xxx.c @@ -16,7 +16,6 @@ #include #include #include -#include #include "sdhci-pltfm.h" static unsigned int sdhci_cns3xxx_get_max_clk(struct sdhci_host *host)