Commit b24cc2a1 authored by Sakari Ailus's avatar Sakari Ailus Committed by Mauro Carvalho Chehab

media: smiapp: Rename as "ccs"

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: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 571b6caf
...@@ -11630,6 +11630,17 @@ M: Oliver Neukum <oliver@neukum.org> ...@@ -11630,6 +11630,17 @@ M: Oliver Neukum <oliver@neukum.org>
S: Maintained S: Maintained
F: drivers/usb/image/microtek.* 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 MIPS
M: Thomas Bogendoerfer <tsbogend@alpha.franken.de> M: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
L: linux-mips@vger.kernel.org L: linux-mips@vger.kernel.org
...@@ -16103,17 +16114,6 @@ S: Maintained ...@@ -16103,17 +16114,6 @@ S: Maintained
F: drivers/firmware/smccc/ F: drivers/firmware/smccc/
F: include/linux/arm-smccc.h 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 SMM665 HARDWARE MONITOR DRIVER
M: Guenter Roeck <linux@roeck-us.net> M: Guenter Roeck <linux@roeck-us.net>
L: linux-hwmon@vger.kernel.org L: linux-hwmon@vger.kernel.org
......
...@@ -1247,7 +1247,7 @@ config VIDEO_S5K5BAF ...@@ -1247,7 +1247,7 @@ config VIDEO_S5K5BAF
This is a V4L2 sensor driver for Samsung S5K5BAF 2M This is a V4L2 sensor driver for Samsung S5K5BAF 2M
camera sensor with an embedded SoC image signal processor. 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" source "drivers/media/i2c/et8ek8/Kconfig"
config VIDEO_S5C73M3 config VIDEO_S5C73M3
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
msp3400-objs := msp3400-driver.o msp3400-kthreads.o msp3400-objs := msp3400-driver.o msp3400-kthreads.o
obj-$(CONFIG_VIDEO_MSP3400) += msp3400.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_ET8EK8) += et8ek8/
obj-$(CONFIG_VIDEO_CX25840) += cx25840/ obj-$(CONFIG_VIDEO_CX25840) += cx25840/
obj-$(CONFIG_VIDEO_M5MOLS) += m5mols/ obj-$(CONFIG_VIDEO_M5MOLS) += m5mols/
......
# SPDX-License-Identifier: GPL-2.0-only # SPDX-License-Identifier: GPL-2.0-only
config VIDEO_SMIAPP config VIDEO_CCS
tristate "SMIA++/SMIA sensor support" tristate "MIPI CCS/SMIA++/SMIA sensor support"
depends on I2C && VIDEO_V4L2 && HAVE_CLK depends on I2C && VIDEO_V4L2 && HAVE_CLK
select MEDIA_CONTROLLER select MEDIA_CONTROLLER
select VIDEO_V4L2_SUBDEV_API select VIDEO_V4L2_SUBDEV_API
select VIDEO_SMIAPP_PLL select VIDEO_SMIAPP_PLL
select V4L2_FWNODE select V4L2_FWNODE
help 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.
# SPDX-License-Identifier: GPL-2.0-only # 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 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 ccflags-y += -I $(srctree)/drivers/media/i2c
// SPDX-License-Identifier: GPL-2.0-only // 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 * Copyright (C) 2010--2012 Nokia Corporation
* Contact: Sakari Ailus <sakari.ailus@iki.fi> * Contact: Sakari Ailus <sakari.ailus@iki.fi>
* *
...@@ -3298,3 +3299,4 @@ module_exit(ccs_module_cleanup); ...@@ -3298,3 +3299,4 @@ module_exit(ccs_module_cleanup);
MODULE_AUTHOR("Sakari Ailus <sakari.ailus@iki.fi>"); MODULE_AUTHOR("Sakari Ailus <sakari.ailus@iki.fi>");
MODULE_DESCRIPTION("Generic MIPI CCS/SMIA/SMIA++ camera sensor driver"); MODULE_DESCRIPTION("Generic MIPI CCS/SMIA/SMIA++ camera sensor driver");
MODULE_LICENSE("GPL v2"); MODULE_LICENSE("GPL v2");
MODULE_ALIAS("smiapp");
// SPDX-License-Identifier: GPL-2.0-only // 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 * Copyright (C) 2011--2012 Nokia Corporation
* Contact: Sakari Ailus <sakari.ailus@iki.fi> * Contact: Sakari Ailus <sakari.ailus@iki.fi>
*/ */
......
/* SPDX-License-Identifier: GPL-2.0-only */ /* 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 * Copyright (C) 2011--2012 Nokia Corporation
* Contact: Sakari Ailus <sakari.ailus@iki.fi> * Contact: Sakari Ailus <sakari.ailus@iki.fi>
*/ */
......
// SPDX-License-Identifier: GPL-2.0-only // 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 * Copyright (C) 2011--2012 Nokia Corporation
* Contact: Sakari Ailus <sakari.ailus@iki.fi> * Contact: Sakari Ailus <sakari.ailus@iki.fi>
*/ */
......
/* SPDX-License-Identifier: GPL-2.0-only */ /* 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 * Copyright (C) 2011--2012 Nokia Corporation
* Contact: Sakari Ailus <sakari.ailus@iki.fi> * Contact: Sakari Ailus <sakari.ailus@iki.fi>
*/ */
......
...@@ -2,8 +2,9 @@ ...@@ -2,8 +2,9 @@
/* /*
* drivers/media/i2c/smiapp/ccs.h * 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 * Copyright (C) 2010--2012 Nokia Corporation
* Contact: Sakari Ailus <sakari.ailus@iki.fi> * Contact: Sakari Ailus <sakari.ailus@iki.fi>
*/ */
......
...@@ -2,8 +2,9 @@ ...@@ -2,8 +2,9 @@
/* /*
* drivers/media/i2c/smiapp/smiapp-reg-defs.h * 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 * Copyright (C) 2011--2012 Nokia Corporation
* Contact: Sakari Ailus <sakari.ailus@iki.fi> * Contact: Sakari Ailus <sakari.ailus@iki.fi>
*/ */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment