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

Commit 7f01e5a7 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Linus Walleij
Browse files

ARM: ux500: move to multiplatform 



Nothing is holding us up any more, and we can make ux500 coexist
with the rest of the platforms. The timex.h and uncompress.h
headers are no longer needed now.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent e657bcf6

arch/arm/Kconfig

+0 −15
Original line number Diff line number Diff line
@@ -900,21 +900,6 @@ config ARCH_U300 
	help

	  Support for ST-Ericsson U300 series mobile platforms.



config ARCH_U8500

	bool "ST-Ericsson U8500 Series"

	depends on MMU

	select ARCH_HAS_CPUFREQ

	select ARCH_REQUIRE_GPIOLIB

	select ARM_AMBA

	select CLKDEV_LOOKUP

	select CPU_V7

	select GENERIC_CLOCKEVENTS

	select HAVE_SMP

	select MIGHT_HAVE_CACHE_L2X0

	select SPARSE_IRQ

	help

	  Support for ST-Ericsson's Ux500 architecture



config ARCH_NOMADIK

	bool "STMicroelectronics Nomadik"

	select ARCH_REQUIRE_GPIOLIB

arch/arm/mach-ux500/Kconfig

+14 −0
Original line number Diff line number Diff line 
config ARCH_U8500

	bool "ST-Ericsson U8500 Series" if ARCH_MULTI_V7

	depends on MMU

	select ARCH_HAS_CPUFREQ

	select ARCH_REQUIRE_GPIOLIB

	select ARM_AMBA

	select CLKDEV_LOOKUP

	select CPU_V7

	select GENERIC_CLOCKEVENTS

	select HAVE_SMP

	select MIGHT_HAVE_CACHE_L2X0

	help

	  Support for ST-Ericsson's Ux500 architecture



if ARCH_U8500



config UX500_SOC_COMMON

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

deleted100644 → 0
+0 −6
Original line number Diff line number Diff line 
#ifndef __ASM_ARCH_TIMEX_H

#define __ASM_ARCH_TIMEX_H



#define CLOCK_TICK_RATE		110000000



#endif

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

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

 *  Copyright (C) 2009 ST-Ericsson

 *

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

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; either version 2 of the License, or

 * (at your option) any later version.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, write to the Free Software

 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

 */

#ifndef __ASM_ARCH_UNCOMPRESS_H

#define __ASM_ARCH_UNCOMPRESS_H



#include <asm/setup.h>

#include <asm/mach-types.h>

#include <linux/io.h>

#include <linux/amba/serial.h>

/* TODO: This goes away in multiplatform boot, this file gets deleted */

#include "../../db8500-regs.h"



void __iomem *ux500_uart_base;



static void putc(const char c)

{

	/* Do nothing if the UART is not enabled. */

	if (!(__raw_readb(ux500_uart_base + UART011_CR) & 0x1))

		return;



	if (c == '\n')

		putc('\r');



	while (__raw_readb(ux500_uart_base + UART01x_FR) & (1 << 5))

		barrier();

	__raw_writeb(c, ux500_uart_base + UART01x_DR);

}



static void flush(void)

{

	if (!(__raw_readb(ux500_uart_base + UART011_CR) & 0x1))

		return;

	while (__raw_readb(ux500_uart_base + UART01x_FR) & (1 << 3))

		barrier();

}



static inline void arch_decomp_setup(void)

{

	/* Use machine_is_foo() macro if you need to switch base someday */

	ux500_uart_base = (void __iomem *)U8500_UART2_BASE;

}



#endif /* __ASM_ARCH_UNCOMPRESS_H */