system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-10-21 18:59:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

media: smiapp: Rename as "ccs"

Browse source 
Rename the "smiapp" driver as "ccs". MIPI CCS is the contemporary standard
for raw Bayer camera sensors. The driver retains support for the SMIA++
and SMIA compliant camera sensors. A module alias is added for old user
space using "smiapp" module name.

Add Intel copyright while at it.

Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
This commit is contained in:
Sakari Ailus 2020-02-11 19:05:57 +01:00 committed by Mauro Carvalho Chehab
parent 571b6caff4
commit b24cc2a18c
15 changed files with 39 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
MAINTAINERS
View file

@ -11630,6 +11630,17 @@ M: Oliver Neukum <oliver@neukum.org>
S: Maintained
F: drivers/usb/image/microtek.*
MIPI CCS, SMIA AND SMIA++ IMAGE SENSOR DRIVER
M: Sakari Ailus <sakari.ailus@linux.intel.com>
L: linux-media@vger.kernel.org
S: Maintained
F: Documentation/devicetree/bindings/media/i2c/nokia,smia.txt
F: Documentation/driver-api/media/drivers/ccs/
F: drivers/media/i2c/ccs/
F: drivers/media/i2c/smiapp-pll.c
F: drivers/media/i2c/smiapp-pll.h
F: include/uapi/linux/smiapp.h
MIPS
M: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
L: linux-mips@vger.kernel.org
@ -16103,17 +16114,6 @@ S: Maintained
F: drivers/firmware/smccc/
F: include/linux/arm-smccc.h
SMIA AND SMIA++ IMAGE SENSOR DRIVER
M: Sakari Ailus <sakari.ailus@linux.intel.com>
L: linux-media@vger.kernel.org
S: Maintained
F: Documentation/devicetree/bindings/media/i2c/nokia,smia.txt
F: Documentation/driver-api/media/drivers/ccs/
F: drivers/media/i2c/smiapp-pll.c
F: drivers/media/i2c/smiapp-pll.h
F: drivers/media/i2c/smiapp/
F: include/uapi/linux/smiapp.h
SMM665 HARDWARE MONITOR DRIVER
M: Guenter Roeck <linux@roeck-us.net>
L: linux-hwmon@vger.kernel.org

2
drivers/media/i2c/Kconfig
View file

@ -1247,7 +1247,7 @@ config VIDEO_S5K5BAF
This is a V4L2 sensor driver for Samsung S5K5BAF 2M
camera sensor with an embedded SoC image signal processor.
source "drivers/media/i2c/smiapp/Kconfig"
source "drivers/media/i2c/ccs/Kconfig"
source "drivers/media/i2c/et8ek8/Kconfig"
config VIDEO_S5C73M3

2
drivers/media/i2c/Makefile
View file

@ -2,7 +2,7 @@
msp3400-objs := msp3400-driver.o msp3400-kthreads.o
obj-$(CONFIG_VIDEO_MSP3400) += msp3400.o
obj-$(CONFIG_VIDEO_SMIAPP) += smiapp/
obj-$(CONFIG_VIDEO_CCS) += ccs/
obj-$(CONFIG_VIDEO_ET8EK8) += et8ek8/
obj-$(CONFIG_VIDEO_CX25840) += cx25840/
obj-$(CONFIG_VIDEO_M5MOLS) += m5mols/

7
drivers/media/i2c/smiapp/Kconfig → drivers/media/i2c/ccs/Kconfig
View file

@ -1,10 +1,11 @@
# SPDX-License-Identifier: GPL-2.0-only
config VIDEO_SMIAPP
tristate "SMIA++/SMIA sensor support"
config VIDEO_CCS
tristate "MIPI CCS/SMIA++/SMIA sensor support"
depends on I2C && VIDEO_V4L2 && HAVE_CLK
select MEDIA_CONTROLLER
select VIDEO_V4L2_SUBDEV_API
select VIDEO_SMIAPP_PLL
select V4L2_FWNODE
help
This is a generic driver for SMIA++/SMIA camera modules.
This is a generic driver for MIPI CCS, SMIA++ and SMIA compliant
camera sensors.

4
drivers/media/i2c/smiapp/Makefile → drivers/media/i2c/ccs/Makefile
View file

@ -1,6 +1,6 @@
# SPDX-License-Identifier: GPL-2.0-only
smiapp-objs += ccs-core.o ccs-reg-access.o \
ccs-objs += ccs-core.o ccs-reg-access.o \
ccs-quirk.o ccs-limits.o
obj-$(CONFIG_VIDEO_SMIAPP) += smiapp.o
obj-$(CONFIG_VIDEO_CCS) += ccs.o
ccflags-y += -I $(srctree)/drivers/media/i2c

6
drivers/media/i2c/smiapp/ccs-core.c → drivers/media/i2c/ccs/ccs-core.c
View file

