Merge branch 'pxa-all' into devel

Conflicts:

	arch/arm/mach-pxa/Kconfig
	arch/arm/mach-pxa/corgi.c
	arch/arm/mach-pxa/include/mach/hardware.h
	arch/arm/mach-pxa/spitz.c

6 files changed, 222 insertions, 0 deletions

diff --git a/include/linux/lcd.h b/include/linux/lcd.h
index 173febac6656..c67fecafff90 100644
--- a/include/linux/lcd.h
+++ b/include/linux/lcd.h
@@ -11,6 +11,7 @@
 #include <linux/device.h>
 #include <linux/mutex.h>
 #include <linux/notifier.h>
+#include <linux/fb.h>
 
 /* Notes on locking:
  *
@@ -45,6 +46,8 @@ struct lcd_ops {
         int (*get_contrast)(struct lcd_device *);
         /* Set LCD panel contrast */
         int (*set_contrast)(struct lcd_device *, int contrast);
+        /* Set LCD panel mode (resolutions ...) */
+        int (*set_mode)(struct lcd_device *, struct fb_videomode *);
         /* Check if given framebuffer device is the one LCD is bound to;
            return 0 if not, !=0 if it is. If NULL, lcd always matches the fb. */
         int (*check_fb)(struct lcd_device *, struct fb_info *);
diff --git a/include/linux/smc91x.h b/include/linux/smc91x.h
index ed25483d25d9..bc21db598c06 100644
--- a/include/linux/smc91x.h
+++ b/include/linux/smc91x.h
@@ -16,6 +16,15 @@
 
 #define SMC91X_USE_DMA          (1 << 6)
 
