Commit 09f6b27d authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

ARM: dove: multiplatform support 



The dove 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.

This work was originally done in 2015 as all the ARMv7 machiens
gove moved over to multiplatform builds, but at the time it conflicted
with some patches that Russell was trying to upstream, so we
left it at that.

I hope that there is no longer a need to keep dove separate from the
rest, so we can either add it to the other ARMv7 platforms, or just
replace it with the DT based platform code for the same hardware
in mach-mvebu and remove mach-dove entirely.

Acked-by: default avatarAndrew Lunn <andrew@lunn.ch>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Cc: Gregory Clement <gregory.clement@bootlin.com>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 0361c7e5

arch/arm/Kconfig

+0 −14
Original line number Diff line number Diff line
@@ -383,20 +383,6 @@ config ARCH_IXP4XX 
	help

	  Support for Intel's IXP4XX (XScale) family of processors.



config ARCH_DOVE

	bool "Marvell Dove"

	select CPU_PJ4

	select GPIOLIB

	select HAVE_PCI

	select MVEBU_MBUS

	select PINCTRL

	select PINCTRL_DOVE

	select PLAT_ORION_LEGACY

	select SPARSE_IRQ

	select PM_GENERIC_DOMAINS if PM

	help

	  Support for the Marvell Dove SoC 88AP510



config ARCH_PXA

	bool "PXA2xx/PXA3xx-based"

	select ARCH_MTD_XIP

arch/arm/configs/dove_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -8,6 +8,8 @@ CONFIG_MODULES=y 
CONFIG_MODULE_UNLOAD=y

# CONFIG_BLK_DEV_BSG is not set

CONFIG_PARTITION_ADVANCED=y

# CONFIG_ARCH_MULTI_V6 is not set

CONFIG_ARCH_MULTI_V7=y

CONFIG_ARCH_DOVE=y

CONFIG_MACH_DOVE_DB=y

CONFIG_MACH_CM_A510=y

arch/arm/mach-dove/Kconfig

+12 −4
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

if ARCH_DOVE

menuconfig ARCH_DOVE

	bool "Marvell Dove" if ARCH_MULTI_V7

	select CPU_PJ4

	select GPIOLIB

	select MVEBU_MBUS

	select PINCTRL

	select PINCTRL_DOVE

	select PLAT_ORION_LEGACY

	select PM_GENERIC_DOMAINS if PM

	help

	  Support for the Marvell Dove SoC 88AP510



menu "Marvell Dove Implementations"

if ARCH_DOVE



config DOVE_LEGACY

	bool
@@ -21,6 +31,4 @@ config MACH_CM_A510 
	  Say 'Y' here if you want your kernel to support the

	  CompuLab CM-A510 Board.



endmenu



endif

arch/arm/mach-dove/Makefile

+2 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/arch/arm/plat-orion/include



obj-y				+= common.o

obj-$(CONFIG_DOVE_LEGACY)	+= irq.o mpp.o

obj-$(CONFIG_PCI)		+= pcie.o

arch/arm/mach-dove/include/mach/uncompress.h

deleted100644 → 0
+0 −34
Original line number Diff line number Diff line 
/*

 * 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.

 */



#define UART0_PHYS_BASE (0xf1000000 + 0x12000)



#define UART_THR ((volatile unsigned char *)(UART0_PHYS_BASE + 0x0))

#define UART_LSR ((volatile unsigned char *)(UART0_PHYS_BASE + 0x14))



#define LSR_THRE	0x20



static inline void putc(const char c)

{

	int i;



	for (i = 0; i < 0x1000; i++) {

		/* Transmit fifo not full? */

		if (*UART_LSR & LSR_THRE)

			break;

	}



	*UART_THR = c;

}



static inline void flush(void)

{

}



/*

 * nothing to do

 */

#define arch_decomp_setup()