Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (236 commits)
  [ARM] 5300/1: fixup spitz reset during boot
  [ARM] 5295/1: make ZONE_DMA optional
  [ARM] 5239/1: Palm Zire 72 power management support
  [ARM] 5298/1: Drop desc_handle_irq()
  [ARM] 5297/1: [KS8695] Fix two compile-time warnings
  [ARM] 5296/1: [KS8695] Replace macro's with trailing underscores.
  [ARM] pxa: allow multi-machine PCMCIA builds
  [ARM] pxa: add preliminary CPUFREQ support for PXA3xx
  [ARM] pxa: add missing ACCR bit definitions to pxa3xx-regs.h
  [ARM] pxa: rename cpu-pxa.c to cpufreq-pxa2xx.c
  [ARM] pxa/zylonite: add support for USB OHCI
  [ARM] ohci-pxa27x: use ioremap() and offset for register access
  [ARM] ohci-pxa27x: introduce pxa27x_clear_otgph()
  [ARM] ohci-pxa27x: use platform_get_{irq,resource} for the resource
  [ARM] ohci-pxa27x: move OHCI controller specific registers into the driver
  [ARM] ohci-pxa27x: introduce flags to avoid direct access to OHCI registers
  [ARM] pxa: move I2S register and bit definitions into pxa2xx-i2s.c
  [ARM] pxa: simplify DMA register definitions
  [ARM] pxa: make additional DCSR bits valid for PXA3xx
  [ARM] pxa: move i2c register and bit definitions into i2c-pxa.c
  ...

Fixed up conflicts in
	arch/arm/mach-versatile/core.c
	sound/soc/pxa/pxa2xx-ac97.c
	sound/soc/pxa/pxa2xx-i2s.c
manually.

1 files changed, 67 insertions, 0 deletions

diff --git a/arch/arm/mach-pxa/include/mach/mioa701.h b/arch/arm/mach-pxa/include/mach/mioa701.h
new file mode 100644
index 00000000000..8483cb51183
--- /dev/null
+++ b/arch/arm/mach-pxa/include/mach/mioa701.h
@@ -0,0 +1,67 @@
+#ifndef _MIOA701_H_
+#define _MIOA701_H_
+
+#define MIO_CFG_IN(pin, af)             \
+        ((MFP_CFG_DEFAULT & ~(MFP_AF_MASK | MFP_DIR_MASK)) |\
+         (MFP_PIN(pin) | MFP_##af | MFP_DIR_IN))
+
+#define MIO_CFG_OUT(pin, af, state)     \
+        ((MFP_CFG_DEFAULT & ~(MFP_AF_MASK | MFP_DIR_MASK | MFP_LPM_STATE_MASK)) |\
+         (MFP_PIN(pin) | MFP_##af | MFP_DIR_OUT | MFP_LPM_##state))
+
+/* Global GPIOs */
+#define GPIO9_CHARGE_nEN                        9
+#define GPIO18_POWEROFF                         18
+#define GPIO87_LCD_POWER                        87
+
+/* USB */
+#define GPIO13_USB_DETECT                       13
+#define GPIO22_USB_ENABLE                       22
+
+/* SDIO bits */
+#define GPIO78_SDIO_RO                          78
+#define GPIO15_SDIO_INSERT                      15
+#define GPIO91_SDIO_EN                          91
+
+/* Bluetooth */
+#define GPIO83_BT_ON                            83
+
+/* GPS */
+#define GPIO23_GPS_UNKNOWN1                     23
+#define GPIO26_GPS_ON                           26
+#define GPIO27_GPS_RESET                        27
+#define GPIO106_GPS_UNKNOWN2                    106
+#define GPIO107_GPS_UNKNOWN3                    107
+
+/* GSM */
+#define GPIO24_GSM_MOD_RESET_CMD                24
+#define GPIO88_GSM_nMOD_ON_CMD                  88
+#define GPIO90_GSM_nMOD_OFF_CMD                 90
+#define GPIO114_GSM_nMOD_DTE_UART_STATE         114
+#define GPIO25_GSM_MOD_ON_STATE                 25
+#define GPIO113_GSM_EVENT                       113
+
+/* SOUND */
+#define GPIO12_HPJACK_INSERT                    12
+
+/* LEDS */
+#define GPIO10_LED_nCharging                    10
+#define GPIO97_LED_nBlue                        97
+#define GPIO98_LED_nOrange                      98
+#define GPIO82_LED_nVibra                       82
+#define GPIO115_LED_nKeyboard                   115
+
+/* Keyboard */
+#define GPIO0_KEY_POWER                         0
+#define GPIO93_KEY_VOLUME_UP                    93
+#define GPIO94_KEY_VOLUME_DOWN                  94
+
+extern struct input_dev *mioa701_evdev;
+extern void mioa701_gpio_lpm_set(unsigned long mfp_pin);
+
+/* Assembler externals mioa701_bootresume.S */
+extern u32 mioa701_bootstrap;
+extern u32 mioa701_jumpaddr;
+extern u32 mioa701_bootstrap_lg;
+
+#endif /* _MIOA701_H */