Commit 736d8301 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'gemini-multiplat-dt' of... 

Merge tag 'gemini-multiplat-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik into next/soc

This patchset:

- Converts the Gemini platform to device tree.
- Deletes all the board files.
- Fixes the prerequisities for a multiplatform boot and
  switches to multiplatform.

* tag 'gemini-multiplat-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik

:
  ARM: gemini: convert to ARMv4 multiplatform
  ARM: gemini: select ARM_PATCH_PHYS_VIRT and AUTO_ZRELADDR
  ARM: gemini: switch to sparse IRQs
  ARM: gemini: delete all boardfiles
  ARM: gemini: DT for the Cortina Gemini SoC platforms
  ARM: gemini: convert to MULTI_IRQ_HANDLER

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 4495c08e 6dbb708a

arch/arm/Kconfig

+0 −9
Original line number Original line Diff line number Diff line
@@ -359,15 +359,6 @@ config ARM_SINGLE_ARMV7M 
	select SPARSE_IRQ

	select SPARSE_IRQ

	select USE_OF

	select USE_OF





config ARCH_GEMINI

	bool "Cortina Systems Gemini"

	select CLKSRC_MMIO

	select CPU_FA526

	select GENERIC_CLOCKEVENTS

	select GPIOLIB

	help

	  Support for the Cortina Systems Gemini family SoCs



config ARCH_EBSA110

config ARCH_EBSA110

	bool "EBSA-110"

	bool "EBSA-110"

	select ARCH_USES_GETTIMEOFFSET

	select ARCH_USES_GETTIMEOFFSET

arch/arm/mach-gemini/Kconfig

+13 −40
Original line number Original line Diff line number Diff line 
if ARCH_GEMINI

menuconfig ARCH_GEMINI



	bool "Cortina Systems Gemini"

menu "Cortina Systems Gemini Implementations"

	depends on ARCH_MULTI_V4



	select ARM_APPENDED_DTB # Old Redboot bootloaders deployed

config MACH_NAS4220B

	select FARADAY_FTINTC010

	bool "Raidsonic NAS-4220-B"

	select FTTMR010_TIMER

	select GEMINI_MEM_SWAP

	select GPIO_GEMINI

	help

	select GPIOLIB

	  Say Y here if you intend to run this kernel on a

	select POWER_RESET

	  Raidsonic NAS-4220-B.

	select POWER_RESET_SYSCON



	select SERIAL_OF_PLATFORM

config MACH_RUT100

	help

	bool "Teltonika RUT100"

	  Support for the Cortina Systems Gemini family SoCs
 
	select GEMINI_MEM_SWAP

	help

	  Say Y here if you intend to run this kernel on a

	  Teltonika 3G Router RUT100.



config MACH_WBD111

	bool "Wiliboard WBD-111"

	select GEMINI_MEM_SWAP

	help

	  Say Y here if you intend to run this kernel on a

	  Wiliboard WBD-111.



config MACH_WBD222

        bool "Wiliboard WBD-222"

        select GEMINI_MEM_SWAP

        help

          Say Y here if you intend to run this kernel on a

          Wiliboard WBD-222.



endmenu



config GEMINI_MEM_SWAP

	bool "Gemini memory is swapped"

	help

	  Say Y here if Gemini memory is swapped by bootloader.



endif

arch/arm/mach-gemini/Makefile

+2 −13
Original line number Original line Diff line number Diff line 
#

# Makefile for Cortina systems Gemini

# Makefile for the linux kernel.

obj-y			:= board-dt.o
 
#



# Object file lists.



obj-y			:= irq.o mm.o time.o devices.o gpio.o idle.o reset.o



# Board-specific support

obj-$(CONFIG_MACH_NAS4220B)	+= board-nas4220b.o

obj-$(CONFIG_MACH_RUT100)	+= board-rut1xx.o

obj-$(CONFIG_MACH_WBD111)	+= board-wbd111.o

obj-$(CONFIG_MACH_WBD222)	+= board-wbd222.o

arch/arm/mach-gemini/Makefile.boot

deleted100644 → 0
+0 −9
Original line number Original line Diff line number Diff line 
ifeq ($(CONFIG_GEMINI_MEM_SWAP),y)

   zreladdr-y	+= 0x00008000

params_phys-y	:= 0x00000100

initrd_phys-y	:= 0x00800000

else

   zreladdr-y	+= 0x10008000

params_phys-y	:= 0x10000100

initrd_phys-y	:= 0x10800000

endif

arch/arm/mach-gemini/idle.c→arch/arm/mach-gemini/board-dt.c

+36 −5
Original line number Original line Diff line number Diff line 
/*

/*

 * arch/arm/mach-gemini/idle.c

 * Gemini Device Tree boot support

 */

 */



#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/init.h>

#include <linux/io.h>



#include <asm/mach/arch.h>

#include <asm/mach/map.h>

#include <asm/system_misc.h>

#include <asm/system_misc.h>

#include <asm/proc-fns.h>

#include <asm/proc-fns.h>





#ifdef CONFIG_DEBUG_GEMINI

/* This is needed for LL-debug/earlyprintk/debug-macro.S */

static struct map_desc gemini_io_desc[] __initdata = {

	{

		.virtual = CONFIG_DEBUG_UART_VIRT,

		.pfn = __phys_to_pfn(CONFIG_DEBUG_UART_PHYS),

		.length = SZ_4K,

		.type = MT_DEVICE,

	},

};



static void __init gemini_map_io(void)

{

	iotable_init(gemini_io_desc, ARRAY_SIZE(gemini_io_desc));

}

#else

#define gemini_map_io NULL

#endif



static void gemini_idle(void)

static void gemini_idle(void)

{

{

	/*

	/*
@@ -22,10 +45,18 @@ static void gemini_idle(void) 
	cpu_do_idle();

	cpu_do_idle();

}

}





static int __init gemini_idle_init(void)

static void __init gemini_init_machine(void)

{

{

	arm_pm_idle = gemini_idle;

	arm_pm_idle = gemini_idle;

	return 0;

}

}





arch_initcall(gemini_idle_init);
 
static const char *gemini_board_compat[] = {

	"cortina,gemini",

	NULL,

};



DT_MACHINE_START(GEMINI_DT, "Gemini (Device Tree)")

	.map_io		= gemini_map_io,

	.init_machine	= gemini_init_machine,

	.dt_compat	= gemini_board_compat,

MACHINE_END