From patchwork Tue Dec 30 19:28:37 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 5552961 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.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 6968D9F1BF for ; Tue, 30 Dec 2014 19:33:47 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6D67A200FE for ; Tue, 30 Dec 2014 19:33:46 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (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 7AC46200DC for ; Tue, 30 Dec 2014 19:33:45 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Y62Vz-0007EG-71; Tue, 30 Dec 2014 19:31:35 +0000 Received: from mail-ob0-x22e.google.com ([2607:f8b0:4003:c01::22e]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Y62Tz-0005Bp-2B for linux-arm-kernel@lists.infradead.org; Tue, 30 Dec 2014 19:29:33 +0000 Received: by mail-ob0-f174.google.com with SMTP id nt9so50827694obb.5 for ; Tue, 30 Dec 2014 11:29:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=zyaGTXRJpOUuS/m7RC+a1ZLCGG4evznSM8mb0z3mEEY=; b=KUebNehMPvtz1ruKOhCTBgyxOR1JxWdB4Plx41kZ63QGRhWxjxPYTKh9xBcq5IcZXe Uq53bAzF7ML2eSofVWS1BruR/2LcnswPYO17i9hswLMFfTuVY3SwztaJ/Fm9Dp7AY8vU zpuRrRbiZW7YJL2lt3IRBbzoNSHT3wtq2qA7RSuj8K8FWeWdI2UWw6oz5d8fZwwOIn0t /DOUx8y2qlb8abL6laDW6zb2KaiRQRUCmIWEuCW2RTpEsx9nNm6pxCG5iQuJXdRI9JW1 lRurcRjs8plSd3+OaybSlJAUIjBtM/+80VauMWBMbBg94dYXaM3Z5xn36+P4hANUOnh5 bSRw== X-Received: by 10.60.76.10 with SMTP id g10mr16977138oew.0.1419967750001; Tue, 30 Dec 2014 11:29:10 -0800 (PST) Received: from rob-laptop.herring.priv (72-48-98-129.dyn.grandenetworks.net. [72.48.98.129]) by mx.google.com with ESMTPSA id e3sm20469216oib.27.2014.12.30.11.29.08 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 30 Dec 2014 11:29:09 -0800 (PST) From: Rob Herring To: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org Subject: [PATCH 8/9] ARM: versatile: convert to multi-platform Date: Tue, 30 Dec 2014 13:28:37 -0600 Message-Id: <1419967718-26909-9-git-send-email-robherring2@gmail.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1419967718-26909-1-git-send-email-robherring2@gmail.com> References: <1419967718-26909-1-git-send-email-robherring2@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141230_112931_212055_F8162FE6 X-CRM114-Status: GOOD ( 13.12 ) X-Spam-Score: -0.6 (/) Cc: Peter Maydell , Russell King , Rob Herring , Linus Walleij , arm@kernel.org, Bjorn Helgaas X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 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.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, T_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 From: Rob Herring Now that all the prerequisites are in place, we can enable Versatile boards for multi-platform kernels. Signed-off-by: Rob Herring Cc: Russell King Cc: Linus Walleij --- arch/arm/Kconfig | 21 +---------- arch/arm/mach-versatile/Kconfig | 14 +++++++ arch/arm/mach-versatile/Makefile.boot | 4 -- arch/arm/mach-versatile/include/mach/uncompress.h | 45 ----------------------- 4 files changed, 16 insertions(+), 68 deletions(-) create mode 100644 arch/arm/mach-versatile/Kconfig delete mode 100644 arch/arm/mach-versatile/Makefile.boot delete mode 100644 arch/arm/mach-versatile/include/mach/uncompress.h diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 7816b54..4d9858f 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -337,25 +337,6 @@ config ARCH_REALVIEW help This enables support for ARM Ltd RealView boards. -config ARCH_VERSATILE - bool "ARM Ltd. Versatile family" - select ARCH_WANT_OPTIONAL_GPIOLIB - select ARM_AMBA - select ARM_TIMER_SP804 - select ARM_VIC - select CLKSRC_VERSATILE - select COMMON_CLK - select COMMON_CLK_VERSATILE - select CPU_ARM926T - select GENERIC_CLOCKEVENTS - select ICST - select MIGHT_HAVE_PCI - select SPARSE_IRQ - select USE_OF - select VERSATILE_FPGA_IRQ - help - This enables support for ARM Ltd Versatile board. - config ARCH_AT91 bool "Atmel AT91" select ARCH_REQUIRE_GPIOLIB @@ -956,6 +937,8 @@ source "arch/arm/mach-u300/Kconfig" source "arch/arm/mach-ux500/Kconfig" +source "arch/arm/mach-versatile/Kconfig" + source "arch/arm/mach-vexpress/Kconfig" source "arch/arm/plat-versatile/Kconfig" diff --git a/arch/arm/mach-versatile/Kconfig b/arch/arm/mach-versatile/Kconfig new file mode 100644 index 0000000..1d6a8b2 --- /dev/null +++ b/arch/arm/mach-versatile/Kconfig @@ -0,0 +1,14 @@ +config ARCH_VERSATILE + bool "ARM Ltd. Versatile family" if ARCH_MULTI_V5 + select ARM_AMBA + select ARM_TIMER_SP804 + select ARM_VIC + select CLKSRC_VERSATILE + select COMMON_CLK_VERSATILE + select CPU_ARM926T + select ICST + select MIGHT_HAVE_PCI + select VERSATILE_FPGA_IRQ + help + This enables support for ARM Ltd Versatile board. + diff --git a/arch/arm/mach-versatile/Makefile.boot b/arch/arm/mach-versatile/Makefile.boot deleted file mode 100644 index ff0a4b5..0000000 --- a/arch/arm/mach-versatile/Makefile.boot +++ /dev/null @@ -1,4 +0,0 @@ - zreladdr-y += 0x00008000 -params_phys-y := 0x00000100 -initrd_phys-y := 0x00800000 - diff --git a/arch/arm/mach-versatile/include/mach/uncompress.h b/arch/arm/mach-versatile/include/mach/uncompress.h deleted file mode 100644 index 986e3d3..0000000 --- a/arch/arm/mach-versatile/include/mach/uncompress.h +++ /dev/null @@ -1,45 +0,0 @@ -/* - * arch/arm/mach-versatile/include/mach/uncompress.h - * - * Copyright (C) 2003 ARM Limited - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ -#define AMBA_UART_DR (*(volatile unsigned char *)0x101F1000) -#define AMBA_UART_LCRH (*(volatile unsigned char *)0x101F102C) -#define AMBA_UART_CR (*(volatile unsigned char *)0x101F1030) -#define AMBA_UART_FR (*(volatile unsigned char *)0x101F1018) - -/* - * This does not append a newline - */ -static inline void putc(int c) -{ - while (AMBA_UART_FR & (1 << 5)) - barrier(); - - AMBA_UART_DR = c; -} - -static inline void flush(void) -{ - while (AMBA_UART_FR & (1 << 3)) - barrier(); -} - -/* - * nothing to do - */ -#define arch_decomp_setup()