From e09b41010ba33a20a87472ee821fa407a5b8da36 Mon Sep 17 00:00:00 2001 From: José Pekkarinen Date: Mon, 11 Apr 2016 10:41:07 +0300 Subject: These changes are the raw update to linux-4.4.6-rt14. Kernel sources are taken from kernel.org, and rt patch from the rt wiki download page. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit During the rebasing, the following patch collided: Force tick interrupt and get rid of softirq magic(I70131fb85). Collisions have been removed because its logic was found on the source already. Change-Id: I7f57a4081d9deaa0d9ccfc41a6c8daccdee3b769 Signed-off-by: José Pekkarinen --- kernel/drivers/gpu/drm/panel/Kconfig | 16 +- kernel/drivers/gpu/drm/panel/Makefile | 5 +- kernel/drivers/gpu/drm/panel/panel-ld9040.c | 389 ------- kernel/drivers/gpu/drm/panel/panel-lg-lg4573.c | 297 ++++++ kernel/drivers/gpu/drm/panel/panel-s6e8aa0.c | 1067 -------------------- .../drivers/gpu/drm/panel/panel-samsung-ld9040.c | 388 +++++++ .../drivers/gpu/drm/panel/panel-samsung-s6e8aa0.c | 1067 ++++++++++++++++++++ kernel/drivers/gpu/drm/panel/panel-simple.c | 153 ++- 8 files changed, 1919 insertions(+), 1463 deletions(-) delete mode 100644 kernel/drivers/gpu/drm/panel/panel-ld9040.c create mode 100644 kernel/drivers/gpu/drm/panel/panel-lg-lg4573.c delete mode 100644 kernel/drivers/gpu/drm/panel/panel-s6e8aa0.c create mode 100644 kernel/drivers/gpu/drm/panel/panel-samsung-ld9040.c create mode 100644 kernel/drivers/gpu/drm/panel/panel-samsung-s6e8aa0.c (limited to 'kernel/drivers/gpu/drm/panel') diff --git a/kernel/drivers/gpu/drm/panel/Kconfig b/kernel/drivers/gpu/drm/panel/Kconfig index 6d64c7bb9..7d4704b12 100644 --- a/kernel/drivers/gpu/drm/panel/Kconfig +++ b/kernel/drivers/gpu/drm/panel/Kconfig @@ -18,13 +18,21 @@ config DRM_PANEL_SIMPLE that it can be automatically turned off when the panel goes into a low power state. -config DRM_PANEL_LD9040 - tristate "LD9040 RGB/SPI panel" +config DRM_PANEL_SAMSUNG_LD9040 + tristate "Samsung LD9040 RGB/SPI panel" depends on OF && SPI select VIDEOMODE_HELPERS -config DRM_PANEL_S6E8AA0 - tristate "S6E8AA0 DSI video mode panel" +config DRM_PANEL_LG_LG4573 + tristate "LG4573 RGB/SPI panel" + depends on OF && SPI + select VIDEOMODE_HELPERS + help + Say Y here if you want to enable support for LG4573 RGB panel. + To compile this driver as a module, choose M here. + +config DRM_PANEL_SAMSUNG_S6E8AA0 + tristate "Samsung S6E8AA0 DSI video mode panel" depends on OF select DRM_MIPI_DSI select VIDEOMODE_HELPERS diff --git a/kernel/drivers/gpu/drm/panel/Makefile b/kernel/drivers/gpu/drm/panel/Makefile index 4b2a04308..d0f016dd7 100644 --- a/kernel/drivers/gpu/drm/panel/Makefile +++ b/kernel/drivers/gpu/drm/panel/Makefile @@ -1,4 +1,5 @@ obj-$(CONFIG_DRM_PANEL_SIMPLE) += panel-simple.o -obj-$(CONFIG_DRM_PANEL_LD9040) += panel-ld9040.o -obj-$(CONFIG_DRM_PANEL_S6E8AA0) += panel-s6e8aa0.o +obj-$(CONFIG_DRM_PANEL_LG_LG4573) += panel-lg-lg4573.o +obj-$(CONFIG_DRM_PANEL_SAMSUNG_LD9040) += panel-samsung-ld9040.o +obj-$(CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0) += panel-samsung-s6e8aa0.o obj-$(CONFIG_DRM_PANEL_SHARP_LQ101R1SX01) += panel-sharp-lq101r1sx01.o diff --git a/kernel/drivers/gpu/drm/panel/panel-ld9040.c b/kernel/drivers/gpu/drm/panel/panel-ld9040.c deleted file mode 100644 index 08cf2c588..000000000 --- a/kernel/drivers/gpu/drm/panel/panel-ld9040.c +++ /dev/null @@ -1,389 +0,0 @@ -/* - * ld9040 AMOLED LCD drm_panel driver. - * - * Copyright (c) 2014 Samsung Electronics Co., Ltd - * Derived from drivers/video/backlight/ld9040.c - * - * Andrzej Hajda - * - * 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. -*/ - -#include -#include - -#include -#include -#include - -#include