From patchwork Wed Dec 2 21:27:07 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 7753211 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 88A57BEEE1 for ; Wed, 2 Dec 2015 21:31:26 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A1D66204FC for ; Wed, 2 Dec 2015 21:31:25 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8B5F62053F for ; Wed, 2 Dec 2015 21:31:24 +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 1a4Exv-0002nM-71; Wed, 02 Dec 2015 21:29:31 +0000 Received: from mout.kundenserver.de ([212.227.126.131]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1a4EwF-0001ME-0f for linux-arm-kernel@lists.infradead.org; Wed, 02 Dec 2015 21:28:01 +0000 Received: from wuerfel.lan. ([134.3.118.24]) by mrelayeu.kundenserver.de (mreue003) with ESMTPSA (Nemesis) id 0MErUc-1a5sY209XO-00G5IQ; Wed, 02 Dec 2015 22:27:16 +0100 From: Arnd Bergmann To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 5/7] ARM: mv78xx0: multiplatform support Date: Wed, 2 Dec 2015 22:27:07 +0100 Message-Id: <1449091629-2155735-6-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.1.0.rc2 In-Reply-To: <1449091629-2155735-1-git-send-email-arnd@arndb.de> References: <1449091629-2155735-1-git-send-email-arnd@arndb.de> X-Provags-ID: V03:K0:ijwAzAatns0Fck5yfEf1u2IYKiaPNTiygHzQR34719XM7l1/T2T xLg49zQVFJhCqGUacRq7SXoMurFu7jgSBAt4v96teUyPccBx1PS9Ad46p01hOGDYup+MBPl zblt8AIoqVwvY1aW8sjjO8V9e6fod4Mi8dfRKJWvNSD0rDuSKTuxn3f2eYzCm0pWcDAfZRu agc83JSVv7UDK49sulWAg== X-UI-Out-Filterresults: notjunk:1; V01:K0:AyyhCU1xWZs=:siDWLha2SL5REOKdsUn6kO YyxivgymepeLQow/M4HJfJkZnYK7h1xY7VBn8yBbpi4E4pW3Luj8/aKgfq+N27jHPd0khlroh DhvDWxeGcTY8qBc4EOzfAOPyJyNva8epHKc8yo5WsWJCT8DtW8Tr8giY1OWhhxNphv+7LfmJj 0Q4qzCdHCA8Qc0JCarGpfxNpXWpMnNuffRiMGgUt4RdfqIaCR43GbSw6Pgc9vwZ9z9jUJdBFS pC+ewTbQnLyeShU6uvtLZ32ghG7JvwCdIn7b0KDNS1D84T7wGqxU5K8oX/kk6/sVRMEcAiBoO +MfF/+XezJjox7aeyj8Q2qVxy69yVvP1MOnBMz4QS26T0xjoa1UxpJubA+5ZS3WCScj7tikvK wj+BbKGALgBNSNtaYP+5MSBQptW6kcFRc1T9IDgasbJJ9CTab8dIWbR8vONaSaKr7gi/5bkfY mIj9iUTxs8l65Y9EnOkfMh5B5wzo/P/w3rpSJQfazS5pLSNnSpM2jIFajO5vq8kW4EfT02D5P SmzQx+m9A6+wvlofWDVgaYv/GcSCR5qRRxz1HWcO4Z00K1MYOLPfk/ZjL0R+mRQWD1kal1EEh aLc4TpON2a2vDHTaeEqj6pMcP3ZCAoUKx4YYqO0DiHobxbvGIH2kHg5DHb5PGbB/U6VPU5WFU V9NmVy8315ZVlK60uARXUvOF9cmLe3fipE/fBtLpACCRvzPshOb8eqfl0LdhDhuijdzY= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20151202_132747_688758_C35935B5 X-CRM114-Status: GOOD ( 18.64 ) X-Spam-Score: -1.9 (-) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andrew Lunn , Russell King , Jason Cooper , Arnd Bergmann , linux-kernel@vger.kernel.org, Gregory Clement , Sebastian Hesselbarth 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.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, 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 The mv78xx0 platform is now ready to be enabled for multiplatform support, this patch does the switch over by modifying the Kconfig file, the defconfig and removing the last mach/*.h header that becomes obsolete with this. Signed-off-by: Arnd Bergmann Acked-by: Andrew Lunn --- arch/arm/Kconfig | 14 -------- arch/arm/configs/mv78xx0_defconfig | 3 ++ arch/arm/mach-mv78xx0/Kconfig | 15 ++++++--- arch/arm/mach-mv78xx0/Makefile | 2 ++ arch/arm/mach-mv78xx0/include/mach/uncompress.h | 44 ------------------------- 5 files changed, 16 insertions(+), 62 deletions(-) delete mode 100644 arch/arm/mach-mv78xx0/include/mach/uncompress.h diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 99676c25536f..6a7ff25376bf 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -521,20 +521,6 @@ config ARCH_DOVE help Support for the Marvell Dove SoC 88AP510 -config ARCH_MV78XX0 - bool "Marvell MV78xx0" - select ARCH_REQUIRE_GPIOLIB - select CPU_FEROCEON - select GENERIC_CLOCKEVENTS - select MVEBU_MBUS - select MULTI_IRQ_HANDLER - select PCI - select PLAT_ORION_LEGACY - select SPARSE_IRQ - help - Support for the following Marvell MV78xx0 series SoCs: - MV781x0, MV782x0. - config ARCH_ORION5X bool "Marvell Orion" depends on MMU diff --git a/arch/arm/configs/mv78xx0_defconfig b/arch/arm/configs/mv78xx0_defconfig index 85d10d2e3d66..fcdffa7d9d78 100644 --- a/arch/arm/configs/mv78xx0_defconfig +++ b/arch/arm/configs/mv78xx0_defconfig @@ -11,6 +11,9 @@ CONFIG_KPROBES=y CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y # CONFIG_BLK_DEV_BSG is not set +CONFIG_ARCH_MULTI_V5=y +# CONFIG_ARCH_MULTI_V6 is not set +# CONFIG_ARCH_MULTI_V7 is not set CONFIG_ARCH_MV78XX0=y CONFIG_MACH_DB78X00_BP=y CONFIG_MACH_RD78X00_MASA=y diff --git a/arch/arm/mach-mv78xx0/Kconfig b/arch/arm/mach-mv78xx0/Kconfig index f2d309d0619e..a32575fa3fba 100644 --- a/arch/arm/mach-mv78xx0/Kconfig +++ b/arch/arm/mach-mv78xx0/Kconfig @@ -1,6 +1,15 @@ -if ARCH_MV78XX0 +menuconfig ARCH_MV78XX0 + bool "Marvell MV78xx0" if ARCH_MULTI_V5 + select ARCH_REQUIRE_GPIOLIB + select CPU_FEROCEON + select MVEBU_MBUS + select PCI + select PLAT_ORION_LEGACY + help + Support for the following Marvell MV78xx0 series SoCs: + MV781x0, MV782x0. -menu "Marvell MV78xx0 Implementations" +if ARCH_MV78XX0 config MACH_DB78X00_BP bool "Marvell DB-78x00-BP Development Board" @@ -20,6 +29,4 @@ config MACH_TERASTATION_WXL Say 'Y' here if you want your kernel to support the Buffalo WXL Nas. -endmenu - endif diff --git a/arch/arm/mach-mv78xx0/Makefile b/arch/arm/mach-mv78xx0/Makefile index 7cd04634d302..ddb3aa98a3c7 100644 --- a/arch/arm/mach-mv78xx0/Makefile +++ b/arch/arm/mach-mv78xx0/Makefile @@ -1,3 +1,5 @@ +ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/arch/arm/plat-orion/include + obj-y += common.o mpp.o irq.o pcie.o obj-$(CONFIG_MACH_DB78X00_BP) += db78x00-bp-setup.o obj-$(CONFIG_MACH_RD78X00_MASA) += rd78x00-masa-setup.o diff --git a/arch/arm/mach-mv78xx0/include/mach/uncompress.h b/arch/arm/mach-mv78xx0/include/mach/uncompress.h deleted file mode 100644 index 2787ef392262..000000000000 --- a/arch/arm/mach-mv78xx0/include/mach/uncompress.h +++ /dev/null @@ -1,44 +0,0 @@ -/* - * This file is licensed under the terms of the GNU General Public - * License version 2. This program is licensed "as is" without any - * warranty of any kind, whether express or implied. - */ - -#include - -#define UART0_PHYS_BASE (0xf1000000 + 0x12000) -#define SERIAL_BASE ((unsigned char *)UART0_PHYS_BASE) - -static void putc(const char c) -{ - unsigned char *base = SERIAL_BASE; - int i; - - for (i = 0; i < 0x1000; i++) { - if (base[UART_LSR << 2] & UART_LSR_THRE) - break; - barrier(); - } - - base[UART_TX << 2] = c; -} - -static void flush(void) -{ - unsigned char *base = SERIAL_BASE; - unsigned char mask; - int i; - - mask = UART_LSR_TEMT | UART_LSR_THRE; - - for (i = 0; i < 0x1000; i++) { - if ((base[UART_LSR << 2] & mask) == mask) - break; - barrier(); - } -} - -/* - * nothing to do - */ -#define arch_decomp_setup()