From patchwork Thu Mar 14 22:07:36 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 15360 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 7B37A23E39 for ; Thu, 14 Mar 2013 22:12:49 +0000 (UTC) Received: from mail-vb0-f46.google.com (mail-vb0-f46.google.com [209.85.212.46]) by fiordland.canonical.com (Postfix) with ESMTP id 1524DA1814D for ; Thu, 14 Mar 2013 22:12:48 +0000 (UTC) Received: by mail-vb0-f46.google.com with SMTP id b13so1501395vby.33 for ; Thu, 14 Mar 2013 15:12:48 -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=ir/YbqI3j+n6dHOceOivQBXnomTshS8YcrMhppLnAgE=; b=Wn9HLjR3lDpXfJaxCIBcp3Q39OrXd0rIHDYhBlf6VfgiBs2CTSMUloNN7B3S3J4DrU 4uBcvjPs+ukT6IKNrCG8yKnX2EpUpTAyOorksQFYJ71sLdeuuI0PwXNIBgj2HMnPhwST 7bUzk1+ZYG7rrY+ZscPzbPF5E/tA+BOJ5Sw9r2eWy5tkUEFK/mPoI6iP5n8qyRmFP7WA uGkrbsecGFPmaJj2SPDLQTe/H3qDqXSsF68tvdiSFH4xae15uSvGE4R0KUD6Kl0JVfKA G827DXWDhvLOGyas9K4QTCAVqRorQfVNjvW4G+ntVhhvXbY3aguf0jzeHiqvz9fj9mqK KqJQ== X-Received: by 10.58.48.166 with SMTP id m6mr4031973ven.59.1363299168534; Thu, 14 Mar 2013 15:12:48 -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 nf2csp93839veb; Thu, 14 Mar 2013 15:12:47 -0700 (PDT) X-Received: by 10.14.207.73 with SMTP id m49mr11299786eeo.24.1363299166806; Thu, 14 Mar 2013 15:12:46 -0700 (PDT) Received: from moutng.kundenserver.de (moutng.kundenserver.de. [212.227.126.171]) by mx.google.com with ESMTPS id t43si7441734eeg.86.2013.03.14.15.12.46 (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 14 Mar 2013 15:12:46 -0700 (PDT) Received-SPF: neutral (google.com: 212.227.126.171 is neither permitted nor denied by best guess record for domain of arnd@arndb.de) client-ip=212.227.126.171; Authentication-Results: mx.google.com; spf=neutral (google.com: 212.227.126.171 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 0M35gF-1UYl693joF-00sc2X; Thu, 14 Mar 2013 23:07:43 +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 4/5] ARM: cns3xxx: enable multiplatform support Date: Thu, 14 Mar 2013 23:07:36 +0100 Message-Id: <1363298857-8131-5-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:LWhnS3hMiK/zVIatlecyTEesIiAUloxKFvjAmJzXlgy wISz+/Ph01tPqtcNEgAeqkBuR6zHHfykYax/tYXBWctKgpbwAv fJbmqKCcyijVOTfctPhfQce77Cb6p1X7/HJVfE5ICrj2IlE8tq JGartLJlZIJ5IrXvjK7bkxzk6wQ2nueYRiehjXjSydAeKKIr0P zLTCpyb3QhzgKYimwP0nDvg5FzKRKlTfHk/CzaWY8tkewduT5f v/G2dHs8zOWhp41rSPI//pw0foO2BZQ9q63gnY7zVItJAsYQrs 4TrMzWMpbQwKVHG8r8Vu8UtoJ+790zLLYVao80/4XoDz0fdXDf VO2iNVkBcskq7c/gs10S01tyAHcT+LkHuARda/4oj X-Gm-Message-State: ALoCoQkpWMHdBg9K4j215S1FQAvazBYymbyXHuJXM0epAq+TLvhF/oZ9CbbGIGz5X1Poa+wen7+y This moves the cns3xxx configuration option inside of ARCH_MULTIPLATFORM, since there is no reason for not doing it now. We can then also remove the three header files that become obsolete. Signed-off-by: Arnd Bergmann --- arch/arm/Kconfig | 12 ------ arch/arm/configs/cns3420vb_defconfig | 2 + arch/arm/mach-cns3xxx/Kconfig | 11 +++++ arch/arm/mach-cns3xxx/include/mach/timex.h | 12 ------ arch/arm/mach-cns3xxx/include/mach/uncompress.h | 53 ------------------------- 5 files changed, 13 insertions(+), 77 deletions(-) delete mode 100644 arch/arm/mach-cns3xxx/include/mach/timex.h delete mode 100644 arch/arm/mach-cns3xxx/include/mach/uncompress.h diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 8bad33e..78ffcc6 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -382,18 +382,6 @@ config ARCH_BCM2835 This enables support for the Broadcom BCM2835 SoC. This SoC is use in the Raspberry Pi, and Roku 2 devices. -config ARCH_CNS3XXX - bool "Cavium Networks CNS3XXX family" - select ARM_GIC - select CPU_V6K - select GENERIC_CLOCKEVENTS - select MIGHT_HAVE_CACHE_L2X0 - select MIGHT_HAVE_PCI - select PCI_DOMAINS if PCI - select SPARSE_IRQ - help - Support for Cavium Networks CNS3XXX platform. - config ARCH_CLPS711X bool "Cirrus Logic CLPS711x/EP721x/EP731x-based" select ARCH_REQUIRE_GPIOLIB diff --git a/arch/arm/configs/cns3420vb_defconfig b/arch/arm/configs/cns3420vb_defconfig index b79e984..b1ff5cd 100644 --- a/arch/arm/configs/cns3420vb_defconfig +++ b/arch/arm/configs/cns3420vb_defconfig @@ -19,6 +19,8 @@ CONFIG_MODULE_FORCE_UNLOAD=y CONFIG_MODVERSIONS=y # CONFIG_BLK_DEV_BSG is not set CONFIG_IOSCHED_CFQ=m +CONFIG_ARCH_MULTI_V6=y +#CONFIG_ARCH_MULTI_V7 is not set CONFIG_ARCH_CNS3XXX=y CONFIG_MACH_CNS3420VB=y CONFIG_DEBUG_CNS3XXX=y diff --git a/arch/arm/mach-cns3xxx/Kconfig b/arch/arm/mach-cns3xxx/Kconfig index 9ebfcc4..5720f3d 100644 --- a/arch/arm/mach-cns3xxx/Kconfig +++ b/arch/arm/mach-cns3xxx/Kconfig @@ -1,3 +1,14 @@ +config ARCH_CNS3XXX + bool "Cavium Networks CNS3XXX family" if ARCH_MULTI_V6 + select ARM_GIC + select CPU_V6K + select GENERIC_CLOCKEVENTS + select MIGHT_HAVE_CACHE_L2X0 + select MIGHT_HAVE_PCI + select PCI_DOMAINS if PCI + help + Support for Cavium Networks CNS3XXX platform. + menu "CNS3XXX platform type" depends on ARCH_CNS3XXX diff --git a/arch/arm/mach-cns3xxx/include/mach/timex.h b/arch/arm/mach-cns3xxx/include/mach/timex.h deleted file mode 100644 index 1fd0421..0000000 --- a/arch/arm/mach-cns3xxx/include/mach/timex.h +++ /dev/null @@ -1,12 +0,0 @@ -/* - * Cavium Networks architecture timex specifications - * - * Copyright 2003 ARM Limited - * Copyright 2008 Cavium Networks - * - * This file is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License, Version 2, as - * published by the Free Software Foundation. - */ - -#define CLOCK_TICK_RATE (50000000 / 16) diff --git a/arch/arm/mach-cns3xxx/include/mach/uncompress.h b/arch/arm/mach-cns3xxx/include/mach/uncompress.h deleted file mode 100644 index e2c642c..0000000 --- a/arch/arm/mach-cns3xxx/include/mach/uncompress.h +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright 2003 ARM Limited - * Copyright 2008 Cavium Networks - * - * This file is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License, Version 2, as - * published by the Free Software Foundation. - */ - -#include -#include "cns3xxx.h" - -#define AMBA_UART_DR(base) (*(volatile unsigned char *)((base) + 0x00)) -#define AMBA_UART_LCRH(base) (*(volatile unsigned char *)((base) + 0x2c)) -#define AMBA_UART_CR(base) (*(volatile unsigned char *)((base) + 0x30)) -#define AMBA_UART_FR(base) (*(volatile unsigned char *)((base) + 0x18)) - -/* - * Return the UART base address - */ -static inline unsigned long get_uart_base(void) -{ - if (machine_is_cns3420vb()) - return CNS3XXX_UART0_BASE; - else - return 0; -} - -/* - * This does not append a newline - */ -static inline void putc(int c) -{ - unsigned long base = get_uart_base(); - - while (AMBA_UART_FR(base) & (1 << 5)) - barrier(); - - AMBA_UART_DR(base) = c; -} - -static inline void flush(void) -{ - unsigned long base = get_uart_base(); - - while (AMBA_UART_FR(base) & (1 << 3)) - barrier(); -} - -/* - * nothing to do - */ -#define arch_decomp_setup()