display: updates for t0 devices

Change-Id: I028fd1a12e9dd1173aec02fea91bb192dda9d8ba

4 files changed, 23 insertions, 23 deletions

diff --git a/arch/arm/mach-exynos/include/mach/gpio-rev00-t0.h b/arch/arm/mach-exynos/include/mach/gpio-rev00-t0.h
index 2095f64..bb15f4d 100755
--- a/arch/arm/mach-exynos/include/mach/gpio-rev00-t0.h
+++ b/arch/arm/mach-exynos/include/mach/gpio-rev00-t0.h
@@ -192,9 +192,6 @@ extern int s3c_gpio_slp_setpull_updown(unsigned int pin, unsigned int config);
 #endif
 
 /* Others */
-#define GPIO_LCD_18V_EN		EXYNOS4_GPC0(1)
-#define GPIO_LCD_22V_EN_00	EXYNOS4_GPC0(1) /* obsoleted */
-
 #define GPIO_OTG_EN		EXYNOS4_GPF0(7)
 
 #define GPIO_OLED_ID		EXYNOS4_GPF1(0)
@@ -240,7 +237,6 @@ extern int s3c_gpio_slp_setpull_updown(unsigned int pin, unsigned int config);
 /* rev0.0 */
 #define GPIO_TSP_LDO_EN		EXYNOS4212_GPJ0(6)
 /* GPIO_MHL_SEL			EXYNOS4212_GPJ0(5)	*/
-/* GPIO_LCD_22V_EN		EXYNOS4_GPC0(1)		*/
 
 
 /* Modem Interface GPIOs - M0 HSIC */
@@ -340,6 +336,11 @@ extern int s3c_gpio_slp_setpull_updown(unsigned int pin, unsigned int config);
 #define GPIO_ISDBT_SPI_CS	EXYNOS4_GPC1(2)
 #define GPIO_ISDBT_SPI_MISO	EXYNOS4_GPC1(3)
 #define GPIO_ISDBT_SPI_MOSI	EXYNOS4_GPC1(4)
+
+#if defined(CONFIG_ISDBT_ANT_DET)
+#define GPIO_ISDBT_ANT_DET          EXYNOS4_GPL2(4)
+#define GPIO_ISDBT_IRQ_ANT_DET      gpio_to_irq(GPIO_ISDBT_ANT_DET)
+#endif
 #endif
 
 /*BARCODE_EMUL*/
diff --git a/arch/arm/mach-exynos/include/mach/gpio-rev00-t0ctc.h b/arch/arm/mach-exynos/include/mach/gpio-rev00-t0ctc.h
index 61315f8..a4d0f2b 100644
--- a/arch/arm/mach-exynos/include/mach/gpio-rev00-t0ctc.h
+++ b/arch/arm/mach-exynos/include/mach/gpio-rev00-t0ctc.h
@@ -144,10 +144,9 @@ extern int s3c_gpio_slp_setpull_updown(unsigned int pin, unsigned int config);
 #define GPIO_MHL_WAKE_UP	EXYNOS4212_GPJ1(4)
 #define MHL_INT_IRQ		gpio_to_irq(GPIO_MHL_INT)
 #define MHL_WAKEUP_IRQ		gpio_to_irq(GPIO_MHL_WAKE_UP)
-#endif
-
 #define GPIO_HDMI_EN		EXYNOS4_GPL0(4)
 #define GPIO_HDMI_HPD		EXYNOS4_GPX3(7)
+#endif
 
 /* Touch key */
 #define GPIO_3_TOUCH_SCL	EXYNOS4_GPL0(1)
@@ -192,9 +191,6 @@ extern int s3c_gpio_slp_setpull_updown(unsigned int pin, unsigned int config);
 #endif
 
 /* Others */
-#define GPIO_LCD_18V_EN		EXYNOS4_GPC0(1)
-#define GPIO_LCD_22V_EN_00	EXYNOS4_GPC0(1) /* obsoleted */
-
 #define GPIO_OTG_EN		EXYNOS4_GPF0(7)
 
 #define GPIO_OLED_ID		EXYNOS4_GPF1(0)
@@ -227,7 +223,6 @@ extern int s3c_gpio_slp_setpull_updown(unsigned int pin, unsigned int config);
 /* rev0.0 */
 #define GPIO_TSP_LDO_EN		EXYNOS4212_GPJ0(6)
 /* GPIO_MHL_SEL			EXYNOS4212_GPJ0(5)	*/
-/* GPIO_LCD_22V_EN		EXYNOS4_GPC0(1)		*/
 
 
 #if !defined(CONFIG_MACH_T0_CHN_CTC)
@@ -343,13 +338,13 @@ extern int s3c_gpio_slp_setpull_updown(unsigned int pin, unsigned int config);
 #define GPIO_USB_BOOT_EN_REV06	EXYNOS4_GPF2(2)
 #define GPIO_BOOT_SW_SEL_REV06	EXYNOS4_GPF3(4)
 
-#define GPIO_IPC_SLAVE_WAKEUP	EXYNOS4_GPC0(3)
+#define GPIO_IPC_SLAVE_WAKEUP	EXYNOS4_GPC0(0)
 #define GPIO_IPC_HOST_WAKEUP	EXYNOS4_GPC0(0)
 #define GPIO_CP_DUMP_INT		EXYNOS4_GPX1(2)
 
 #define GPIO_CP_MSM_PWRON		EXYNOS4_GPL2(5)
 #define GPIO_CP_MSM_RST			EXYNOS4_GPL2(1)
