From a3bc6114d672b736dd6ca11b59527ae2ab86bd38 Mon Sep 17 00:00:00 2001 From: Son Hyunjun Date: Fri, 17 Feb 2012 15:50:45 +0900 Subject: [PATCH] [Title] rename overlay device driver from samsung(svo) to maru [Type] Enhancement [Module] Emulator / Display [Priority] Minor [CQ#] [Redmine#] [Problem] [Cause] [Solution] Change-Id: I8b81a3e6b6a7330824634f9f32c77e175e6f22d0 --- arch/x86/configs/i386_emul_defconfig | 2 +- drivers/maru/Kconfig | 4 ++++ drivers/maru/Makefile | 3 ++- drivers/{media/video/svo.c => maru/maru_overlay.c} | 10 +++++----- drivers/media/video/Kconfig | 12 ------------ drivers/media/video/Makefile | 1 - 6 files changed, 12 insertions(+), 20 deletions(-) rename drivers/{media/video/svo.c => maru/maru_overlay.c} (97%) mode change 100755 => 100644 diff --git a/arch/x86/configs/i386_emul_defconfig b/arch/x86/configs/i386_emul_defconfig index aaf2385743a0..dc64864ffab6 100644 --- a/arch/x86/configs/i386_emul_defconfig +++ b/arch/x86/configs/i386_emul_defconfig @@ -1549,7 +1549,6 @@ CONFIG_VIDEO_CAPTURE_DRIVERS=y # CONFIG_VIDEO_FIXED_MINOR_RANGES is not set CONFIG_VIDEO_HELPER_CHIPS_AUTO=y # CONFIG_VIDEO_VIVI is not set -CONFIG_VIDEO_SVO=y # CONFIG_VIDEO_BT848 is not set # CONFIG_VIDEO_SAA5246A is not set # CONFIG_VIDEO_SAA5249 is not set @@ -2169,6 +2168,7 @@ CONFIG_MARU_TOUCHSCREEN=y CONFIG_MARU_FB=y CONFIG_MARU_CAMERA=y CONFIG_MARU_BACKLIGHT=y +CONFIG_MARU_OVERLAY=y CONFIG_MARU_JACK=y CONFIG_MARU_POWER_SUPPLY=y CONFIG_MARU_USB_MASS_STORAGE=y diff --git a/drivers/maru/Kconfig b/drivers/maru/Kconfig index e92ae35e40a4..74aaa1f2d6a9 100644 --- a/drivers/maru/Kconfig +++ b/drivers/maru/Kconfig @@ -31,6 +31,10 @@ config MARU_BACKLIGHT help Say Y to enable the backlight driver of MARU. +config MARU_OVERLAY + tristate "MARU overlay Driver" + depends on MARU != n && VIDEO_DEV && VIDEO_V4L2 && !SPARC32 && !SPARC64 + config MARU_JACK tristate "MARU Jack Driver" depends on MARU != n diff --git a/drivers/maru/Makefile b/drivers/maru/Makefile index 491e496edbf5..453a4c879393 100644 --- a/drivers/maru/Makefile +++ b/drivers/maru/Makefile @@ -3,7 +3,8 @@ obj-$(CONFIG_MARU_CODEC) += maru_codec.o obj-$(CONFIG_MARU_TOUCHSCREEN) += maru_touchscreen.o obj-$(CONFIG_MARU_FB) += maru_fb.o obj-$(CONFIG_MARU_CAMERA) += maru_camera.o -obj-$(CONFIG_MARU_CAMERA) += maru_bl.o +obj-$(CONFIG_MARU_BACKLIGHT) += maru_bl.o +obj-$(MARU_OVERLAY) += maru_overlay.o obj-$(CONFIG_MARU_JACK) += maru_jack.o obj-$(CONFIG_MARU_POWER_SUPPLY) += maru_power_supply.o obj-$(CONFIG_MARU_USB_MASS_STORAGE) += maru_usb_mass_storage.o diff --git a/drivers/media/video/svo.c b/drivers/maru/maru_overlay.c old mode 100755 new mode 100644 similarity index 97% rename from drivers/media/video/svo.c rename to drivers/maru/maru_overlay.c index 36fe67a7a9c2..9b3b4c0fd79d --- a/drivers/media/video/svo.c +++ b/drivers/maru/maru_overlay.c @@ -1,12 +1,11 @@ /* - * Samsung Virtual Overlay Driver + * Maru Virtual Overlay Driver * * Copyright (c) 2011 - 2012 Samsung Electronics Co., Ltd. All rights reserved. * * Contact: * Hyunjun Son * GiWoong Kim - * DongKyun Yun * YeongKyoon Lee * * This program is free software; you can redistribute it and/or @@ -27,6 +26,7 @@ * - S-Core Co., Ltd * */ + #include #include #include @@ -43,7 +43,7 @@ enum { static struct pci_device_id svo_pci_tbl[] = { { - .vendor = PCI_VENDOR_ID_SAMSUNG, + .vendor = PCI_VENDOR_ID_TIZEN, .device = 0x1010, .subvendor = PCI_ANY_ID, .subdevice = PCI_ANY_ID, @@ -444,7 +444,7 @@ static int __devinit svo_initdev(struct pci_dev *pci_dev, goto outreqirq; } - printk(KERN_INFO "svo: Samsung Virtual Overlay Driver v%d.%d\n", + printk(KERN_INFO "svo: Tizen Virtual Overlay Driver v%d.%d\n", SVO_DRIVER_MAJORVERSION, SVO_DRIVER_MINORVERSION); return 0; @@ -477,7 +477,7 @@ static struct pci_driver svo_pci_driver = { static int __init svo_init(void) { - printk(KERN_INFO "svo: samsung virtual overlay driver version %d.%d loaded\n", + printk(KERN_INFO "svo: Tizen virtual overlay driver version %d.%d loaded\n", SVO_DRIVER_MAJORVERSION, SVO_DRIVER_MINORVERSION); return pci_register_driver(&svo_pci_driver); diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig index eb5cbbca28e7..e6186b338a12 100755 --- a/drivers/media/video/Kconfig +++ b/drivers/media/video/Kconfig @@ -547,18 +547,6 @@ config VIDEO_VIVI Say Y here if you want to test video apps or debug V4L devices. In doubt, say N. -config VIDEO_SVO - tristate "Samsung Virtual Overlay Driver" - depends on VIDEO_DEV && VIDEO_V4L2 && !SPARC32 && !SPARC64 - select VIDEOBUF_VMALLOC - default n - ---help--- - Enables a Samsung Virtual Video driver. This device shows a test - video(YUV420), as a real device would generate by using V4L2 api. - And it supports overlay driver. - Say Y here if you want to test video apps or debug V4L devices. - In doubt, say N. - config VIDEO_VPSS_SYSTEM tristate "VPSS System module driver" depends on ARCH_DAVINCI diff --git a/drivers/media/video/Makefile b/drivers/media/video/Makefile index 4cd7a95dd9f5..2136a8e37087 100755 --- a/drivers/media/video/Makefile +++ b/drivers/media/video/Makefile @@ -144,7 +144,6 @@ obj-$(CONFIG_VIDEO_IVTV) += ivtv/ obj-$(CONFIG_VIDEO_CX18) += cx18/ obj-$(CONFIG_VIDEO_VIVI) += vivi.o -obj-$(CONFIG_VIDEO_SVO) += svo.o obj-$(CONFIG_VIDEO_CX23885) += cx23885/ -- 2.34.1