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

Commit 69178178 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'integrator-multiplatform-for-arm-soc' of... 

Merge tag 'integrator-multiplatform-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator into next/soc

Merge "Integrator multiplatform migration for v3.19" from Linus Walleij:

Multiplatform migration of the Integrator.

* tag 'integrator-multiplatform-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator

:
  ARM: integrator: set V4T and V5 as default multitargets
  ARM: integrator: make the Integrator multiplatform

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 656b5def 9713497b

arch/arm/Kconfig

+0 −18
Original line number Diff line number Diff line
@@ -320,24 +320,6 @@ config ARCH_MULTIPLATFORM 
	select SPARSE_IRQ

	select USE_OF



config ARCH_INTEGRATOR

	bool "ARM Ltd. Integrator family"

	select ARM_AMBA

	select ARM_PATCH_PHYS_VIRT if MMU

	select AUTO_ZRELADDR

	select COMMON_CLK

	select COMMON_CLK_VERSATILE

	select GENERIC_CLOCKEVENTS

	select HAVE_TCM

	select ICST

	select MULTI_IRQ_HANDLER

	select PLAT_VERSATILE

	select SPARSE_IRQ

	select USE_OF

	select VERSATILE_FPGA_IRQ

	help

	  Support for ARM's Integrator platform.



config ARCH_REALVIEW

	bool "ARM Ltd. RealView family"

	select ARCH_WANT_OPTIONAL_GPIOLIB

arch/arm/configs/integrator_defconfig

+3 −0
Original line number Diff line number Diff line
@@ -8,6 +8,9 @@ CONFIG_BLK_DEV_INITRD=y 
CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

CONFIG_PARTITION_ADVANCED=y

CONFIG_ARCH_MULTI_V4T=y

CONFIG_ARCH_MULTI_V5=y

# CONFIG_ARCH_MULTI_V7 is not set

CONFIG_ARCH_INTEGRATOR=y

CONFIG_ARCH_INTEGRATOR_AP=y

CONFIG_ARCH_INTEGRATOR_CP=y

arch/arm/mach-integrator/Kconfig

+18 −0
Original line number Diff line number Diff line 
config ARCH_INTEGRATOR

	bool "ARM Ltd. Integrator family" if (ARCH_MULTI_V4T || ARCH_MULTI_V5 || ARCH_MULTI_V6)

	select ARM_AMBA

	select ARM_PATCH_PHYS_VIRT if MMU

	select AUTO_ZRELADDR

	select COMMON_CLK

	select COMMON_CLK_VERSATILE

	select GENERIC_CLOCKEVENTS

	select HAVE_TCM

	select ICST

	select MULTI_IRQ_HANDLER

	select PLAT_VERSATILE

	select SPARSE_IRQ

	select USE_OF

	select VERSATILE_FPGA_IRQ

	help

	  Support for ARM's Integrator platform.



if ARCH_INTEGRATOR



menu "Integrator Options"

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

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

 *  arch/arm/mach-integrator/include/mach/uncompress.h

 *

 *  Copyright (C) 1999 ARM Limited

 *

 * 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

 */



#define AMBA_UART_DR	(*(volatile unsigned char *)0x16000000)

#define AMBA_UART_LCRH	(*(volatile unsigned char *)0x16000008)

#define AMBA_UART_LCRM	(*(volatile unsigned char *)0x1600000c)

#define AMBA_UART_LCRL	(*(volatile unsigned char *)0x16000010)

#define AMBA_UART_CR	(*(volatile unsigned char *)0x16000014)

#define AMBA_UART_FR	(*(volatile unsigned char *)0x16000018)



/*

 * This does not append a newline

 */

static void putc(int c)

{

	while (AMBA_UART_FR & (1 << 5))

		barrier();



	AMBA_UART_DR = c;

}



static inline void flush(void)

{

	while (AMBA_UART_FR & (1 << 3))

		barrier();

}



/*

 * nothing to do

 */

#define arch_decomp_setup()