Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 322325
b: refs/heads/master
c: ccc61fd
h: refs/heads/master
i:
  322323: 6c1cd5c
v: v3
  • Loading branch information
Tushar Behera authored and Kukjin Kim committed Aug 8, 2012
1 parent 2569ab0 commit e372d9f
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: cceb840904d1c1f7ee453bfa9886117c6931bdbf
refs/heads/master: ccc61fd460fc1b20480dbb7e10b2ea82433bfd58
7 changes: 7 additions & 0 deletions trunk/arch/arm/mach-exynos/mach-origen.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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 */
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit e372d9f

Please sign in to comment.