From: Olof Johansson <olof@lixom.net>
Date: Sat, 29 Sep 2012 18:28:41 +0000 (-0700)
Subject: Merge branch 'samsung/boards' into next/dt2
X-Git-Tag: v3.7-rc1~154^2^2~2
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=6590147b629949a2eba247b021e4ad0461c5e847;p=~emulex%2Finfiniband.git

Merge branch 'samsung/boards' into next/dt2

* samsung/boards:
  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

Add/add conflict in arch/arm/mach-exynos/mach-smdkv310.c.

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

6590147b629949a2eba247b021e4ad0461c5e847
diff --cc arch/arm/mach-exynos/mach-smdkv310.c
index 73f2bce097e,1ba87e963f5..12a1db29e1a
--- a/arch/arm/mach-exynos/mach-smdkv310.c
+++ b/arch/arm/mach-exynos/mach-smdkv310.c
@@@ -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 */