From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755880AbbLBV1v (ORCPT ); Wed, 2 Dec 2015 16:27:51 -0500 Received: from mout.kundenserver.de ([212.227.126.130]:61034 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752536AbbLBV1t (ORCPT ); Wed, 2 Dec 2015 16:27:49 -0500 From: Arnd Bergmann To: linux-arm-kernel@lists.infradead.org Cc: Andrew Lunn , Russell King , Jason Cooper , linux-kernel@vger.kernel.org, Gregory Clement , Sebastian Hesselbarth , Arnd Bergmann Subject: [PATCH 7/7] ARM: orion5x: multiplatform support Date: Wed, 2 Dec 2015 22:27:09 +0100 Message-Id: <1449091629-2155735-8-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:iwB4T8N7IZD3i52ikpfOgKEJ/CSDpHOOCKYGyfm/CD7sAH8DZSi KkvB8CMYeClC+iAsoiSSpZIOhzpKcy9h2eb55/w6EllTzvGo3sFf68580FMXECcioMaksNK SCKF+iquoTtr8K1/2Nw1zmBMwp+9F1yFVLJ/opfda6XBVoVLvfNAVZW5vmpdxhXlaRs5V+y RQS5usUqew0te69wka3JA== X-UI-Out-Filterresults: notjunk:1;V01:K0:Ar6g7AceCzY=:pV+6eSOtJyg3CPeMWZKSto Tdwz1c/NGAgvBBVQ3guJ8GjuOdd06vYRfg3q++/oai5AzF5S3JtFReTk/shz+kYwFiZTxIJp8 iPhKKdS3DaMh9+j1kbiL9voWcwtTTQwd+20KJSDecGnJFwYAsjgKRrxy82y24acKt67YCQh1C 2wopG55j4o8UUi7UPFaCSVuCl/8uE5HVNFjUQ0cR0VtMl1+gtleXX4X2xqEEC/8beaD3T3rN9 xcm0wa0q5qnbGde+N7Z4fvaIxDh4jg4sM1vAwbkjarEopeR1Nl/cVWx9hTlb5nJ5kyg6PADhc Zl2xSnps1sW66ffv/Up1rSMRxZQi50K5DsG60VO7AX2eRwfCmaJo5uDNNQOidmmIJXd6BPKDm oKZwnefMOQ6vJ0KXqNstxp0usvfDk+9RlG0uR9dDc+qmRYnmN7bo16/GOu2nOLCMUgSas7e1G PUi9RJj4csodASOU3QnnmjH93RSxEIkYhQfmktz5bnQP1xSTtfGImopHUFiTDWLdmxbJwLfzX GM7KE+YWexBa+bwKHBLWCQ2bH0SDiQxKIMMMJ64QRT5Cz/uxKSoBCf0kA7inJTUQuyMohl2Ys +zrh9FXe9SAzqxhyY9+v13G/sCo8rlpyKNerxGY4Go157Y3YSQTAx3YwKzu3TdOZQZu4sjot8 P/cZShsDfv6IvB1bva5NH+3brqt1B+zLbHrpSX7IPg6p3/zwAOjV36MvOehuacWCjnNo= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The orion5x 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 | 17 --------- arch/arm/configs/orion5x_defconfig | 3 ++ arch/arm/mach-orion5x/Kconfig | 18 +++++++--- arch/arm/mach-orion5x/Makefile | 2 ++ arch/arm/mach-orion5x/include/mach/uncompress.h | 46 ------------------------- 5 files changed, 19 insertions(+), 67 deletions(-) delete mode 100644 arch/arm/mach-orion5x/include/mach/uncompress.h diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 6a7ff25376bf..3b3cd6deb816 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -521,23 +521,6 @@ config ARCH_DOVE help Support for the Marvell Dove SoC 88AP510 -config ARCH_ORION5X - bool "Marvell Orion" - depends on MMU - select ARCH_REQUIRE_GPIOLIB - select CPU_FEROCEON - select GENERIC_CLOCKEVENTS - select MVEBU_MBUS - select MULTI_IRQ_HANDLER - select PCI - select PLAT_ORION_LEGACY - select MULTI_IRQ_HANDLER - select SPARSE_IRQ - help - Support for the following Marvell Orion 5x series SoCs: - Orion-1 (5181), Orion-VoIP (5181L), Orion-NAS (5182), - Orion-2 (5281), Orion-1-90 (6183). - config ARCH_MMP bool "Marvell PXA168/910/MMP2" depends on MMU diff --git a/arch/arm/configs/orion5x_defconfig b/arch/arm/configs/orion5x_defconfig index 8099417a9466..6ddca8875cb5 100644 --- a/arch/arm/configs/orion5x_defconfig +++ b/arch/arm/configs/orion5x_defconfig @@ -13,6 +13,9 @@ CONFIG_MODULE_UNLOAD=y # CONFIG_BLK_DEV_BSG is not set CONFIG_PARTITION_ADVANCED=y CONFIG_BSD_DISKLABEL=y +CONFIG_ARCH_MULTI_V5=y +# CONFIG_ARCH_MULTI_V6 is not set +# CONFIG_ARCH_MULTI_V7 is not set CONFIG_ARCH_ORION5X=y CONFIG_ARCH_ORION5X_DT=y CONFIG_MACH_DB88F5281=y diff --git a/arch/arm/mach-orion5x/Kconfig b/arch/arm/mach-orion5x/Kconfig index 66f1c952c048..a9ad95f000a1 100644 --- a/arch/arm/mach-orion5x/Kconfig +++ b/arch/arm/mach-orion5x/Kconfig @@ -1,6 +1,18 @@ -if ARCH_ORION5X +menuconfig ARCH_ORION5X + bool "Marvell Orion" + depends on MMU && ARCH_MULTI_V5 + select ARCH_REQUIRE_GPIOLIB + select CPU_FEROCEON + select GENERIC_CLOCKEVENTS + select MVEBU_MBUS + select PCI + select PLAT_ORION_LEGACY + help + Support for the following Marvell Orion 5x series SoCs: + Orion-1 (5181), Orion-VoIP (5181L), Orion-NAS (5182), + Orion-2 (5281), Orion-1-90 (6183). -menu "Orion Implementations" +if ARCH_ORION5X config ARCH_ORION5X_DT bool "Marvell Orion5x Flattened Device Tree" @@ -163,6 +175,4 @@ config MACH_RD88F6183AP_GE Say 'Y' here if you want your kernel to support the Marvell Orion-1-90 (88F6183) AP GE RD. -endmenu - endif diff --git a/arch/arm/mach-orion5x/Makefile b/arch/arm/mach-orion5x/Makefile index a1e0fbe6a7a1..4b2502b4ca0d 100644 --- a/arch/arm/mach-orion5x/Makefile +++ b/arch/arm/mach-orion5x/Makefile @@ -1,3 +1,5 @@ +ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/arch/arm/plat-orion/include + obj-y += common.o pci.o irq.o mpp.o obj-$(CONFIG_MACH_DB88F5281) += db88f5281-setup.o obj-$(CONFIG_MACH_RD88F5182) += rd88f5182-setup.o diff --git a/arch/arm/mach-orion5x/include/mach/uncompress.h b/arch/arm/mach-orion5x/include/mach/uncompress.h deleted file mode 100644 index 25e5cb98fecc..000000000000 --- a/arch/arm/mach-orion5x/include/mach/uncompress.h +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Tzachi Perelstein - * - * 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() -- 2.1.0.rc2