Changes since April

Clean up of build directories.
Simplifications to capability model.

include/l4/platform/eb/irq.h

@@ -14,6 +14,10 @@
 #define IRQS_MAX		96
 #endif
 
+/* Range of IRQ numbers used by this platform */
+#define IRQ_RANGE_START         0
+#define IRQ_RANGE_END           IRQS_MAX
+
 /*
  * Interrupt Distribution:
  * 0-31: Used as SI provided by distributed interrupt controller
@@ -44,9 +48,14 @@
 #define EB_IRQ_AACI		(EB_GIC_IRQ_OFFSET + 19) /* Advanced Audio codec */
 #define EB_IRQ_KMI0		(EB_GIC_IRQ_OFFSET + 20) /* Keyboard */
 #define EB_IRQ_KMI1		(EB_GIC_IRQ_OFFSET + 21) /* Mouse */
-#define EB_IRQ_LCD		(EB_GIC_IRQ_OFFSET + 20) /* Character LCD */
 #define EB_IRQ_DMAC		(EB_GIC_IRQ_OFFSET + 20) /* DMA Controller */
 
+/*
+ * We have 3 IRQs for CLCD
+ * 23 - clcd display
+ * 30, 31 for touch screen pen interrupt
+ */
+#define EB_IRQ_CLCD		(EB_GIC_IRQ_OFFSET + 23)
 
 /* Interrupt Sources to ARM 11 MPCore or EB+A9 MPCore GIC */
 #define MPCORE_GIC_IRQ_AACI		(EB_GIC_IRQ_OFFSET + 0)
@@ -59,6 +68,7 @@
 #define MPCORE_GIC_IRQ_KMI0		(EB_GIC_IRQ_OFFSET + 7)
 #define MPCORE_GIC_IRQ_KMI1		(EB_GIC_IRQ_OFFSET + 8)
 #define MPCORE_GIC_IRQ_ETH		(EB_GIC_IRQ_OFFSET + 9)
+#define MPCORE_GIC_IRQ_CLCD             (EB_GIC_IRQ_OFFSET + 23)
 
 /* Interrupt from GIC1 on Base board */
 #define MPCORE_GIC_IRQ_EB_GIC1		(EB_GIC_IRQ_OFFSET + 10)
@@ -69,13 +79,15 @@
 #if defined (CONFIG_CPU_ARM11MPCORE) || defined (CONFIG_CPU_CORTEXA9)
 #define IRQ_TIMER0	MPCORE_GIC_IRQ_TIMER01
 #define IRQ_TIMER1	MPCORE_GIC_IRQ_TIMER23
-#define IRQ_KEYBOARD0   MPCORE_GIC_IRQ_TIMER01
+#define IRQ_KEYBOARD0   MPCORE_GIC_IRQ_KMI0
 #define IRQ_MOUSE0	MPCORE_GIC_IRQ_KMI1
+#define IRQ_CLCD0	MPCORE_GIC_IRQ_CLCD
 #else
 #define IRQ_TIMER0	EB_IRQ_TIMER01
 #define IRQ_TIMER1	EB_IRQ_TIMER23
 #define IRQ_KEYBOARD0	EB_IRQ_KMI0
 #define IRQ_MOUSE0	EB_IRQ_KMI1
+#define IRQ_CLCD0	EB_IRQ_CLCD
 #endif
 
 #endif /* __PLATFORM_IRQ_H__ */

include/l4/platform/eb/offsets.h

@@ -14,6 +14,7 @@
 #include <l4/platform/realview/offsets.h>
 
 /* Device offsets in physical memory */
+#define PLATFORM_CLCD0_BASE		0x10020000 /* CLCD0 */
 #define PLATFORM_GIC1_BASE		0x10040000 /* GIC 1 */
 #define PLATFORM_GIC2_BASE		0x10050000 /* GIC 2 */
 #define PLATFORM_GIC3_BASE		0x10060000 /* GIC 3 */

include/l4/platform/pb926/irq.h

@@ -52,4 +52,8 @@
 #define IRQ_KEYBOARD0           (SIC_IRQ_KEYBOARD + SIC_CHIP_OFFSET)
 #define IRQ_MOUSE0              (SIC_IRQ_MOUSE + SIC_CHIP_OFFSET)
 
+/* Range of IRQ numbers used by this platform */
+#define IRQ_RANGE_START         0
+#define IRQ_RANGE_END           63
+
 #endif /* __PLATFORM_IRQ_H__ */

include/l4/platform/pb926/offsets.h

@@ -31,7 +31,7 @@
 #define	PLATFORM_UART2_BASE			0x101F3000 /* Console port (UART2) */
 #define	PLATFORM_UART3_BASE			0x10009000 /* Console port (UART3) */
 #define	PLATFORM_CLCD0_BASE			0x10120000 /* Color LCD */
-
+#define PLATFORM_SYSREGS_SIZE			0x01000000 /* Portion allocated for sysregs */
 /*
  * Device offsets in virtual memory. They offset to some virtual
  * device base address. Each page on this virtual base is consecutively

include/l4/platform/pba9/irq.h

@@ -6,7 +6,6 @@
 #ifndef __PLATFORM_IRQ_H__
 #define __PLATFORM_IRQ_H__
 
-
 /* TODO: Not sure about this, need to check */
 #define IRQ_CHIPS_MAX		1
 #define IRQS_MAX		96
@@ -32,5 +31,9 @@
  * 75- 81: Test chip interrupts
  */
 
+/* Range of IRQ numbers used by this platform */
+#define IRQ_RANGE_START         0
+#define IRQ_RANGE_END           95
+
 #endif /* __PLATFORM_IRQ_H__ */
 

include/l4/platform/pba9/offsets.h

@@ -13,6 +13,9 @@
 
 #include <l4/platform/realview/offsets.h>
 
+#define PLATFORM_DEVICES1_START		0x40000000
+#define PLATFORM_DEVICES1_END		0x60000000
+
 /*
  * Device offsets in physical memory
  * Naming of devices done starting with 0 subscript,

include/l4/platform/pba9/platform.h

@@ -9,4 +9,13 @@
 
 #include <l4/platform/realview/platform.h>
 
+#define CLCD_SELECT_BOARD	0
+#define CLCD_SELECT_TILE	1
+
+void sri_set_mux(int offset);
+void clcd_clock_write(u32 freq, int clcd_select);
+u32 clcd_clock_read(int clcd_select);
+void clcd_init(void);
+void kmi_init(void);
+
 #endif /* __PBA9_PLATFORM_H__ */

include/l4/platform/realview/offsets.h

@@ -15,6 +15,9 @@
 #define	PLATFORM_PHYS_MEM_START			0x00000000 /* inclusive */
 #define	PLATFORM_PHYS_MEM_END			0x10000000 /* 256 MB, exclusive */
 
+#define PLATFORM_DEVICES_START			0x10000000 /* System registers */
+#define PLATFORM_DEVICES_END			0x20000000 /* System regs end */ 
+
 /*
  * Device offsets in physical memory
  * Naming of devices done starting with 0 subscript,