From f79d6934366b420182c31e253b9e52540e700f30 Mon Sep 17 00:00:00 2001 From: Sean Paul Date: Mon, 25 Feb 2013 15:35:25 -0500 Subject: [PATCH] drm/bridge: Move ps8622 driver into drm/bridge MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Move the ps8622 bridge driver into drm/bridge. BUG=chrome-os-partner:17557 TEST=Builds Change-Id: I153539311c5a31aafab9deff1f74384a70bc48c4 Signed-off-by: Sean Paul Reviewed-on: https://gerrit.chromium.org/gerrit/43939 Reviewed-by: Stéphane Marchesin Commit-Queue: Vincent Palatin Tested-by: Vincent Palatin --- drivers/auxdisplay/Kconfig | 5 ----- drivers/auxdisplay/Makefile | 1 - drivers/gpu/drm/bridge/Kconfig | 5 +++++ drivers/gpu/drm/bridge/Makefile | 1 + drivers/{auxdisplay => gpu/drm/bridge}/ps8622.c | 0 5 files changed, 6 insertions(+), 6 deletions(-) rename drivers/{auxdisplay => gpu/drm/bridge}/ps8622.c (100%) diff --git a/drivers/auxdisplay/Kconfig b/drivers/auxdisplay/Kconfig index 79a405f3d48d..c07e725ea93d 100644 --- a/drivers/auxdisplay/Kconfig +++ b/drivers/auxdisplay/Kconfig @@ -119,9 +119,4 @@ config CFAG12864B_RATE If you compile this as a module, you can still override this value using the module parameters. -config PS8622 - tristate "Parade eDP/LVDS bridge" - ---help--- - Adds the driver for the Parade PS8622 eDP/LVDS bridge chip. - endif # AUXDISPLAY diff --git a/drivers/auxdisplay/Makefile b/drivers/auxdisplay/Makefile index ed48645d9763..8a8936a468b9 100644 --- a/drivers/auxdisplay/Makefile +++ b/drivers/auxdisplay/Makefile @@ -4,4 +4,3 @@ obj-$(CONFIG_KS0108) += ks0108.o obj-$(CONFIG_CFAG12864B) += cfag12864b.o cfag12864bfb.o -obj-$(CONFIG_PS8622) += ps8622.o diff --git a/drivers/gpu/drm/bridge/Kconfig b/drivers/gpu/drm/bridge/Kconfig index 27a83b581f32..282f4e63a1d3 100644 --- a/drivers/gpu/drm/bridge/Kconfig +++ b/drivers/gpu/drm/bridge/Kconfig @@ -3,3 +3,8 @@ config DRM_PTN3460 depends on DRM && I2C ---help--- Adds the driver for the NXP PTN3460 DP/LVDS bridge chip. + +config DRM_PS8622 + tristate "Parade eDP/LVDS bridge" + ---help--- + Adds the driver for the Parade PS8622 eDP/LVDS bridge chip. diff --git a/drivers/gpu/drm/bridge/Makefile b/drivers/gpu/drm/bridge/Makefile index b4733e1fbd2e..d1b5daab982d 100644 --- a/drivers/gpu/drm/bridge/Makefile +++ b/drivers/gpu/drm/bridge/Makefile @@ -1,3 +1,4 @@ ccflags-y := -Iinclude/drm obj-$(CONFIG_DRM_PTN3460) += ptn3460.o +obj-$(CONFIG_DRM_PS8622) += ps8622.o diff --git a/drivers/auxdisplay/ps8622.c b/drivers/gpu/drm/bridge/ps8622.c similarity index 100% rename from drivers/auxdisplay/ps8622.c rename to drivers/gpu/drm/bridge/ps8622.c -- 2.20.1