Commit 8715b29d authored Nov 27, 2009 by Dmitry Artamonow Committed by Russell King Dec 06, 2009

ARM: 5819/1: SA1100: h3100/h3600: merge h3600.h and h3600_gpio.h into h3xxx.h



Combine both headers into one, rename to h3xxx.h and change all
users accordingly.

Signed-off-by: Dmitry Artamonow <mad_soft@inbox.ru>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

parent 4c88a5c2

arch/arm/mach-sa1100/h3600.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -44,8 +44,7 @@
		#include <asm/mach/map.h>
		#include <asm/mach/serial_sa1100.h>

		#include <mach/h3600.h>
		#include <mach/h3600_gpio.h>
		#include <mach/h3xxx.h>

		#include "generic.h"

arch/arm/mach-sa1100/include/mach/h3600.h

deleted100644 → 0

+0 −36

Original line number	Diff line number	Diff line
		/*
		*
		* Definitions for H3600 Handheld Computer
		*
		* Copyright 2000 Compaq Computer Corporation.
		*
		* Use consistent with the GNU GPL is permitted,
		* provided that this copyright notice is
		* preserved in its entirety in all copies and derived works.
		*
		* COMPAQ COMPUTER CORPORATION MAKES NO WARRANTIES, EXPRESSED OR IMPLIED,
		* AS TO THE USEFULNESS OR CORRECTNESS OF THIS CODE OR ITS
		* FITNESS FOR ANY PARTICULAR PURPOSE.
		*
		* Author: Jamey Hicks.
		*
		* History:
		*
		* 2001-10-?? Andrew Christian Added support for iPAQ H3800
		*
		*/

		#ifndef _INCLUDE_H3600_H_
		#define _INCLUDE_H3600_H_

		/* Physical memory regions corresponding to chip selects */
		#define H3600_EGPIO_PHYS (SA1100_CS5_PHYS + 0x01000000)
		#define H3600_BANK_2_PHYS SA1100_CS2_PHYS
		#define H3600_BANK_4_PHYS SA1100_CS4_PHYS

		/* Virtual memory regions corresponding to chip selects 2 & 4 (used on sleeves) */
		#define H3600_EGPIO_VIRT 0xf0000000
		#define H3600_BANK_2_VIRT 0xf1000000
		#define H3600_BANK_4_VIRT 0xf3800000

		#endif /* _INCLUDE_H3600_H_ */

arch/arm/mach-sa1100/include/mach/h3600_gpio.h→arch/arm/mach-sa1100/include/mach/h3xxx.h

+13 −3

Original line number	Diff line number	Diff line
		@@ -20,8 +20,18 @@
		*
		*/

		#ifndef _INCLUDE_H3600_GPIO_H_
		#define _INCLUDE_H3600_GPIO_H_
		#ifndef _INCLUDE_H3XXX_H_
		#define _INCLUDE_H3XXX_H_

		/* Physical memory regions corresponding to chip selects */
		#define H3600_EGPIO_PHYS (SA1100_CS5_PHYS + 0x01000000)
		#define H3600_BANK_2_PHYS SA1100_CS2_PHYS
		#define H3600_BANK_4_PHYS SA1100_CS4_PHYS

		/* Virtual memory regions corresponding to chip selects 2 & 4 (used on sleeves) */
		#define H3600_EGPIO_VIRT 0xf0000000
		#define H3600_BANK_2_VIRT 0xf1000000
		#define H3600_BANK_4_VIRT 0xf3800000

		/*
		* gpiolib numbers for all iPAQs
		@@ -77,4 +87,4 @@
		#define H3600_EGPIO_LCD_5V_ON (H3XXX_EGPIO_BASE + 14) /* enable 5V to LCD. active high. */
		#define H3600_EGPIO_LVDD_ON (H3XXX_EGPIO_BASE + 15) /* enable 9V and -6.5V to LCD. */

		#endif /* _INCLUDE_H3600_GPIO_H_ */
		#endif /* _INCLUDE_H3XXX_H_ */

drivers/pcmcia/sa1100_h3600.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -15,8 +15,7 @@
		#include <mach/hardware.h>
		#include <asm/irq.h>
		#include <asm/mach-types.h>
		#include <mach/h3600.h>
		#include <mach/h3600_gpio.h>
		#include <mach/h3xxx.h>

		#include "sa1100_generic.h"