Merge branch 'next/board-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git...

From Kukjin Kim:

This is for updating non-DT Samsung board files for v3.7, there are adding
generic PWM lookup support and some updates.

* 'next/board-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: EXYNOS: Add generic PWM lookup support for SMDKV310
  ARM: EXYNOS: Add generic PWM lookup support for SMDK4X12
  ARM: EXYNOS: Use generic pwm driver in Origen board
  ARM: dts: Add heartbeat gpio-leds support to Origen
  ARM: dts: Use active low flag for gpio-keys on Origen
  ARM: S3C64XX: Register audio platform devices for Bells on Cragganmore
  ARM: S3C64XX: Update configuration for WM5102 module on Cragganmore

Fixed trivial merge conflict in arch/arm/mach-exynos/mach-smdkv310.c.

Signed-off-by: Olof Johansson <olof@lixom.net>

diff --combined arch/arm/mach-exynos/mach-origen.c
index 4e574c24581ca2869fa37f96d487879ffe0c016a,2203664fb0c45b1ac84993674369ea53cbebab1a..b45600fcf73e94ab23127133fa3c8e9dd253382b
--- 1/arch/arm/mach-exynos/mach-origen.c
--- 2/arch/arm/mach-exynos/mach-origen.c
+++ b/arch/arm/mach-exynos/mach-origen.c
@@@ -15,6 -15,7 +15,7 @@@
  #include <linux/platform_device.h>
  #include <linux/io.h>
  #include <linux/input.h>
+ #include <linux/pwm.h>
  #include <linux/pwm_backlight.h>
  #include <linux/gpio_keys.h>
  #include <linux/i2c.h>
@@@ -42,7 -43,6 +43,7 @@@
  #include <plat/backlight.h>
  #include <plat/fb.h>
  #include <plat/mfc.h>
 +#include <plat/hdmi.h>
  
  #include <mach/ohci.h>
  #include <mach/map.h>
@@@ -614,6 -614,10 +615,10 @@@ static struct platform_device origen_lc
        .dev.platform_data      = &origen_lcd_hv070wsa_data,
  };
  
+ static struct pwm_lookup origen_pwm_lookup[] = {
+       PWM_LOOKUP("s3c24xx-pwm.0", 0, "pwm-backlight.0", NULL),
+ };
+ 
  #ifdef CONFIG_DRM_EXYNOS
  static struct exynos_drm_fimd_pdata drm_fimd_pdata = {
        .panel  = {
@@@ -735,11 -739,6 +740,11 @@@ static void __init origen_bt_setup(void
        s3c_gpio_setpull(EXYNOS4_GPX2(2), S3C_GPIO_PULL_NONE);
  }
  
 +/* I2C module and id for HDMIPHY */
 +static struct i2c_board_info hdmiphy_info = {
 +      I2C_BOARD_INFO("hdmiphy-exynos4210", 0x38),
 +};
 +
  static void s5p_tv_setup(void)
  {
        /* Direct HPD to HDMI chip */
@@@ -787,7 -786,6 +792,7 @@@ static void __init origen_machine_init(
  
        s5p_tv_setup();
        s5p_i2c_hdmiphy_set_platdata(NULL);
 +      s5p_hdmi_set_platdata(&hdmiphy_info, NULL, 0);
  
  #ifdef CONFIG_DRM_EXYNOS
        s5p_device_fimd0.dev.platform_data = &drm_fimd_pdata;
@@@ -798,6 -796,7 +803,7 @@@
  
        platform_add_devices(origen_devices, ARRAY_SIZE(origen_devices));
  
+       pwm_add_table(origen_pwm_lookup, ARRAY_SIZE(origen_pwm_lookup));
        samsung_bl_set(&origen_bl_gpio_info, &origen_bl_data);
  
        origen_bt_setup();

diff --combined arch/arm/mach-exynos/mach-smdkv310.c
index 73f2bce097e179822d9a08d4dc14bba6f104888c,1ba87e963f5b34db5627dd836f06b09b05e21b84..12a1db29e1a18171e7d66c57e5fbc01177b49136
--- 1/arch/arm/mach-exynos/mach-smdkv310.c
--- 2/arch/arm/mach-exynos/mach-smdkv310.c
+++ b/arch/arm/mach-exynos/mach-smdkv310.c
@@@ -18,6 -18,7 +18,7 @@@
  #include <linux/io.h>
  #include <linux/i2c.h>
  #include <linux/input.h>
+ #include <linux/pwm.h>
  #include <linux/pwm_backlight.h>
  #include <linux/platform_data/s3c-hsotg.h>
  
@@@ -40,7 -41,6 +41,7 @@@
  #include <plat/mfc.h>
  #include <plat/ehci.h>
  #include <plat/clock.h>
 +#include <plat/hdmi.h>
  
  #include <mach/map.h>
  #include <mach/ohci.h>
@@@ -355,11 -355,10 +356,15 @@@ static struct platform_pwm_backlight_da
        .pwm_period_ns  = 1000,
  };
  
 +/* I2C module and id for HDMIPHY */
 +static struct i2c_board_info hdmiphy_info = {
 +      I2C_BOARD_INFO("hdmiphy-exynos4210", 0x38),
 +};
 +
+ static struct pwm_lookup smdkv310_pwm_lookup[] = {
+       PWM_LOOKUP("s3c24xx-pwm.1", 0, "pwm-backlight.0", NULL),
+ };
+ 
  static void s5p_tv_setup(void)
  {
        /* direct HPD to HDMI chip */
@@@ -394,11 -393,12 +399,13 @@@ static void __init smdkv310_machine_ini
  
        s5p_tv_setup();
        s5p_i2c_hdmiphy_set_platdata(NULL);
 +      s5p_hdmi_set_platdata(&hdmiphy_info, NULL, 0);
  
        samsung_keypad_set_platdata(&smdkv310_keypad_data);
  
        samsung_bl_set(&smdkv310_bl_gpio_info, &smdkv310_bl_data);
+       pwm_add_table(smdkv310_pwm_lookup, ARRAY_SIZE(smdkv310_pwm_lookup));
+ 
  #ifdef CONFIG_DRM_EXYNOS
        s5p_device_fimd0.dev.platform_data = &drm_fimd_pdata;
        exynos4_fimd0_gpio_setup_24bpp();