Merge master.kernel.org:/home/rmk/linux-2.6-arm

* master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] 5446/1: ohci-at91: Limit vbus_pin assignment to the size of the array
  [ARM] 5445/1: AT91: Remove flexible array from USBH platform data
  [ARM] 5447/1: Add SZ_32K
  [ARM] omap: fix omap1 clock usecount decrement bug
  [ARM] pxa: register AC97 controller devices
  [ARM] pxa/csb701: do not register devices on non-csb726 boads
  [ARM] pxa/colibri: get rid of set_irq_type()
  [ARM] pxa/colibri: provide MAC address from ATAG_SERIAL
  [ARM] pxa/cm-x2xx: fix ucb1400 not being registered
  [ARM] pxa: Add support for suspend on PalmTX, T5 and LD
  [ARM] pxa: PalmTE2 support for battery, UDC, IrDA and backlight
  [ARM] pxa: Palm Tungsten E2 basic support
  [ARM] pxa/em-x270: add libertas device registration
  [ARM] pxa/magician: Enable bq24022 regulator for gpio_vbus and pda_power

6 files changed, 81 insertions, 2 deletions

diff --git a/arch/arm/mach-pxa/include/mach/colibri.h b/arch/arm/mach-pxa/include/mach/colibri.h
index 3f2a01d6a03c..90230c6f9925 100644
--- a/arch/arm/mach-pxa/include/mach/colibri.h
+++ b/arch/arm/mach-pxa/include/mach/colibri.h
@@ -1,5 +1,8 @@
 #ifndef _COLIBRI_H_
 #define _COLIBRI_H_
+
+#include <net/ax88796.h>
+
 /*
  * common settings for all modules
  */
@@ -16,6 +19,10 @@ extern void colibri_pxa3xx_init_lcd(int bl_pin);
 static inline void colibri_pxa3xx_init_lcd(int) {}
 #endif
 
+#if defined(CONFIG_AX88796)
+extern void colibri_pxa3xx_init_eth(struct ax_plat_data *plat_data);
+#endif
+
 /* physical memory regions */
 #define COLIBRI_SDRAM_BASE      0xa0000000      /* SDRAM region */
 
diff --git a/arch/arm/mach-pxa/include/mach/magician.h b/arch/arm/mach-pxa/include/mach/magician.h
index 82a399f3f9f2..20ef37d4a9a7 100644
--- a/arch/arm/mach-pxa/include/mach/magician.h
+++ b/arch/arm/mach-pxa/include/mach/magician.h
@@ -27,7 +27,7 @@
 #define GPIO22_MAGICIAN_VIBRA_EN                22
 #define GPIO26_MAGICIAN_GSM_POWER               26
 #define GPIO27_MAGICIAN_USBC_PUEN               27
-#define GPIO30_MAGICIAN_nCHARGE_EN              30
+#define GPIO30_MAGICIAN_BQ24022_nCHARGE_EN      30
 #define GPIO37_MAGICIAN_KEY_HANGUP              37
 #define GPIO38_MAGICIAN_KEY_CONTACTS            38
 #define GPIO40_MAGICIAN_GSM_OUT2                40
@@ -98,7 +98,7 @@
 #define EGPIO_MAGICIAN_UNKNOWN_WAVEDEV_DLL      MAGICIAN_EGPIO(2, 2)
 #define EGPIO_MAGICIAN_FLASH_VPP                MAGICIAN_EGPIO(2, 3)
 #define EGPIO_MAGICIAN_BL_POWER2                MAGICIAN_EGPIO(2, 4)
-#define EGPIO_MAGICIAN_CHARGE_EN                MAGICIAN_EGPIO(2, 5)
+#define EGPIO_MAGICIAN_BQ24022_ISET2            MAGICIAN_EGPIO(2, 5)
 #define EGPIO_MAGICIAN_GSM_POWER                MAGICIAN_EGPIO(2, 7)
 
 /* input */
diff --git a/arch/arm/mach-pxa/include/mach/palmld.h b/arch/arm/mach-pxa/include/mach/palmld.h
index 7c295a48d784..fb13c82ad6dc 100644
--- a/arch/arm/mach-pxa/include/mach/palmld.h
+++ b/arch/arm/mach-pxa/include/mach/palmld.h
@@ -87,6 +87,7 @@
 #define PALMLD_IDE_SIZE         0x00100000
 
 #define PALMLD_PHYS_IO_START    0x40000000
+#define PALMLD_STR_BASE         0xa0200000
 
 /* BATTERY */
 #define PALMLD_BAT_MAX_VOLTAGE          4000    /* 4.00V maximum voltage */
