Merge branches 'next/pinctrl-samsung' and 'next/board-samsung' into next/dt-samsung-new

Conflicts:
	arch/arm/mach-exynos/mach-smdkv310.c

diff --cc arch/arm/mach-exynos/Kconfig
Simple merge

diff --cc arch/arm/mach-exynos/mach-origen.c
Simple merge

diff --cc arch/arm/mach-exynos/mach-smdkv310.c
index 73f2bce097e179822d9a08d4dc14bba6f104888c,73f2bce097e179822d9a08d4dc14bba6f104888c,1ba87e963f5b34db5627dd836f06b09b05e21b84..12a1db29e1a18171e7d66c57e5fbc01177b49136
--- 1/arch/arm/mach-exynos/mach-smdkv310.c
--- 2/arch/arm/mach-exynos/mach-smdkv310.c
--- 3/arch/arm/mach-exynos/mach-smdkv310.c
+++ b/arch/arm/mach-exynos/mach-smdkv310.c
@@@@ -355,11 -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 */