Merge branch 'twl4030-mfd' into for-2.6.33

diff --combined arch/arm/mach-omap2/board-3430sdp.c
index 87e69658be6fb9fa01218c556c9dad2a2c8a261a,9afd95783f3a28ba6a11bb305a1bae995d8ef5fd..08e535d92c0671657e1292c08f8204ceb21426d8
--- 1/arch/arm/mach-omap2/board-3430sdp.c
--- 2/arch/arm/mach-omap2/board-3430sdp.c
+++ b/arch/arm/mach-omap2/board-3430sdp.c
@@@ -17,7 -17,6 +17,7 @@@
  #include <linux/platform_device.h>
  #include <linux/delay.h>
  #include <linux/input.h>
 +#include <linux/input/matrix_keypad.h>
  #include <linux/spi/spi.h>
  #include <linux/spi/ads7846.h>
  #include <linux/i2c/twl4030.h>
@@@ -39,6 -38,7 +39,6 @@@
  #include <mach/gpmc.h>
  
  #include <mach/control.h>
 -#include <mach/keypad.h>
  #include <mach/gpmc-smc91x.h>
  
  #include "sdram-qimonda-hyb18m512160af-6.h"
@@@ -415,6 -415,7 +415,7 @@@ static struct twl4030_codec_audio_data 
  };
  
  static struct twl4030_codec_data sdp3430_codec = {
+       .audio_mclk = 26000000,
        .audio = &sdp3430_audio,
  };
  

diff --combined arch/arm/mach-omap2/board-omap3evm.c
index c0d97364dbd47d1eed7529480e765190d391aefe,5bb30cb7acc829f72fa8736696d17bf67f9e95c5..25ca5f6a0d3d6ef33c0637d4806bcd006191606a
--- 1/arch/arm/mach-omap2/board-omap3evm.c
--- 2/arch/arm/mach-omap2/board-omap3evm.c
+++ b/arch/arm/mach-omap2/board-omap3evm.c
@@@ -20,7 -20,6 +20,7 @@@
  #include <linux/clk.h>
  #include <linux/gpio.h>
  #include <linux/input.h>
 +#include <linux/input/matrix_keypad.h>
  #include <linux/leds.h>
  
  #include <linux/spi/spi.h>
@@@ -38,6 -37,7 +38,6 @@@
  #include <mach/usb.h>
  #include <mach/common.h>
  #include <mach/mcspi.h>
 -#include <mach/keypad.h>
  
  #include "sdram-micron-mt46h32m32lf-6.h"
  #include "mmc-twl4030.h"
@@@ -199,6 -199,7 +199,7 @@@ static struct twl4030_codec_audio_data 
  };
  
  static struct twl4030_codec_data omap3evm_codec_data = {
+       .audio_mclk = 26000000,
        .audio = &omap3evm_audio_data,
  };
  

diff --combined arch/arm/mach-omap2/board-omap3pandora.c
index 74f7574086397225e8b834871549be7fa287fdb3,77790ee4a5ea2e3062885b02fdfc4db311126e8e..ed97b54e1fa5266482bd2ae6818edb9492fafddd
--- 1/arch/arm/mach-omap2/board-omap3pandora.c
--- 2/arch/arm/mach-omap2/board-omap3pandora.c
+++ b/arch/arm/mach-omap2/board-omap3pandora.c
@@@ -27,7 -27,6 +27,7 @@@
  #include <linux/i2c/twl4030.h>
  #include <linux/leds.h>
  #include <linux/input.h>
 +#include <linux/input/matrix_keypad.h>
  #include <linux/gpio_keys.h>
  
  #include <asm/mach-types.h>
@@@ -40,6 -39,7 +40,6 @@@
  #include <mach/hardware.h>
  #include <mach/mcspi.h>
  #include <mach/usb.h>
 -#include <mach/keypad.h>
  #include <mach/mux.h>
  
  #include "sdram-micron-mt46h32m32lf-6.h"
@@@ -286,6 -286,7 +286,7 @@@ static struct twl4030_codec_audio_data 
  };
  
  static struct twl4030_codec_data omap3pandora_codec_data = {
+       .audio_mclk = 26000000,
        .audio = &omap3pandora_audio_data,
  };
  

diff --combined arch/arm/mach-omap2/board-zoom2.c
index e04a4f06ed9ac32b44255671ee8eb7ecdb0ed8b4,de3a38d271d81c3a091048c5fc1f81bb3a76980d..5fcb20f41a687350b8f631dd56fd8069cd775645
--- 1/arch/arm/mach-omap2/board-zoom2.c
--- 2/arch/arm/mach-omap2/board-zoom2.c
+++ b/arch/arm/mach-omap2/board-zoom2.c
@@@ -13,7 -13,6 +13,7 @@@
  #include <linux/init.h>
  #include <linux/platform_device.h>
  #include <linux/input.h>
 +#include <linux/input/matrix_keypad.h>
  #include <linux/gpio.h>
  #include <linux/i2c/twl4030.h>
  #include <linux/regulator/machine.h>
@@@ -23,9 -22,9 +23,9 @@@
  
  #include <mach/common.h>
  #include <mach/usb.h>
 -#include <mach/keypad.h>
  
  #include "mmc-twl4030.h"
 +#include "sdram-micron-mt46h32m32lf-6.h"
  
  /* Zoom2 has Qwerty keyboard*/
  static int board_keymap[] = {
@@@ -214,8 -213,7 +214,8 @@@ static void __init omap_zoom2_init_irq(
  {
        omap_board_config = zoom2_config;
        omap_board_config_size = ARRAY_SIZE(zoom2_config);
 -      omap2_init_common_hw(NULL, NULL);
 +      omap2_init_common_hw(mt46h32m32lf6_sdrc_params,
 +                               mt46h32m32lf6_sdrc_params);
        omap_init_irq();
        omap_gpio_init();
  }
@@@ -236,6 -234,7 +236,7 @@@ static struct twl4030_codec_audio_data 
  };
  
  static struct twl4030_codec_data zoom2_codec_data = {
+       .audio_mclk = 26000000,
        .audio = &zoom2_audio_data,
  };
  

diff --combined include/linux/i2c/twl4030.h
index ba61add3e05a38411eb94dd30fc40636bc866f72,c188961efbce882406ef50038143efe8330ed5af..5306a759cbdede6e70245440a5140f2df7821e03
--- 1/include/linux/i2c/twl4030.h
--- 2/include/linux/i2c/twl4030.h
+++ b/include/linux/i2c/twl4030.h
@@@ -349,11 -349,11 +349,11 @@@ struct twl4030_madc_platform_data 
        int             irq_line;
  };
  
 -/* Boards have uniqe mappings of {col, row} --> keycode.
 - * Column and row are 4 bits, but range only from 0..7.
 +/* Boards have uniqe mappings of {row, col} --> keycode.
 + * Column and row are 8 bits each, but range only from 0..7.
   * a PERSISTENT_KEY is "always on" and never reported.
   */
 -#define PERSISTENT_KEY(c, r)  KEY((c), (r), KEY_RESERVED)
 +#define PERSISTENT_KEY(r, c)  KEY((r), (c), KEY_RESERVED)
  
  struct twl4030_keypad_data {
        const struct matrix_keymap_data *keymap_data;
@@@ -414,6 -414,7 +414,7 @@@ struct twl4030_codec_vibra_data 
  };
  
  struct twl4030_codec_data {
+       unsigned int    audio_mclk;
        struct twl4030_codec_audio_data         *audio;
        struct twl4030_codec_vibra_data         *vibra;
  };