Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 15bc1fe6 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

ARM: cns3xxx: enable multiplatform support 



This moves the cns3xxx configuration option inside of ARCH_MULTIPLATFORM,
since there is no reason for not doing it now. We can then also remove
the three header files that become obsolete.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 29c9b7be

arch/arm/Kconfig

+0 −12
Original line number Diff line number Diff line
@@ -382,18 +382,6 @@ config ARCH_BCM2835 
	  This enables support for the Broadcom BCM2835 SoC. This SoC is

	  use in the Raspberry Pi, and Roku 2 devices.



config ARCH_CNS3XXX

	bool "Cavium Networks CNS3XXX family"

	select ARM_GIC

	select CPU_V6K

	select GENERIC_CLOCKEVENTS

	select MIGHT_HAVE_CACHE_L2X0

	select MIGHT_HAVE_PCI

	select PCI_DOMAINS if PCI

	select SPARSE_IRQ

	help

	  Support for Cavium Networks CNS3XXX platform.



config ARCH_CLPS711X

	bool "Cirrus Logic CLPS711x/EP721x/EP731x-based"

	select ARCH_REQUIRE_GPIOLIB

arch/arm/configs/cns3420vb_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ CONFIG_MODULE_FORCE_UNLOAD=y 
CONFIG_MODVERSIONS=y

# CONFIG_BLK_DEV_BSG is not set

CONFIG_IOSCHED_CFQ=m

CONFIG_ARCH_MULTI_V6=y

#CONFIG_ARCH_MULTI_V7 is not set

CONFIG_ARCH_CNS3XXX=y

CONFIG_MACH_CNS3420VB=y

CONFIG_DEBUG_CNS3XXX=y

arch/arm/mach-cns3xxx/Kconfig

+11 −0
Original line number Diff line number Diff line 
config ARCH_CNS3XXX

	bool "Cavium Networks CNS3XXX family" if ARCH_MULTI_V6

	select ARM_GIC

	select CPU_V6K

	select GENERIC_CLOCKEVENTS

	select MIGHT_HAVE_CACHE_L2X0

	select MIGHT_HAVE_PCI

	select PCI_DOMAINS if PCI

	help

	  Support for Cavium Networks CNS3XXX platform.



menu "CNS3XXX platform type"

	depends on ARCH_CNS3XXX

arch/arm/mach-cns3xxx/include/mach/timex.h

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

 * Cavium Networks architecture timex specifications

 *

 * Copyright 2003 ARM Limited

 * Copyright 2008 Cavium Networks

 *

 * This file is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License, Version 2, as

 * published by the Free Software Foundation.

 */



#define CLOCK_TICK_RATE		(50000000 / 16)

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

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

 * Copyright 2003 ARM Limited

 * Copyright 2008 Cavium Networks

 *

 * This file is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License, Version 2, as

 * published by the Free Software Foundation.

 */



#include <asm/mach-types.h>

#include "cns3xxx.h"



#define AMBA_UART_DR(base)	(*(volatile unsigned char *)((base) + 0x00))

#define AMBA_UART_LCRH(base)	(*(volatile unsigned char *)((base) + 0x2c))

#define AMBA_UART_CR(base)	(*(volatile unsigned char *)((base) + 0x30))

#define AMBA_UART_FR(base)	(*(volatile unsigned char *)((base) + 0x18))



/*

 * Return the UART base address

 */

static inline unsigned long get_uart_base(void)

{

	if (machine_is_cns3420vb())

		return CNS3XXX_UART0_BASE;

	else

		return 0;

}



/*

 * This does not append a newline

 */

static inline void putc(int c)

{

	unsigned long base = get_uart_base();



	while (AMBA_UART_FR(base) & (1 << 5))

		barrier();



	AMBA_UART_DR(base) = c;

}



static inline void flush(void)

{

	unsigned long base = get_uart_base();



	while (AMBA_UART_FR(base) & (1 << 3))

		barrier();

}



/*

 * nothing to do

 */

#define arch_decomp_setup()