-#define GPIO_CP_MSM_PMU_RST		EXYNOS4_GPC0(0)
+#define GPIO_CP_MSM_PMU_RST		EXYNOS4_GPC0(3)
 #define GPIO_CP_MSM_DUMP		EXYNOS4_GPX1(2)
 
 #define GPIO_MSM_PHONE_ACTIVE	EXYNOS4_GPX1(6)
diff --git a/arch/arm/mach-exynos/include/mach/gpio-rev00-t0cu-duos.h b/arch/arm/mach-exynos/include/mach/gpio-rev00-t0cu-duos.h
index e477c7e..6928c60 100644
--- a/arch/arm/mach-exynos/include/mach/gpio-rev00-t0cu-duos.h
+++ b/arch/arm/mach-exynos/include/mach/gpio-rev00-t0cu-duos.h
@@ -185,9 +185,6 @@ extern int s3c_gpio_slp_setpull_updown(unsigned int pin, unsigned int config);
 #endif
 
 /* Others */
-#define GPIO_LCD_18V_EN		EXYNOS4_GPC0(1)
-#define GPIO_LCD_22V_EN_00	EXYNOS4_GPC0(1) /* obsoleted */
-
 #define GPIO_OTG_EN		EXYNOS4_GPF0(7)
 
 #define GPIO_OLED_ID		EXYNOS4_GPF1(0)
@@ -227,7 +224,6 @@ extern int s3c_gpio_slp_setpull_updown(unsigned int pin, unsigned int config);
 /* rev0.0 */
 #define GPIO_TSP_LDO_EN		EXYNOS4212_GPJ0(6)
 /* GPIO_MHL_SEL			EXYNOS4212_GPJ0(5)	*/
-/* GPIO_LCD_22V_EN		EXYNOS4_GPC0(1)		*/
 
 
 /* Modem Interface GPIOs - M0 HSIC */
diff --git a/arch/arm/mach-exynos/midas-lcd.c b/arch/arm/mach-exynos/midas-lcd.c
index ad722a6..8612f62 100644
--- a/arch/arm/mach-exynos/midas-lcd.c
+++ b/arch/arm/mach-exynos/midas-lcd.c
@@ -518,7 +518,7 @@ static struct s3cfb_lcd ea8061 = {
 	.p_width = 74,
 	.p_height = 131,
 	.bpp = 24,
-	.freq = 60,
+	.freq = 58,
 
 	/* minumun value is 0 except for wr_act time. */
 	.cpu_timing = {
@@ -530,7 +530,7 @@ static struct s3cfb_lcd ea8061 = {
 
 	.timing = {
 		.h_fp = 52,
-		.h_bp = 96,
+		.h_bp = 121,
 		.h_sw = 4,
 		.v_fp = 13,
 		.v_fpe = 1,
@@ -598,7 +598,7 @@ static struct s3cfb_lcd ea8061 = {
 	.p_width = 64,
 	.p_height = 106,
 	.bpp = 24,
-	.freq = 60,
+	.freq = 58,
 
 	/* minumun value is 0 except for wr_act time. */
 	.cpu_timing = {
@@ -610,7 +610,7 @@ static struct s3cfb_lcd ea8061 = {
 
 	.timing = {
 		.h_fp = 52,
-		.h_bp = 96,
+		.h_bp = 121,
 		.h_sw = 4,
 		.v_fp = 13,
 		.v_fpe = 1,
@@ -819,9 +819,11 @@ static void lcd_cfg_gpio(void)
 	s3c_gpio_cfgpin(GPIO_MLCD_RST, S3C_GPIO_OUTPUT);
 	s3c_gpio_setpull(GPIO_MLCD_RST, S3C_GPIO_PULL_NONE);
 
+#if defined(GPIO_LCD_22V_EN_00)
 	/* LCD_EN */
 	s3c_gpio_cfgpin(GPIO_LCD_22V_EN_00, S3C_GPIO_OUTPUT);
 	s3c_gpio_setpull(GPIO_LCD_22V_EN_00, S3C_GPIO_PULL_NONE);
+#endif
 
 	return;
 }
@@ -899,15 +901,18 @@ static int lcd_power_on(void *ld, int enable)
 		return -EPERM;
 	}
 
+#if defined(GPIO_LCD_22V_EN_00)
 	err = gpio_request(GPIO_LCD_22V_EN_00, "LCD_EN");
 	if (err) {
 		printk(KERN_ERR "failed to request GPM4[4] for "
 			"LCD_2.2V_EN control\n");
 		return -EPERM;
 	}
-
+#endif
 	if (enable) {
+#if defined(GPIO_LCD_22V_EN_00)
 		gpio_set_value(GPIO_LCD_22V_EN_00, GPIO_LEVEL_HIGH);
+#endif
 
 #if defined(CONFIG_MACH_T0)
 		regulator = regulator_get(NULL, "vcc_1.8v_lcd");
@@ -955,16 +960,19 @@ static int lcd_power_on(void *ld, int enable)
 			regulator_force_disable(regulator);
 		regulator_put(regulator);
 #endif
+#if defined(GPIO_LCD_22V_EN_00)
 		gpio_set_value(GPIO_LCD_22V_EN_00, GPIO_LEVEL_LOW);
+#endif
 		gpio_set_value(GPIO_MLCD_RST, 0);
 	}
 
 out:
 /* Release GPIO */
 	gpio_free(GPIO_MLCD_RST);
+#if defined(GPIO_LCD_22V_EN_00)
 	gpio_free(GPIO_LCD_22V_EN_00);
-return 0;
-
+#endif
+	return 0;
 }
 #endif