Merge remote-tracking branch 'pwm/for-next'

Conflicts:
	arch/arm/mach-omap2/board-zoom-peripherals.c

diff --combined arch/arm/mach-s3c64xx/mach-crag6410.c
index aca7d16e195dec0fda2989680cc58e73abb50315,51d0fcd161d5d139f26c718e976ad68301233cff..758e31b265501de472aa6eba453038385e102536
--- 1/arch/arm/mach-s3c64xx/mach-crag6410.c
--- 2/arch/arm/mach-s3c64xx/mach-crag6410.c
+++ b/arch/arm/mach-s3c64xx/mach-crag6410.c
@@@ -114,6 -114,7 +114,7 @@@ static struct platform_pwm_backlight_da
        .max_brightness = 1000,
        .dft_brightness = 600,
        .pwm_period_ns  = 100000,       /* about 1kHz */
+       .enable_gpio    = -1,
  };
  
  static struct platform_device crag6410_backlight_device = {
@@@ -310,6 -311,10 +311,6 @@@ static struct regulator_consumer_suppl
  
        REGULATOR_SUPPLY("SPKVDDL", "spi0.1"),
        REGULATOR_SUPPLY("SPKVDDR", "spi0.1"),
 -      REGULATOR_SUPPLY("SPKVDDL", "wm5102-codec"),
 -      REGULATOR_SUPPLY("SPKVDDR", "wm5102-codec"),
 -      REGULATOR_SUPPLY("SPKVDDL", "wm5110-codec"),
 -      REGULATOR_SUPPLY("SPKVDDR", "wm5110-codec"),
  
        REGULATOR_SUPPLY("DC1VDD", "0-0034"),
        REGULATOR_SUPPLY("DC2VDD", "0-0034"),
@@@ -649,6 -654,14 +650,6 @@@ static struct regulator_consumer_suppl
        REGULATOR_SUPPLY("DBVDD3", "spi0.1"),
        REGULATOR_SUPPLY("LDOVDD", "spi0.1"),
        REGULATOR_SUPPLY("CPVDD", "spi0.1"),
 -
 -      REGULATOR_SUPPLY("DBVDD2", "wm5102-codec"),
 -      REGULATOR_SUPPLY("DBVDD3", "wm5102-codec"),
 -      REGULATOR_SUPPLY("CPVDD", "wm5102-codec"),
 -
 -      REGULATOR_SUPPLY("DBVDD2", "wm5110-codec"),
 -      REGULATOR_SUPPLY("DBVDD3", "wm5110-codec"),
 -      REGULATOR_SUPPLY("CPVDD", "wm5110-codec"),
  };
  
  static struct regulator_init_data pvdd_1v8 = {
@@@ -731,7 -744,7 +732,7 @@@ static struct s3c2410_platform_i2c i2c1
  static void __init crag6410_map_io(void)
  {
        s3c64xx_init_io(NULL, 0);
 -      s3c24xx_init_clocks(12000000);
 +      s3c64xx_set_xtal_freq(12000000);
        s3c24xx_init_uarts(crag6410_uartcfgs, ARRAY_SIZE(crag6410_uartcfgs));
        samsung_set_timer_source(SAMSUNG_PWM3, SAMSUNG_PWM4);
  

diff --combined arch/arm/mach-s3c64xx/mach-hmt.c
index e8064044ef796d35a12bfcc0e06c86dea065dca1,7ce417da3103487e74ac4e048b320c360aeb09fd..614a03a92cf70545be3fd60bb66a29dc46b1fb6e
--- 1/arch/arm/mach-s3c64xx/mach-hmt.c
--- 2/arch/arm/mach-s3c64xx/mach-hmt.c
+++ b/arch/arm/mach-s3c64xx/mach-hmt.c
@@@ -114,6 -114,7 +114,7 @@@ static struct platform_pwm_backlight_da
        .max_brightness = 100 * 256,
        .dft_brightness = 40 * 256,
        .pwm_period_ns  = 1000000000 / (100 * 256 * 20),
+       .enable_gpio    = -1,
        .init           = hmt_bl_init,
        .notify         = hmt_bl_notify,
        .exit           = hmt_bl_exit,
@@@ -247,7 -248,7 +248,7 @@@ static struct platform_device *hmt_devi
  static void __init hmt_map_io(void)
  {
        s3c64xx_init_io(hmt_iodesc, ARRAY_SIZE(hmt_iodesc));
 -      s3c24xx_init_clocks(12000000);
 +      s3c64xx_set_xtal_freq(12000000);
        s3c24xx_init_uarts(hmt_uartcfgs, ARRAY_SIZE(hmt_uartcfgs));
        samsung_set_timer_source(SAMSUNG_PWM3, SAMSUNG_PWM4);
  }

diff --combined arch/arm/mach-s3c64xx/mach-smartq.c
index 0f47237be3b2dd2286fe0582791548d16df3a786,f3699a92d4381a5e63990dd41e6bd29928d5358a..a6b338fd0470d6b55f0601058f4dc5446cfc480c
--- 1/arch/arm/mach-s3c64xx/mach-smartq.c
--- 2/arch/arm/mach-s3c64xx/mach-smartq.c
+++ b/arch/arm/mach-s3c64xx/mach-smartq.c
@@@ -151,6 -151,7 +151,7 @@@ static struct platform_pwm_backlight_da
        .max_brightness = 1000,
        .dft_brightness = 600,
        .pwm_period_ns  = 1000000000 / (1000 * 20),
+       .enable_gpio    = -1,
        .init           = smartq_bl_init,
  };
  
@@@ -337,6 -338,13 +338,6 @@@ err
        return ret;
  }
  
 -static int __init smartq_usb_otg_init(void)
 -{
 -      clk_xusbxti.rate = 12000000;
 -
 -      return 0;
 -}
 -
  static int __init smartq_wifi_init(void)
  {
        int ret;
@@@ -370,8 -378,7 +371,8 @@@ static struct map_desc smartq_iodesc[] 
  void __init smartq_map_io(void)
  {
        s3c64xx_init_io(smartq_iodesc, ARRAY_SIZE(smartq_iodesc));
 -      s3c24xx_init_clocks(12000000);
 +      s3c64xx_set_xtal_freq(12000000);
 +      s3c64xx_set_xusbxti_freq(12000000);
        s3c24xx_init_uarts(smartq_uartcfgs, ARRAY_SIZE(smartq_uartcfgs));
        samsung_set_timer_source(SAMSUNG_PWM3, SAMSUNG_PWM4);
  
@@@ -393,6 -400,7 +394,6 @@@ void __init smartq_machine_init(void
        WARN_ON(smartq_lcd_setup_gpio());
        WARN_ON(smartq_power_off_init());
        WARN_ON(smartq_usb_host_init());
 -      WARN_ON(smartq_usb_otg_init());
        WARN_ON(smartq_wifi_init());
  
        platform_add_devices(smartq_devices, ARRAY_SIZE(smartq_devices));

diff --combined arch/arm/mach-s3c64xx/mach-smdk6410.c
index 2a7b32ca5c96a3037c007eeb032092cf2127bfec,0bf5b331ba5c767c98f2fd18a339b94882c5a5af..d5ea938cc9a1a03f7b6f884155de620a3fc0c3b3
--- 1/arch/arm/mach-s3c64xx/mach-smdk6410.c
--- 2/arch/arm/mach-s3c64xx/mach-smdk6410.c
+++ b/arch/arm/mach-s3c64xx/mach-smdk6410.c
@@@ -625,6 -625,7 +625,7 @@@ static struct samsung_bl_gpio_info smdk
  
  static struct platform_pwm_backlight_data smdk6410_bl_data = {
        .pwm_id = 1,
+       .enable_gpio = -1,
  };
  
  static struct s3c_hsotg_plat smdk6410_hsotg_pdata;
@@@ -634,7 -635,7 +635,7 @@@ static void __init smdk6410_map_io(void
        u32 tmp;
  
        s3c64xx_init_io(smdk6410_iodesc, ARRAY_SIZE(smdk6410_iodesc));
 -      s3c24xx_init_clocks(12000000);
 +      s3c64xx_set_xtal_freq(12000000);
        s3c24xx_init_uarts(smdk6410_uartcfgs, ARRAY_SIZE(smdk6410_uartcfgs));
        samsung_set_timer_source(SAMSUNG_PWM3, SAMSUNG_PWM4);
  

diff --combined arch/arm/mach-shmobile/board-armadillo800eva.c
index 8bc8e4c5884767f381c09da79ffcf2b52e2ffdc9,f68634a07c15051b038ddf89ff5e290b65dccbb0..958e3cbf0ac2f2110e7f4fc9ca41dc19e66e4ca8
--- 1/arch/arm/mach-shmobile/board-armadillo800eva.c
--- 2/arch/arm/mach-shmobile/board-armadillo800eva.c
+++ b/arch/arm/mach-shmobile/board-armadillo800eva.c
@@@ -423,6 -423,7 +423,7 @@@ static struct platform_pwm_backlight_da
        .max_brightness = 255,
        .dft_brightness = 255,
        .pwm_period_ns = 33333, /* 30kHz */
+       .enable_gpio = -1,
  };
  
  static struct platform_device pwm_backlight_device = {
@@@ -823,7 -824,6 +824,7 @@@ static struct sh_mmcif_plat_data sh_mmc
        .caps           = MMC_CAP_4_BIT_DATA |
                          MMC_CAP_8_BIT_DATA |
                          MMC_CAP_NONREMOVABLE,
 +      .ccs_unsupported = true,
        .slave_id_tx    = SHDMA_SLAVE_MMCIF_TX,
        .slave_id_rx    = SHDMA_SLAVE_MMCIF_RX,
  };
@@@ -1109,9 -1109,9 +1110,9 @@@ static const struct pinctrl_map eva_pin
        PIN_MAP_MUX_GROUP_DEFAULT("asoc-simple-card.1", "pfc-r8a7740",
                                  "fsib_mclk_in", "fsib"),
        /* GETHER */
 -      PIN_MAP_MUX_GROUP_DEFAULT("sh-eth", "pfc-r8a7740",
 +      PIN_MAP_MUX_GROUP_DEFAULT("r8a7740-gether", "pfc-r8a7740",
                                  "gether_mii", "gether"),
 -      PIN_MAP_MUX_GROUP_DEFAULT("sh-eth", "pfc-r8a7740",
 +      PIN_MAP_MUX_GROUP_DEFAULT("r8a7740-gether", "pfc-r8a7740",
                                  "gether_int", "gether"),
        /* HDMI */
        PIN_MAP_MUX_GROUP_DEFAULT("sh-mobile-hdmi", "pfc-r8a7740",

diff --combined drivers/misc/Kconfig
index e760715bd9cbd30c01c6c16da430c06931fb04c1,c43c66ad5721d084d0d0e0ed1f54320aa52adc13..a3e291d0df9a19211c7b3d855fc31ad3463524ff
--- 1/drivers/misc/Kconfig
--- 2/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@@ -381,19 -381,6 +381,6 @@@ config HMC635
          This driver provides support for the Honeywell HMC6352 compass,
          providing configuration and heading data via sysfs.
  
- config EP93XX_PWM
-       tristate "EP93xx PWM support"
-       depends on ARCH_EP93XX
-       help
-         This option enables device driver support for the PWM channels
-         on the Cirrus EP93xx processors.  The EP9307 chip only has one
-         PWM channel all the others have two, the second channel is an
-         alternate function of the EGPIO14 pin.  A sysfs interface is
-         provided to control the PWM channels.
- 
-         To compile this driver as a module, choose M here: the module will
-         be called ep93xx_pwm.
- 
  config DS1682
        tristate "Dallas DS1682 Total Elapsed Time Recorder with Alarm"
        depends on I2C
@@@ -537,5 -524,4 +524,5 @@@ source "drivers/misc/carma/Kconfig
  source "drivers/misc/altera-stapl/Kconfig"
  source "drivers/misc/mei/Kconfig"
  source "drivers/misc/vmw_vmci/Kconfig"
 +source "drivers/misc/mic/Kconfig"
  endmenu

diff --combined drivers/misc/Makefile
index 0b7ea3ea8bb86cc3971c7af15258c285100bd8e1,ecccd00393536f56fe4b593a5f3ba96ad088d0c9..f45473e68bf71d7ab65e40e06c9bf0a0484242e6
--- 1/drivers/misc/Makefile
--- 2/drivers/misc/Makefile
+++ b/drivers/misc/Makefile
@@@ -33,7 -33,6 +33,6 @@@ obj-$(CONFIG_APDS9802ALS)     += apds9802al
  obj-$(CONFIG_ISL29003)                += isl29003.o
  obj-$(CONFIG_ISL29020)                += isl29020.o
  obj-$(CONFIG_SENSORS_TSL2550) += tsl2550.o
- obj-$(CONFIG_EP93XX_PWM)      += ep93xx_pwm.o
  obj-$(CONFIG_DS1682)          += ds1682.o
  obj-$(CONFIG_TI_DAC7512)      += ti_dac7512.o
  obj-$(CONFIG_C2PORT)          += c2port/
@@@ -53,4 -52,3 +52,4 @@@ obj-$(CONFIG_INTEL_MEI)               += mei
  obj-$(CONFIG_VMWARE_VMCI)     += vmw_vmci/
  obj-$(CONFIG_LATTICE_ECP3_CONFIG)     += lattice-ecp3-config.o
  obj-$(CONFIG_SRAM)            += sram.o
 +obj-y                         += mic/