diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-09-17 02:17:25 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-09-17 02:17:25 +0200 |
| commit | 6a2a2cdd57d11ee3117539b846a45df6efbd35b1 (patch) | |
| tree | b6ab218810666a75d6612bde4d4a224118c0834c /arch/arm/mach-exynos/mach-origen.c | |
| parent | Staging: bcm: Fix udelay related compilation error (diff) | |
| parent | Linux 3.6-rc6 (diff) | |
| download | linux-6a2a2cdd57d11ee3117539b846a45df6efbd35b1.tar.xz linux-6a2a2cdd57d11ee3117539b846a45df6efbd35b1.zip | |
Merge 3.6-rc6 into staging-next
This pulls in the staging tree fixes in 3.6-rc6 into our branch to resolve the
merge issues.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm/mach-exynos/mach-origen.c')
| -rw-r--r-- | arch/arm/mach-exynos/mach-origen.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/mach-exynos/mach-origen.c b/arch/arm/mach-exynos/mach-origen.c index 5ca80307d6d7..4e574c24581c 100644 --- a/arch/arm/mach-exynos/mach-origen.c +++ b/arch/arm/mach-exynos/mach-origen.c @@ -42,6 +42,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> @@ -734,6 +735,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 */ @@ -781,6 +787,7 @@ static void __init origen_machine_init(void) 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; |