tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

ARM: orion5x: multiplatform support

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 <arnd@arndb.de>
Acked-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>

authored by

Arnd Bergmann and committed by
Gregory CLEMENT 63cddd25 c22c2c60

+19 -67
-17
arch/arm/Kconfig
··· 519 519 help 520 520 Support for the Marvell Dove SoC 88AP510 521 521 522 - config ARCH_ORION5X 523 - bool "Marvell Orion" 524 - depends on MMU 525 - select ARCH_REQUIRE_GPIOLIB 526 - select CPU_FEROCEON 527 - select GENERIC_CLOCKEVENTS 528 - select MVEBU_MBUS 529 - select MULTI_IRQ_HANDLER 530 - select PCI 531 - select PLAT_ORION_LEGACY 532 - select MULTI_IRQ_HANDLER 533 - select SPARSE_IRQ 534 - help 535 - Support for the following Marvell Orion 5x series SoCs: 536 - Orion-1 (5181), Orion-VoIP (5181L), Orion-NAS (5182), 537 - Orion-2 (5281), Orion-1-90 (6183). 538 - 539 522 config ARCH_MMP 540 523 bool "Marvell PXA168/910/MMP2" 541 524 depends on MMU
+3
arch/arm/configs/orion5x_defconfig
··· 13 13 # CONFIG_BLK_DEV_BSG is not set 14 14 CONFIG_PARTITION_ADVANCED=y 15 15 CONFIG_BSD_DISKLABEL=y 16 + CONFIG_ARCH_MULTI_V5=y 17 + # CONFIG_ARCH_MULTI_V6 is not set 18 + # CONFIG_ARCH_MULTI_V7 is not set 16 19 CONFIG_ARCH_ORION5X=y 17 20 CONFIG_ARCH_ORION5X_DT=y 18 21 CONFIG_MACH_DB88F5281=y
+14 -4
arch/arm/mach-orion5x/Kconfig
··· 1 - if ARCH_ORION5X 1 + menuconfig ARCH_ORION5X 2 + bool "Marvell Orion" 3 + depends on MMU && ARCH_MULTI_V5 4 + select ARCH_REQUIRE_GPIOLIB 5 + select CPU_FEROCEON 6 + select GENERIC_CLOCKEVENTS 7 + select MVEBU_MBUS 8 + select PCI 9 + select PLAT_ORION_LEGACY 10 + help 11 + Support for the following Marvell Orion 5x series SoCs: 12 + Orion-1 (5181), Orion-VoIP (5181L), Orion-NAS (5182), 13 + Orion-2 (5281), Orion-1-90 (6183). 2 14 3 - menu "Orion Implementations" 15 + if ARCH_ORION5X 4 16 5 17 config ARCH_ORION5X_DT 6 18 bool "Marvell Orion5x Flattened Device Tree" ··· 174 162 help 175 163 Say 'Y' here if you want your kernel to support the 176 164 Marvell Orion-1-90 (88F6183) AP GE RD. 177 - 178 - endmenu 179 165 180 166 endif
+2
arch/arm/mach-orion5x/Makefile
··· 1 + ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/arch/arm/plat-orion/include 2 + 1 3 obj-y += common.o pci.o irq.o mpp.o 2 4 obj-$(CONFIG_MACH_DB88F5281) += db88f5281-setup.o 3 5 obj-$(CONFIG_MACH_RD88F5182) += rd88f5182-setup.o
-46
arch/arm/mach-orion5x/include/mach/uncompress.h
··· 1 - /* 2 - * Tzachi Perelstein <tzachi@marvell.com> 3 - * 4 - * This file is licensed under the terms of the GNU General Public 5 - * License version 2. This program is licensed "as is" without any 6 - * warranty of any kind, whether express or implied. 7 - */ 8 - 9 - #include <linux/serial_reg.h> 10 - 11 - #define UART0_PHYS_BASE (0xf1000000 + 0x12000) 12 - #define SERIAL_BASE ((unsigned char *)UART0_PHYS_BASE) 13 - 14 - static void putc(const char c) 15 - { 16 - unsigned char *base = SERIAL_BASE; 17 - int i; 18 - 19 - for (i = 0; i < 0x1000; i++) { 20 - if (base[UART_LSR << 2] & UART_LSR_THRE) 21 - break; 22 - barrier(); 23 - } 24 - 25 - base[UART_TX << 2] = c; 26 - } 27 - 28 - static void flush(void) 29 - { 30 - unsigned char *base = SERIAL_BASE; 31 - unsigned char mask; 32 - int i; 33 - 34 - mask = UART_LSR_TEMT | UART_LSR_THRE; 35 - 36 - for (i = 0; i < 0x1000; i++) { 37 - if ((base[UART_LSR << 2] & mask) == mask) 38 - break; 39 - barrier(); 40 - } 41 - } 42 - 43 - /* 44 - * nothing to do 45 - */ 46 - #define arch_decomp_setup()