Merge branch 'for-rmk/samsung5' of git://git.fluff.org/bjdooks/linux into devel-stable

Conflicts:
	arch/arm/Kconfig
	arch/arm/Makefile

1 files changed, 31 insertions, 0 deletions

diff --git a/arch/arm/mach-s3c64xx/include/mach/regs-modem.h b/arch/arm/mach-s3c64xx/include/mach/regs-modem.h
new file mode 100644
index 00000000000..49f7759dedf
--- /dev/null
+++ b/arch/arm/mach-s3c64xx/include/mach/regs-modem.h
@@ -0,0 +1,31 @@
+/* arch/arm/plat-s3c64xx/include/plat/regs-modem.h
+ *
+ * Copyright 2008 Openmoko, Inc.
+ * Copyright 2008 Simtec Electronics
+ *      http://armlinux.simtec.co.uk/
+ *      Ben Dooks <ben@simtec.co.uk>
+ *
+ * S3C64XX - modem block registers
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+*/
+
+#ifndef __PLAT_S3C64XX_REGS_MODEM_H
+#define __PLAT_S3C64XX_REGS_MODEM_H __FILE__
+
+#define S3C64XX_MODEMREG(x)     (S3C64XX_VA_MODEM + (x))
+
+#define S3C64XX_MODEM_INT2AP                    S3C64XX_MODEMREG(0x0)
+#define S3C64XX_MODEM_INT2MODEM                 S3C64XX_MODEMREG(0x4)
+#define S3C64XX_MODEM_MIFCON                    S3C64XX_MODEMREG(0x8)
+#define S3C64XX_MODEM_MIFPCON                   S3C64XX_MODEMREG(0xC)
+#define S3C64XX_MODEM_INTCLR                    S3C64XX_MODEMREG(0x10)
+#define S3C64XX_MODEM_DMA_TXADDR                S3C64XX_MODEMREG(0x14)
+#define S3C64XX_MODEM_DMA_RXADDR                S3C64XX_MODEMREG(0x18)
+
+#define MIFPCON_INT2M_LEVEL                     (1 << 4)
+#define MIFPCON_LCD_BYPASS                      (1 << 3)
+
+#endif /* __PLAT_S3C64XX_REGS_MODEM_H */