+#define RPC_LED_100_10  (0x00)  /* LED = 100Mbps OR's with 10Mbps link detect */
+#define RPC_LED_RES     (0x01)  /* LED = Reserved */
+#define RPC_LED_10      (0x02)  /* LED = 10Mbps link detect */
+#define RPC_LED_FD      (0x03)  /* LED = Full Duplex Mode */
+#define RPC_LED_TX_RX   (0x04)  /* LED = TX or RX packet occurred */
+#define RPC_LED_100     (0x05)  /* LED = 100Mbps link dectect */
+#define RPC_LED_TX      (0x06)  /* LED = TX packet occurred */
+#define RPC_LED_RX      (0x07)  /* LED = RX packet occurred */
+
 struct smc91x_platdata {
         unsigned long flags;
         unsigned char leda;
diff --git a/include/linux/spi/ads7846.h b/include/linux/spi/ads7846.h
index daf744017a31..05eab2f11e63 100644
--- a/include/linux/spi/ads7846.h
+++ b/include/linux/spi/ads7846.h
@@ -43,6 +43,9 @@ struct ads7846_platform_data {
         u16     debounce_tol;           /* tolerance used for filtering */
         u16     debounce_rep;           /* additional consecutive good readings
                                          * required after the first two */
+        int     gpio_pendown;           /* the GPIO used to decide the pendown
+                                         * state if get_pendown_state == NULL
+                                         */
         int     (*get_pendown_state)(void);
         int     (*filter_init)  (struct ads7846_platform_data *pdata,
                                  void **filter_data);
diff --git a/include/linux/spi/corgi_lcd.h b/include/linux/spi/corgi_lcd.h
new file mode 100644
index 000000000000..6692b3418ccf
--- /dev/null
+++ b/include/linux/spi/corgi_lcd.h
@@ -0,0 +1,20 @@
+#ifndef __LINUX_SPI_CORGI_LCD_H
+#define __LINUX_SPI_CORGI_LCD_H
+
+#define CORGI_LCD_MODE_QVGA     1
+#define CORGI_LCD_MODE_VGA      2
+
+struct corgi_lcd_platform_data {
+        int     init_mode;
+        int     max_intensity;
+        int     default_intensity;
+        int     limit_mask;
+
+        int     gpio_backlight_on;      /* -1 if n/a */
+        int     gpio_backlight_cont;    /* -1 if n/a */
+
+        void (*notify)(int intensity);
+        void (*kick_battery)(void);
+};
+
+#endif /* __LINUX_SPI_CORGI_LCD_H */
diff --git a/include/linux/ucb1400.h b/include/linux/ucb1400.h
new file mode 100644
index 000000000000..970473bf8d5a
--- /dev/null
+++ b/include/linux/ucb1400.h
@@ -0,0 +1,161 @@
+/*
+ * Register definitions and functions for:
+ *  Philips UCB1400 driver
+ *
+ * Based on ucb1400_ts:
+ *  Author:     Nicolas Pitre
+ *  Created:    September 25, 2006
+ *  Copyright:  MontaVista Software, Inc.
+ *
+ * Spliting done by: Marek Vasut <marek.vasut@gmail.com>
+ * If something doesnt work and it worked before spliting, e-mail me,
+ * dont bother Nicolas please ;-)
+ *
+ * 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.
+ *
+ * This code is heavily based on ucb1x00-*.c copyrighted by Russell King
+ * covering the UCB1100, UCB1200 and UCB1300..  Support for the UCB1400 has
+ * been made separate from ucb1x00-core/ucb1x00-ts on Russell's request.
+ */
+
+#ifndef _LINUX__UCB1400_H
+#define _LINUX__UCB1400_H
+
+#include <sound/ac97_codec.h>
+#include <linux/mutex.h>
+#include <linux/platform_device.h>
+
+/*
+ * UCB1400 AC-link registers
+ */
+
+#define UCB_IO_DATA             0x5a
+#define UCB_IO_DIR              0x5c
+#define UCB_IE_RIS              0x5e
+#define UCB_IE_FAL              0x60
+#define UCB_IE_STATUS           0x62
+#define UCB_IE_CLEAR            0x62
+#define UCB_IE_ADC              (1 << 11)
+#define UCB_IE_TSPX             (1 << 12)
+
+#define UCB_TS_CR               0x64
+#define UCB_TS_CR_TSMX_POW      (1 << 0)
+#define UCB_TS_CR_TSPX_POW      (1 << 1)
+#define UCB_TS_CR_TSMY_POW      (1 << 2)
+#define UCB_TS_CR_TSPY_POW      (1 << 3)
+#define UCB_TS_CR_TSMX_GND      (1 << 4)
+#define UCB_TS_CR_TSPX_GND      (1 << 5)
+#define UCB_TS_CR_TSMY_GND      (1 << 6)
+#define UCB_TS_CR_TSPY_GND      (1 << 7)
+#define UCB_TS_CR_MODE_INT      (0 << 8)
+#define UCB_TS_CR_MODE_PRES     (1 << 8)
+#define UCB_TS_CR_MODE_POS      (2 << 8)
+#define UCB_TS_CR_BIAS_ENA      (1 << 11)
+#define UCB_TS_CR_TSPX_LOW      (1 << 12)
+#define UCB_TS_CR_TSMX_LOW      (1 << 13)
+
+#define UCB_ADC_CR              0x66
+#define UCB_ADC_SYNC_ENA        (1 << 0)
+#define UCB_ADC_VREFBYP_CON     (1 << 1)
+#define UCB_ADC_INP_TSPX        (0 << 2)
+#define UCB_ADC_INP_TSMX        (1 << 2)
+#define UCB_ADC_INP_TSPY        (2 << 2)
+#define UCB_ADC_INP_TSMY        (3 << 2)
+#define UCB_ADC_INP_AD0         (4 << 2)
+#define UCB_ADC_INP_AD1         (5 << 2)
+#define UCB_ADC_INP_AD2         (6 << 2)
+#define UCB_ADC_INP_AD3         (7 << 2)
+#define UCB_ADC_EXT_REF         (1 << 5)
+#define UCB_ADC_START           (1 << 7)
+#define UCB_ADC_ENA             (1 << 15)
+
+#define UCB_ADC_DATA            0x68
+#define UCB_ADC_DAT_VALID       (1 << 15)
+#define UCB_ADC_DAT_MASK        0x3ff
+
+#define UCB_ID                  0x7e
+#define UCB_ID_1400             0x4304
+
+struct ucb1400_ts {
+        struct input_dev        *ts_idev;
+        struct task_struct      *ts_task;
+        int                     id;
+        wait_queue_head_t       ts_wait;
+        unsigned int            ts_restart:1;
+        int                     irq;
+        unsigned int            irq_pending;    /* not bit field shared */
+        struct snd_ac97         *ac97;
+};
+
+struct ucb1400 {
+        struct platform_device  *ucb1400_ts;
+};
+
+static inline u16 ucb1400_reg_read(struct snd_ac97 *ac97, u16 reg)
+{
+        return ac97->bus->ops->read(ac97, reg);
+}
+
+static inline void ucb1400_reg_write(struct snd_ac97 *ac97, u16 reg, u16 val)
+{
+        ac97->bus->ops->write(ac97, reg, val);
+}
+
+static inline u16 ucb1400_gpio_get_value(struct snd_ac97 *ac97, u16 gpio)
+{
+        return ucb1400_reg_read(ac97, UCB_IO_DATA) & (1 << gpio);
+}
+
+static inline void ucb1400_gpio_set_value(struct snd_ac97 *ac97, u16 gpio,
+                                                u16 val)
+{
+        ucb1400_reg_write(ac97, UCB_IO_DATA, val ?
+                        ucb1400_reg_read(ac97, UCB_IO_DATA) | (1 << gpio) :
+                        ucb1400_reg_read(ac97, UCB_IO_DATA) & ~(1 << gpio));
+}
+
+static inline u16 ucb1400_gpio_get_direction(struct snd_ac97 *ac97, u16 gpio)
+{
+        return ucb1400_reg_read(ac97, UCB_IO_DIR) & (1 << gpio);
+}
+
+static inline void ucb1400_gpio_set_direction(struct snd_ac97 *ac97, u16 gpio,
+                                                u16 dir)
+{
+        ucb1400_reg_write(ac97, UCB_IO_DIR, dir ?
+                        ucb1400_reg_read(ac97, UCB_IO_DIR) | (1 << gpio) :
+                        ucb1400_reg_read(ac97, UCB_IO_DIR) & ~(1 << gpio));
+}
+
+static inline void ucb1400_adc_enable(struct snd_ac97 *ac97)
+{
+        ucb1400_reg_write(ac97, UCB_ADC_CR, UCB_ADC_ENA);
+}
+
+static unsigned int ucb1400_adc_read(struct snd_ac97 *ac97, u16 adc_channel,
+                                        int adcsync)
+{
+        unsigned int val;
+
+        if (adcsync)
+                adc_channel |= UCB_ADC_SYNC_ENA;
+
+        ucb1400_reg_write(ac97, UCB_ADC_CR, UCB_ADC_ENA | adc_channel);
+        ucb1400_reg_write(ac97, UCB_ADC_CR, UCB_ADC_ENA | adc_channel |
+                                UCB_ADC_START);
+
+        while (!((val = ucb1400_reg_read(ac97, UCB_ADC_DATA))
+                        & UCB_ADC_DAT_VALID))
+                schedule_timeout_uninterruptible(1);
+
+        return val & UCB_ADC_DAT_MASK;
+}
+
+static inline void ucb1400_adc_disable(struct snd_ac97 *ac97)
+{
+        ucb1400_reg_write(ac97, UCB_ADC_CR, 0);
+}
+
+#endif
diff --git a/include/linux/wm97xx_batt.h b/include/linux/wm97xx_batt.h
new file mode 100644
index 000000000000..9681d1ab0e4f
--- /dev/null
+++ b/include/linux/wm97xx_batt.h
@@ -0,0 +1,26 @@
+#ifndef _LINUX_WM97XX_BAT_H
+#define _LINUX_WM97XX_BAT_H
+
+#include <linux/wm97xx.h>
+
+struct wm97xx_batt_info {
+        int     batt_aux;
+        int     temp_aux;
+        int     charge_gpio;
+        int     min_voltage;
+        int     max_voltage;
+        int     batt_div;
+        int     batt_mult;
+        int     temp_div;
+        int     temp_mult;
+        int     batt_tech;
+        char    *batt_name;
+};
+
+#ifdef CONFIG_BATTERY_WM97XX
+void __init wm97xx_bat_set_pdata(struct wm97xx_batt_info *data);
+#else
+static inline void wm97xx_bat_set_pdata(struct wm97xx_batt_info *data) {}
+#endif
+
+#endif