@ -1,9 +1,10 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
* drivers/media/i2c/smiapp/ccs-core.c
* drivers/media/i2c/ccs/ccs-core.c
*
* Generic driver for SMIA/SMIA++ compliant camera modules
* Generic driver for MIPI CCS/SMIA/SMIA++ compliant camera sensors
*
* Copyright (C) 2020 Intel Corporation
* Copyright (C) 2010--2012 Nokia Corporation
* Contact: Sakari Ailus <sakari.ailus@iki.fi>
*
@ -3298,3 +3299,4 @@ module_exit(ccs_module_cleanup);
MODULE_AUTHOR("Sakari Ailus <sakari.ailus@iki.fi>");
MODULE_DESCRIPTION("Generic MIPI CCS/SMIA/SMIA++ camera sensor driver");
MODULE_LICENSE("GPL v2");
MODULE_ALIAS("smiapp");

0
drivers/media/i2c/smiapp/ccs-limits.c → drivers/media/i2c/ccs/ccs-limits.c
View file

0
drivers/media/i2c/smiapp/ccs-limits.h → drivers/media/i2c/ccs/ccs-limits.h
View file

5
drivers/media/i2c/smiapp/ccs-quirk.c → drivers/media/i2c/ccs/ccs-quirk.c
View file

@ -1,9 +1,10 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
* drivers/media/i2c/smiapp/ccs-quirk.c
* drivers/media/i2c/ccs/ccs-quirk.c
*
* Generic driver for SMIA/SMIA++ compliant camera modules
* Generic driver for MIPI CCS/SMIA/SMIA++ compliant camera sensors
*
* Copyright (C) 2020 Intel Corporation
* Copyright (C) 2011--2012 Nokia Corporation
* Contact: Sakari Ailus <sakari.ailus@iki.fi>
*/

5
drivers/media/i2c/smiapp/ccs-quirk.h → drivers/media/i2c/ccs/ccs-quirk.h
View file

@ -1,9 +1,10 @@
/* SPDX-License-Identifier: GPL-2.0-only */
/*
* drivers/media/i2c/smiapp/ccs-quirk.h
* drivers/media/i2c/ccs/ccs-quirk.h
*
* Generic driver for SMIA/SMIA++ compliant camera modules
* Generic driver for MIPI CCS/SMIA/SMIA++ compliant camera sensors
*
* Copyright (C) 2020 Intel Corporation
* Copyright (C) 2011--2012 Nokia Corporation
* Contact: Sakari Ailus <sakari.ailus@iki.fi>
*/

5
drivers/media/i2c/smiapp/ccs-reg-access.c → drivers/media/i2c/ccs/ccs-reg-access.c
View file

@ -1,9 +1,10 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
* drivers/media/i2c/smiapp/ccs-regs.c
* drivers/media/i2c/ccs/ccs-reg-access.c
*
* Generic driver for SMIA/SMIA++ compliant camera modules
* Generic driver for MIPI CCS/SMIA/SMIA++ compliant camera sensors
*
* Copyright (C) 2020 Intel Corporation
* Copyright (C) 2011--2012 Nokia Corporation
* Contact: Sakari Ailus <sakari.ailus@iki.fi>
*/

5
drivers/media/i2c/smiapp/ccs-reg-access.h → drivers/media/i2c/ccs/ccs-reg-access.h
View file

@ -1,9 +1,10 @@
/* SPDX-License-Identifier: GPL-2.0-only */
/*
* include/media/smiapp/ccs-regs.h
* include/media/ccs/ccs-reg-access.h
*
* Generic driver for SMIA/SMIA++ compliant camera modules
* Generic driver for MIPI CCS/SMIA/SMIA++ compliant camera sensors
*
* Copyright (C) 2020 Intel Corporation
* Copyright (C) 2011--2012 Nokia Corporation
* Contact: Sakari Ailus <sakari.ailus@iki.fi>
*/

0
drivers/media/i2c/smiapp/ccs-regs.h → drivers/media/i2c/ccs/ccs-regs.h
View file

3
drivers/media/i2c/smiapp/ccs.h → drivers/media/i2c/ccs/ccs.h
View file

@ -2,8 +2,9 @@
/*
* drivers/media/i2c/smiapp/ccs.h
*
* Generic driver for SMIA/SMIA++ compliant camera modules
* Generic driver for MIPI CCS/SMIA/SMIA++ compliant camera sensors
*
* Copyright (C) 2020 Intel Corporation
* Copyright (C) 2010--2012 Nokia Corporation
* Contact: Sakari Ailus <sakari.ailus@iki.fi>
*/

3
drivers/media/i2c/smiapp/smiapp-reg-defs.h → drivers/media/i2c/ccs/smiapp-reg-defs.h
View file

@ -2,8 +2,9 @@
/*
* drivers/media/i2c/smiapp/smiapp-reg-defs.h
*
* Generic driver for SMIA/SMIA++ compliant camera modules
* Generic driver for MIPI CCS/SMIA/SMIA++ compliant camera sensors
*
* Copyright (C) 2020 Intel Corporation
* Copyright (C) 2011--2012 Nokia Corporation
* Contact: Sakari Ailus <sakari.ailus@iki.fi>
*/