From 0db738a5f1bbddb16a03da988a179a204d9ee95f Mon Sep 17 00:00:00 2001 From: Guennadi Liakhovetski Date: Thu, 14 Jun 2012 09:53:33 +0200 Subject: [PATCH] --- yaml --- r: 321015 b: refs/heads/master c: e6765ffa6897f7fb84469bab2e1be885c57ea519 h: refs/heads/master i: 321013: 77b5f727c638a077cb2894f118268d120fc0604f 321011: 7f77dc6c755a0082d1e359f7cb3fd0cf76f83836 321007: f7753ad435bd47d94ae0044211dd4255a5d8f2ee v: v3 --- [refs] | 2 +- trunk/drivers/video/exynos/exynos_dp_core.c | 3 --- trunk/drivers/video/exynos/exynos_dp_core.h | 4 ++++ trunk/drivers/video/exynos/s6e8ax0.h | 21 +++++++++++++++++++++ trunk/drivers/video/sh_mipi_dsi.c | 7 +++---- 5 files changed, 29 insertions(+), 8 deletions(-) create mode 100644 trunk/drivers/video/exynos/s6e8ax0.h diff --git a/[refs] b/[refs] index e67376ccc9f4..b48fc10ae776 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 44edebca3964824b9126c49bab1187df7df5bd89 +refs/heads/master: e6765ffa6897f7fb84469bab2e1be885c57ea519 diff --git a/trunk/drivers/video/exynos/exynos_dp_core.c b/trunk/drivers/video/exynos/exynos_dp_core.c index 9db7b9f581e6..a36b2d28280e 100644 --- a/trunk/drivers/video/exynos/exynos_dp_core.c +++ b/trunk/drivers/video/exynos/exynos_dp_core.c @@ -407,9 +407,6 @@ static unsigned int exynos_dp_get_lane_link_training( case 3: reg = exynos_dp_get_lane3_link_training(dp); break; - default: - WARN_ON(1); - return 0; } return reg; diff --git a/trunk/drivers/video/exynos/exynos_dp_core.h b/trunk/drivers/video/exynos/exynos_dp_core.h index 8526e548c385..1e0f998e0c9f 100644 --- a/trunk/drivers/video/exynos/exynos_dp_core.h +++ b/trunk/drivers/video/exynos/exynos_dp_core.h @@ -85,6 +85,10 @@ void exynos_dp_set_link_bandwidth(struct exynos_dp_device *dp, u32 bwtype); void exynos_dp_get_link_bandwidth(struct exynos_dp_device *dp, u32 *bwtype); void exynos_dp_set_lane_count(struct exynos_dp_device *dp, u32 count); void exynos_dp_get_lane_count(struct exynos_dp_device *dp, u32 *count); +void exynos_dp_set_link_bandwidth(struct exynos_dp_device *dp, u32 bwtype); +void exynos_dp_get_link_bandwidth(struct exynos_dp_device *dp, u32 *bwtype); +void exynos_dp_set_lane_count(struct exynos_dp_device *dp, u32 count); +void exynos_dp_get_lane_count(struct exynos_dp_device *dp, u32 *count); void exynos_dp_enable_enhanced_mode(struct exynos_dp_device *dp, bool enable); void exynos_dp_set_training_pattern(struct exynos_dp_device *dp, enum pattern_set pattern); diff --git a/trunk/drivers/video/exynos/s6e8ax0.h b/trunk/drivers/video/exynos/s6e8ax0.h new file mode 100644 index 000000000000..1f1b270484b0 --- /dev/null +++ b/trunk/drivers/video/exynos/s6e8ax0.h @@ -0,0 +1,21 @@ +/* linux/drivers/video/backlight/s6e8ax0.h + * + * MIPI-DSI based s6e8ax0 AMOLED LCD Panel definitions. + * + * Copyright (c) 2011 Samsung Electronics + * + * Inki Dae, + * Donghwa Lee + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. +*/ + +#ifndef _S6E8AX0_H +#define _S6E8AX0_H + +extern void s6e8ax0_init(void); + +#endif + diff --git a/trunk/drivers/video/sh_mipi_dsi.c b/trunk/drivers/video/sh_mipi_dsi.c index 4c6b84488561..3951fdae5f68 100644 --- a/trunk/drivers/video/sh_mipi_dsi.c +++ b/trunk/drivers/video/sh_mipi_dsi.c @@ -127,8 +127,7 @@ static void sh_mipi_shutdown(struct platform_device *pdev) sh_mipi_dsi_enable(mipi, false); } -static int __init sh_mipi_setup(struct sh_mipi *mipi, - struct sh_mipi_dsi_info *pdata) +static int sh_mipi_setup(struct sh_mipi *mipi, struct sh_mipi_dsi_info *pdata) { void __iomem *base = mipi->base; struct sh_mobile_lcdc_chan_cfg *ch = pdata->lcd_chan; @@ -551,7 +550,7 @@ static int __init sh_mipi_probe(struct platform_device *pdev) return ret; } -static int __exit sh_mipi_remove(struct platform_device *pdev) +static int __devexit sh_mipi_remove(struct platform_device *pdev) { struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0); struct resource *res2 = platform_get_resource(pdev, IORESOURCE_MEM, 1); @@ -592,7 +591,7 @@ static int __exit sh_mipi_remove(struct platform_device *pdev) } static struct platform_driver sh_mipi_driver = { - .remove = __exit_p(sh_mipi_remove), + .remove = __devexit_p(sh_mipi_remove), .shutdown = sh_mipi_shutdown, .driver = { .name = "sh-mipi-dsi",