aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-exynos/setup-tvout.c
diff options
context:
space:
mode:
authorcodeworkx <codeworkx@cyanogenmod.com>2012-09-22 09:48:20 +0200
committercodeworkx <codeworkx@cyanogenmod.com>2012-09-22 14:02:16 +0200
commit2489007e7d740ccbc3e0a202914e243ad5178787 (patch)
treeb8e6380ea7b1da63474ad68a5dba997e01146043 /arch/arm/mach-exynos/setup-tvout.c
parent5f67568eb31e3a813c7c52461dcf66ade15fc2e7 (diff)
downloadkernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.zip
kernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.tar.gz
kernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.tar.bz2
merge opensource jb u5
Change-Id: I1aaec157aa196f3448eff8636134fce89a814cf2
Diffstat (limited to 'arch/arm/mach-exynos/setup-tvout.c')
-rw-r--r--arch/arm/mach-exynos/setup-tvout.c12
1 files changed, 11 insertions, 1 deletions
diff --git a/arch/arm/mach-exynos/setup-tvout.c b/arch/arm/mach-exynos/setup-tvout.c
index 7e487f8..7948eb8 100644
--- a/arch/arm/mach-exynos/setup-tvout.c
+++ b/arch/arm/mach-exynos/setup-tvout.c
@@ -38,12 +38,21 @@ struct platform_device; /* don't need the contents */
void s5p_int_src_hdmi_hpd(struct platform_device *pdev)
{
printk(KERN_INFO "%s()\n", __func__);
+#ifdef CONFIG_MACH_U1_NA_USCC
+ s3c_gpio_cfgpin(GPIO_HDMI_HPD , S3C_GPIO_INPUT);
+#else
s3c_gpio_cfgpin(GPIO_HDMI_HPD, S3C_GPIO_SFN(0x3));
- s3c_gpio_setpull(GPIO_HDMI_HPD, S3C_GPIO_PULL_NONE);
+#endif
+ s3c_gpio_setpull(GPIO_HDMI_HPD, S3C_GPIO_PULL_DOWN);
}
void s5p_int_src_ext_hpd(struct platform_device *pdev)
{
+#ifdef CONFIG_MACH_U1_NA_USCC /* NC */
+ printk(KERN_INFO "%s()\n", __func__);
+ s3c_gpio_cfgpin(GPIO_HDMI_HPD, S3C_GPIO_INPUT);
+ s3c_gpio_setpull(GPIO_HDMI_HPD, S3C_GPIO_PULL_DOWN);
+#else
printk(KERN_INFO "%s()\n", __func__);
s3c_gpio_cfgpin(GPIO_HDMI_HPD, S3C_GPIO_SFN(0xf));
/* To avoid floating state of the HPD pin *
@@ -53,6 +62,7 @@ void s5p_int_src_ext_hpd(struct platform_device *pdev)
#else
s3c_gpio_setpull(GPIO_HDMI_HPD, S3C_GPIO_PULL_NONE);
#endif
+#endif
}
int s5p_hpd_read_gpio(struct platform_device *pdev)