arch/arm/mach-sa1100/ : Fix, Clean, update jornada820 code * Still not buildable but getting there. * Cleanup the headers since we have a different structure nowadays. * TODO : We need to add the sa1101 relevant stuff since we wont get far without it.

4 files changed, 119 insertions, 5 deletions

diff --git a/arch/arm/mach-sa1100/Kconfig b/arch/arm/mach-sa1100/Kconfig
index 4b36463fe5fd0e..accd7903bda59f 100644
--- a/arch/arm/mach-sa1100/Kconfig
+++ b/arch/arm/mach-sa1100/Kconfig
@@ -118,6 +118,12 @@ config SA1100_JORNADA720_SSP
 	  keyboard, touchscreen, backlight and battery. This driver also activates
 	  the generic SSP which it extends.
 
+config SA1100_JORNADA820
+	bool "HP Jornada 820"
+	help
+	  Say Y here if you want to build an kernel for the
+	  HP Jornada 820 handheld computer.
+	  
 config SA1100_HACKKIT
 	bool "HackKit Core CPU Board"
 	help
diff --git a/arch/arm/mach-sa1100/Makefile b/arch/arm/mach-sa1100/Makefile
index 6471c75bf2120d..67a8a116a192e0 100644
--- a/arch/arm/mach-sa1100/Makefile
+++ b/arch/arm/mach-sa1100/Makefile
@@ -34,6 +34,8 @@ obj-$(CONFIG_SA1100_JORNADA720)		+= jornada720.o
 obj-$(CONFIG_SA1100_JORNADA720_SSP)	+= jornada720_ssp.o
 obj-$(CONFIG_SA1100_JORNADA720_APM)	+= jornada720_apm.o
 
+obj-$(CONFIG_SA1100_JORNADA820)		+= jornada820.o
+
 obj-$(CONFIG_SA1100_LART)		+= lart.o
 led-$(CONFIG_SA1100_LART)		+= leds-lart.o
 
diff --git a/arch/arm/mach-sa1100/include/mach/jornada820.h b/arch/arm/mach-sa1100/include/mach/jornada820.h
new file mode 100644
index 00000000000000..3b5b2c555cc2f3
--- /dev/null
+++ b/arch/arm/mach-sa1100/include/mach/jornada820.h
@@ -0,0 +1,103 @@
+/*
+ * linux/include/asm-arm/arch-sa1100/jornada820.h
+ *
+ * 2004/01/22 George Almasi (galmasi@optonline.net)
+ * Based on John Ankcorn's Jornada 720 file
+ *
+ * This file contains the hardware specific definitions for HP Jornada 820
+ * $Id: jornada820.h,v 1.3 2004/07/10 21:13:06 oleg820 Exp $
+ */
+
+#ifndef __ASM_ARCH_HARDWARE_H
+#error "include <asm/hardware.h> instead"
+#endif
+
+
+/*
+ *  The SA1101 on this machine - physical address
+ */
+
+#define SA1101_BASE			(0x18000000) 
+#define JORNADA820_SA1101_BASE		(0x18000000) 
+
+
+/* TODO: remove */
+#define SA1101_p2v( x )         ((x) - SA1101_BASE + 0xf4000000)
+#define SA1101_v2p( x )         ((x) - 0xf4000000  + SA1101_BASE)
+#ifndef Word
+#define Word unsigned
+#endif
+
+/*------------------------- SA1100 ----------------------*/
+/*
+ * The keyboard's GPIO and IRQ
+ */
+
+#define GPIO_JORNADA820_KEYBOARD		GPIO_GPIO(0)
+#define GPIO_JORNADA820_KEYBOARD_IRQ		IRQ_GPIO0
+
+/*
+ * UCB1200 GPIO and IRQ
+ */
+
+#define GPIO_JORNADA820_UCB1200			GPIO_GPIO(1)
+#define GPIO_JORNADA820_UCB1200_IRQ		IRQ_GPIO1
+
+/*
+ * The SA1101's chain interrupt.
+ */
+
+#define GPIO_JORNADA820_SA1101_CHAIN		GPIO_GPIO(14)
+#define GPIO_JORNADA820_SA1101_CHAIN_IRQ	IRQ_GPIO14
+
+/*
+ * SERIAL GPIO and IRQ
+ */
+
+#define GPIO_JORNADA820_SERIAL			GPIO_GPIO(15)
+#define GPIO_JORNADA820_SERIAL_IRQ		IRQ_GPIO15
+
+/*
+ * POWERD GPIO and IRQ
+ */
+
+#define GPIO_JORNADA820_POWERD			GPIO_GPIO(16)
+#define GPIO_JORNADA820_POWERD_IRQ		IRQ_GPIO16
+
+/*
+ * DTRDSR??? GPIO and IRQ
+ */
+
+#define GPIO_JORNADA820_DTRDSR			GPIO_GPIO(18)
+#define GPIO_JORNADA820_DTRDSR_IRQ		IRQ_GPIO18
+
+/*
+ * GPIO 20 is the reset for the LCD. Hold to 1 to reset LCD.
+ */
+
+#define GPIO_JORNADA820_LCDRESET		GPIO_GPIO(20)
+
+/*
+ * GPIO 23 is the backlight switch. Turn to 0.
+ */
+
+#define GPIO_JORNADA820_BACKLIGHTON     	GPIO_GPIO(23)
+
+/*
+ * LED GPIO
+ */
+#define GPIO_JORNADA820_LED			GPIO_GPIO(25)
+
+/*
+ * LEDBUTTON GPIO and IRQ
+ */
+#define GPIO_JORNADA820_LEDBUTTON		GPIO_GPIO(26)
+#define GPIO_JORNADA820_LEDBUTTON_IRQ		IRQ_GPIO26
+
+/*------------------------- SA1101 ----------------------*/
+/*
+ * DACDR1 and DACDR2 are the knobs for brightness and contrast
+ */
+
+#define DAC_JORNADA820_CONTRAST			DACDR1
+#define DAC_JORNADA820_BRIGHTNESS		DACDR2
diff --git a/arch/arm/mach-sa1100/jornada820.c b/arch/arm/mach-sa1100/jornada820.c
index 1e8a7a68a8bc70..f20e5317cb10d1 100644
--- a/arch/arm/mach-sa1100/jornada820.c
+++ b/arch/arm/mach-sa1100/jornada820.c
@@ -10,17 +10,20 @@
 #include <linux/init.h>
 #include <linux/mm.h>
 #include <linux/device.h>
+
 #include <asm/setup.h>
+#include <asm/irq.h>
+#include <asm/delay.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 #include <asm/mach/serial_sa1100.h>
-#include <asm/irq.h>
-#include <asm/hardware.h>
-#include <asm/hardware/sa1101.h>
 #include <asm/hardware/ssp.h>
-#include <asm/delay.h>
-#include "generic.h"
 
+#include <mach/hardware.h>
+#include <mach/jornada820.h>
+#include <mach/SA-1101.h>
+
+#include "generic.h"
 
 static struct resource sa1101_resources[] = {
 	[0] = {