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

Commit 22673b71 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'integrator-for-v3.15-2' of... 

Merge tag 'integrator-for-v3.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator into next/cleanup2

Merge more Integrator multiplatform patches for v3.15 from Linus Walleij:

- Remove all dangling header files in <mach/*> from the global
  namespace and push them down into the mach-integrator folder.

- Decouple the Integrator from the plat-versatile sched_clock
  implementation.

* tag 'integrator-for-v3.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator

:
  ARM: integrator: register sched_clock directly
  ARM: integrator: localize the hardware.h header
  ARM: integrator: merge platform.h to hardware.h
  ARM: integrator: localize the impd1.h header
  ARM: integrator: localize the lm.h header

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents ba0e1fa9 a79528e9

arch/arm/mach-integrator/core.c

+1 −3
Original line number Diff line number Diff line
@@ -25,13 +25,11 @@ 
#include <linux/of.h>

#include <linux/of_address.h>



#include <mach/hardware.h>

#include <mach/platform.h>



#include <asm/mach-types.h>

#include <asm/mach/time.h>

#include <asm/pgtable.h>



#include "hardware.h"

#include "cm.h"

#include "common.h"

arch/arm/mach-integrator/include/mach/platform.h→arch/arm/mach-integrator/hardware.h

+41 −69
Original line number Diff line number Diff line 
/*

 *  This file contains the hardware definitions of the Integrator.

 *

 *  Copyright (C) 1998-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
@@ -13,26 +17,28 @@ 
 * along with this program; if not, write to the Free Software

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

 */

/**************************************************************************

 * * Copyright © ARM Limited 1998.  All rights reserved.

 * ***********************************************************************/

/* ************************************************************************

 *

 *   Integrator address map

 *

 * ***********************************************************************/

#ifndef INTEGRATOR_HARDWARE_H

#define INTEGRATOR_HARDWARE_H



#ifndef __address_h

#define __address_h                     1

/*

 * Where in virtual memory the IO devices (timers, system controllers

 * and so on)

 */

#define IO_BASE			0xF0000000                 // VA of IO

#define IO_SIZE			0x0B000000                 // How much?

#define IO_START		INTEGRATOR_HDR_BASE        // PA of IO



/* macro to get at IO space when running virtually */

#ifdef CONFIG_MMU

#define IO_ADDRESS(x)	(((x) & 0x000fffff) | (((x) >> 4) & 0x0ff00000) | IO_BASE)

#else

#define IO_ADDRESS(x)	(x)

#endif



/* ========================================================================

 *  Integrator definitions

 * ========================================================================

 * ------------------------------------------------------------------------

 *  Memory definitions

 * ------------------------------------------------------------------------

#define __io_address(n)		((void __iomem *)IO_ADDRESS(n))



/*

 *  Integrator memory map

 *

 */

#define INTEGRATOR_BOOT_ROM_LO          0x00000000

#define INTEGRATOR_BOOT_ROM_HI          0x20000000
@@ -61,7 +67,6 @@ 


/*

 *  SDRAM is a SIMM therefore the size is not known.

 *

 */

#define INTEGRATOR_SDRAM_BASE           0x00040000
@@ -81,10 +86,8 @@ 
#define INTEGRATOR_LOGIC_MODULE2_BASE   0xE0000000

#define INTEGRATOR_LOGIC_MODULE3_BASE   0xF0000000



/* ------------------------------------------------------------------------

/*

 * Integrator header card registers

 * ------------------------------------------------------------------------

 *

 */

#define INTEGRATOR_HDR_ID_OFFSET        0x00

#define INTEGRATOR_HDR_PROC_OFFSET      0x04
@@ -173,16 +176,12 @@ 


#define INTEGRATOR_HDR_SDRAM_SPD_OK     (1 << 5)





/* ------------------------------------------------------------------------

/*

 * Integrator system registers

 * ------------------------------------------------------------------------

 *

 */



/*

 *  System Controller

 *

 */

#define INTEGRATOR_SC_ID_OFFSET         0x00

#define INTEGRATOR_SC_OSC_OFFSET        0x04
@@ -223,7 +222,6 @@ 


/*

 *  External Bus Interface

 *

 */

#define INTEGRATOR_EBI_BASE             0x12000000
@@ -272,7 +270,6 @@ 


/*

 *  LED's & Switches

 *

 */

#define INTEGRATOR_DBG_ALPHA_OFFSET     0x00