diff --git a/arch/arm/mach-pxa/include/mach/palmt5.h b/arch/arm/mach-pxa/include/mach/palmt5.h
index 94db2881f048..052bfe788ada 100644
--- a/arch/arm/mach-pxa/include/mach/palmt5.h
+++ b/arch/arm/mach-pxa/include/mach/palmt5.h
@@ -59,6 +59,7 @@
 /* Various addresses  */
 #define PALMT5_PHYS_RAM_START   0xa0000000
 #define PALMT5_PHYS_IO_START    0x40000000
+#define PALMT5_STR_BASE         0xa0200000
 
 /* TOUCHSCREEN */
 #define AC97_LINK_FRAME         21
diff --git a/arch/arm/mach-pxa/include/mach/palmte2.h b/arch/arm/mach-pxa/include/mach/palmte2.h
new file mode 100644
index 000000000000..12361341f9d8
--- /dev/null
+++ b/arch/arm/mach-pxa/include/mach/palmte2.h
@@ -0,0 +1,68 @@
+/*
+ * GPIOs and interrupts for Palm Tungsten|E2 Handheld Computer
+ *
+ * Author:
+ *              Carlos Eduardo Medaglia Dyonisio <cadu@nerdfeliz.com>
+ *
+ * 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 _INCLUDE_PALMTE2_H_
+#define _INCLUDE_PALMTE2_H_
+
+/** HERE ARE GPIOs **/
+
+/* GPIOs */
+#define GPIO_NR_PALMTE2_POWER_DETECT            9
+#define GPIO_NR_PALMTE2_HOTSYNC_BUTTON_N        4
+#define GPIO_NR_PALMTE2_EARPHONE_DETECT         15
+
+/* SD/MMC */
+#define GPIO_NR_PALMTE2_SD_DETECT_N             10
+#define GPIO_NR_PALMTE2_SD_POWER                55
+#define GPIO_NR_PALMTE2_SD_READONLY             51
+
+/* IRDA -  disable GPIO connected to SD pin of tranceiver (TFBS4710?) ? */
+#define GPIO_NR_PALMTE2_IR_DISABLE              48
+
+/* USB */
+#define GPIO_NR_PALMTE2_USB_DETECT_N            35
+#define GPIO_NR_PALMTE2_USB_PULLUP              53
+
+/* LCD/BACKLIGHT */
+#define GPIO_NR_PALMTE2_BL_POWER                56
+#define GPIO_NR_PALMTE2_LCD_POWER               37
+
+/* KEYS */
+#define GPIO_NR_PALMTE2_KEY_NOTES       5
+#define GPIO_NR_PALMTE2_KEY_TASKS       7
+#define GPIO_NR_PALMTE2_KEY_CALENDAR    11
+#define GPIO_NR_PALMTE2_KEY_CONTACTS    13
+#define GPIO_NR_PALMTE2_KEY_CENTER      14
+#define GPIO_NR_PALMTE2_KEY_LEFT        19
+#define GPIO_NR_PALMTE2_KEY_RIGHT       20
+#define GPIO_NR_PALMTE2_KEY_DOWN        21
+#define GPIO_NR_PALMTE2_KEY_UP          22
+
+/** HERE ARE INIT VALUES **/
+
+/* BACKLIGHT */
+#define PALMTE2_MAX_INTENSITY           0xFE
+#define PALMTE2_DEFAULT_INTENSITY       0x7E
+#define PALMTE2_LIMIT_MASK              0x7F
+#define PALMTE2_PRESCALER               0x3F
+#define PALMTE2_PERIOD_NS               3500
+
+/* BATTERY */
+#define PALMTE2_BAT_MAX_VOLTAGE         4000    /* 4.00v current voltage */
+#define PALMTE2_BAT_MIN_VOLTAGE         3550    /* 3.55v critical voltage */
+#define PALMTE2_BAT_MAX_CURRENT         0       /* unknokn */
+#define PALMTE2_BAT_MIN_CURRENT         0       /* unknown */
+#define PALMTE2_BAT_MAX_CHARGE          1       /* unknown */
+#define PALMTE2_BAT_MIN_CHARGE          1       /* unknown */
+#define PALMTE2_MAX_LIFE_MINS           360     /* on-life in minutes */
+
+#endif
diff --git a/arch/arm/mach-pxa/include/mach/palmtx.h b/arch/arm/mach-pxa/include/mach/palmtx.h
index 1e8bccbda510..9f7d62fb4cbb 100644
--- a/arch/arm/mach-pxa/include/mach/palmtx.h
+++ b/arch/arm/mach-pxa/include/mach/palmtx.h
@@ -78,6 +78,8 @@
 #define PALMTX_PHYS_RAM_START   0xa0000000
 #define PALMTX_PHYS_IO_START    0x40000000
 
+#define PALMTX_STR_BASE         0xa0200000
+
 #define PALMTX_PHYS_FLASH_START PXA_CS0_PHYS    /* ChipSelect 0 */
 #define PALMTX_PHYS_NAND_START  PXA_CS1_PHYS    /* ChipSelect 1 */