From: Kukjin Kim <kgene.kim@samsung.com>
Date: Sat, 22 Sep 2012 03:11:21 +0000 (+0900)
Subject: Merge branches 'next/pinctrl-samsung' and 'next/board-samsung' into next/dt-samsung-new
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=56952baa9b6f6bc06437abd51baefc4f7c8dee3b;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

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

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

56952baa9b6f6bc06437abd51baefc4f7c8dee3b
diff --cc arch/arm/mach-exynos/mach-smdkv310.c
index 73f2bce097e1,73f2bce097e1,1ba87e963f5b..12a1db29e1a1
--- a/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 */