#define INTEGRATOR_DBG_LEDS_OFFSET      0x04
@@ -292,21 +289,15 @@ 
#define INTEGRATOR_CP_SIC_BASE		0xCA000000	/* SIC */

#define INTEGRATOR_CP_CTL_BASE		0xCB000000	/* CP system control */



/* ------------------------------------------------------------------------

 *  KMI keyboard/mouse definitions

 * ------------------------------------------------------------------------

 */

/* PS2 Keyboard interface */

#define KMI0_BASE                       INTEGRATOR_KBD_BASE



/* PS2 Mouse interface */

#define KMI1_BASE                       INTEGRATOR_MOUSE_BASE



/* KMI definitions are now in include/asm-arm/hardware/amba_kmi.h -- rmk */



/* ------------------------------------------------------------------------

/*

 * Integrator Interrupt Controllers

 * ------------------------------------------------------------------------

 *

 *

 * Offsets from interrupt controller base

 *
@@ -317,7 +308,6 @@ 
 * Core Module interrupt controller base is

 *

 * 	INTEGRATOR_HDR_IC

 *

 */

#define IRQ_STATUS                      0

#define IRQ_RAW_STATUS                  0x04
@@ -335,25 +325,8 @@ 
#define FIQ_ENABLE_CLEAR                0x2C





/* ------------------------------------------------------------------------

 *  Interrupts

 * ------------------------------------------------------------------------

 *

 *

 *  Each Core Module has two interrupts controllers, one on the core module

 *  itself and one in the system controller on the motherboard.  The

 *  READ_INT macro in target.s reads both interrupt controllers and returns

 *  a 32 bit bitmask, bits 0 to 23 are interrupts from the system controller

 *  and bits 24 to 31 are from the core module.

 *

 *  The following definitions relate to the bitmask returned by READ_INT.

 *

 */



/* ------------------------------------------------------------------------

/*

 * LED's

 * ------------------------------------------------------------------------

 *

 */

#define GREEN_LED                       0x01

#define YELLOW_LED                      0x02
@@ -371,7 +344,6 @@ 
 *

 *  Timer 0 runs at bus frequency

 */



#define INTEGRATOR_TIMER0_BASE          INTEGRATOR_CT_BASE

#define INTEGRATOR_TIMER1_BASE          (INTEGRATOR_CT_BASE + 0x100)

#define INTEGRATOR_TIMER2_BASE          (INTEGRATOR_CT_BASE + 0x200)
@@ -379,4 +351,4 @@ 
#define INTEGRATOR_CSR_BASE             0x10000000

#define INTEGRATOR_CSR_SIZE             0x10000000



#endif
 
#endif /* INTEGRATOR_HARDWARE_H */

arch/arm/mach-integrator/impd1.c

+2 −2
Original line number Diff line number Diff line
@@ -25,9 +25,9 @@ 
#include <linux/slab.h>

#include <linux/irqchip/arm-vic.h>



#include <mach/lm.h>

#include <mach/impd1.h>

#include <asm/sizes.h>

#include "lm.h"

#include "impd1.h"



static int module_id;

arch/arm/mach-integrator/include/mach/impd1.h→arch/arm/mach-integrator/impd1.h

+0 −4
Original line number Diff line number Diff line 
#define IMPD1_OSC1	0x00

#define IMPD1_OSC2	0x04

#define IMPD1_LOCK	0x08

#define IMPD1_LEDS	0x0c

#define IMPD1_INT	0x10

#define IMPD1_SW	0x14
@@ -15,4 +12,3 @@ 
struct device;



void impd1_tweak_control(struct device *dev, u32 mask, u32 val);

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

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

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

 *

 *  This file contains the hardware definitions of the Integrator.

 *

 *  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

 */

#ifndef __ASM_ARCH_HARDWARE_H

#define __ASM_ARCH_HARDWARE_H



#include <asm/sizes.h>



/*

 * Where in virtual memory the IO devices (timers, system controllers

 * and so on)

 */

#define IO_BASE			0xF0000000                 // VA of IO 

#define IO_SIZE			0x0B000000                 // How much?

#define IO_START		INTEGRATOR_HDR_BASE        // PA of IO



/* macro to get at IO space when running virtually */

#ifdef CONFIG_MMU

#define IO_ADDRESS(x)	(((x) & 0x000fffff) | (((x) >> 4) & 0x0ff00000) | IO_BASE)

#else

#define IO_ADDRESS(x)	(x)

#endif



#define __io_address(n)		((void __iomem *)IO_ADDRESS(n))



#endif