mirror of
https://github.com/torvalds/linux
synced 2024-10-25 04:37:40 +00:00
c0f486fde3
- Fix a regression in leds-gpio introduced by a recent commit that
inadvertently changed the name of one of the properties used by
the driver (Fabio Estevam).
- Fix a regression in the ACPI backlight driver introduced by a
recent fix that missed one special case that had to be taken
into account (Aaron Lu).
- Drop the level of some new kernel messages from the ACPI core
introduced by a recent commit to KERN_DEBUG which they should
have used from the start and drop some other unuseful KERN_ERR
messages printed by ACPI (Rafael J Wysocki).
- Revert an incorrect commit modifying the cpupower tool
(Prarit Bhargava).
- Fix two regressions introduced by recent commits in the OPP
library and clean up some existing minor issues in that code
(Viresh Kumar).
- Continue to replace CONFIG_PM_RUNTIME with CONFIG_PM throughout
the tree (or drop it where that can be done) in order to make
it possible to eliminate CONFIG_PM_RUNTIME (Rafael J Wysocki,
Ulf Hansson, Ludovic Desroches). There will be one more
"CONFIG_PM_RUNTIME removal" batch after this one, because some
new uses of it have been introduced during the current merge
window, but that should be sufficient to finally get rid of it.
- Make the ACPI EC driver more robust against race conditions
related to GPE handler installation failures (Lv Zheng).
- Prevent the ACPI device PM core code from attempting to
disable GPEs that it has not enabled which confuses ACPICA
and makes it report errors unnecessarily (Rafael J Wysocki).
- Add a "force" command line switch to the intel_pstate driver
to make it possible to override the blacklisting of some
systems in that driver if needed (Ethan Zhao).
- Improve intel_pstate code documentation and add a MAINTAINERS
entry for it (Kristen Carlson Accardi).
- Make the ACPI fan driver create cooling device interfaces
witn names that reflect the IDs of the ACPI device objects
they are associated with, except for "generic" ACPI fans
(PNP ID "PNP0C0B"). That's necessary for user space thermal
management tools to be able to connect the fans with the
parts of the system they are supposed to be cooling properly.
From Srinivas Pandruvada.
/
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
iQIcBAABCAAGBQJUk0IDAAoJEILEb/54YlRx7fgP/3+yF/0TnEW93j2ALDAQFiLF
tSv2A2vQC8vtMJjjWx0z/HqPh86gfaReEFZmUJD/Q/e2LXEnxNZJ+QMjcekPVkDM
mTvcIMc2MR8vOA/oMkgxeaKregrrx7RkCfojd+NWZhVukkjl+mvBHgAnYjXRL+NZ
unDWGlbHG97vq/3kGjPYhDS00nxHblw8NHFBu5HL5RxwABdWoeZJITwqxXWyuPLw
nlqNWlOxmwvtSbw2VMKz0uof1nFHyQLykYsMG0ZsyayCRdWUZYkEqmE7GGpCLkLu
D6yfmlpen6ccIOsEAae0eXBt50IFY9Tihk5lovx1mZmci2SNRg29BqMI105wIn0u
8b8Ej7MNHp7yMxRpB5WfU90p/y7ioJns9guFZxY0CKaRnrI2+BLt3RscMi3MPI06
Cu2/WkSSa09fhDPA+pk+VDYsmWgyVawigesNmMP5/cvYO/yYywVRjOuO1k77qQGp
4dSpFYEHfpxinejZnVZOk2V9MkvSLoSMux6wPV0xM0IE1iD0ulVpHjTJrwp80ph4
+bfUFVr/vrD1y7EKbf1PD363ZKvJhWhvQWDgETsM1vgLf21PfWO7C2kflIAsWsdQ
1ukD5nCBRlP4K73hG7bdM6kRztXhUdR0SHg85/t0KB/ExiVqtcXIzB60D0G1lENd
QlKbq3O4lim1WGuhazQY
=5fo2
-----END PGP SIGNATURE-----
Merge tag 'pm+acpi-3.19-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull more ACPI and power management updates from Rafael Wysocki:
"These are regression fixes (leds-gpio, ACPI backlight driver,
operating performance points library, ACPI device enumeration
messages, cpupower tool), other bug fixes (ACPI EC driver, ACPI device
PM), some cleanups in the operating performance points (OPP)
framework, continuation of CONFIG_PM_RUNTIME elimination, a couple of
minor intel_pstate driver changes, a new MAINTAINERS entry for it and
an ACPI fan driver change needed for better support of thermal
management in user space.
Specifics:
- Fix a regression in leds-gpio introduced by a recent commit that
inadvertently changed the name of one of the properties used by the
driver (Fabio Estevam).
- Fix a regression in the ACPI backlight driver introduced by a
recent fix that missed one special case that had to be taken into
account (Aaron Lu).
- Drop the level of some new kernel messages from the ACPI core
introduced by a recent commit to KERN_DEBUG which they should have
used from the start and drop some other unuseful KERN_ERR messages
printed by ACPI (Rafael J Wysocki).
- Revert an incorrect commit modifying the cpupower tool (Prarit
Bhargava).
- Fix two regressions introduced by recent commits in the OPP library
and clean up some existing minor issues in that code (Viresh
Kumar).
- Continue to replace CONFIG_PM_RUNTIME with CONFIG_PM throughout the
tree (or drop it where that can be done) in order to make it
possible to eliminate CONFIG_PM_RUNTIME (Rafael J Wysocki, Ulf
Hansson, Ludovic Desroches).
There will be one more "CONFIG_PM_RUNTIME removal" batch after this
one, because some new uses of it have been introduced during the
current merge window, but that should be sufficient to finally get
rid of it.
- Make the ACPI EC driver more robust against race conditions related
to GPE handler installation failures (Lv Zheng).
- Prevent the ACPI device PM core code from attempting to disable
GPEs that it has not enabled which confuses ACPICA and makes it
report errors unnecessarily (Rafael J Wysocki).
- Add a "force" command line switch to the intel_pstate driver to
make it possible to override the blacklisting of some systems in
that driver if needed (Ethan Zhao).
- Improve intel_pstate code documentation and add a MAINTAINERS entry
for it (Kristen Carlson Accardi).
- Make the ACPI fan driver create cooling device interfaces witn
names that reflect the IDs of the ACPI device objects they are
associated with, except for "generic" ACPI fans (PNP ID "PNP0C0B").
That's necessary for user space thermal management tools to be able
to connect the fans with the parts of the system they are supposed
to be cooling properly. From Srinivas Pandruvada"
* tag 'pm+acpi-3.19-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (32 commits)
MAINTAINERS: add entry for intel_pstate
ACPI / video: update the skip case for acpi_video_device_in_dod()
power / PM: Eliminate CONFIG_PM_RUNTIME
NFC / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
SCSI / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
ACPI / EC: Fix unexpected ec_remove_handlers() invocations
Revert "tools: cpupower: fix return checks for sysfs_get_idlestate_count()"
tracing / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
x86 / PM: Replace CONFIG_PM_RUNTIME in io_apic.c
PM: Remove the SET_PM_RUNTIME_PM_OPS() macro
mmc: atmel-mci: use SET_RUNTIME_PM_OPS() macro
PM / Kconfig: Replace PM_RUNTIME with PM in dependencies
ARM / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
sound / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
phy / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
video / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
tty / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
spi: Replace CONFIG_PM_RUNTIME with CONFIG_PM
ACPI / PM: Do not disable wakeup GPEs that have not been enabled
ACPI / utils: Drop error messages from acpi_evaluate_reference()
...
272 lines
7.5 KiB
Plaintext
272 lines
7.5 KiB
Plaintext
#
|
|
# Platform drivers
|
|
# All drivers here are currently for webcam support
|
|
|
|
menuconfig V4L_PLATFORM_DRIVERS
|
|
bool "V4L platform devices"
|
|
depends on MEDIA_CAMERA_SUPPORT
|
|
default n
|
|
---help---
|
|
Say Y here to enable support for platform-specific V4L drivers.
|
|
|
|
if V4L_PLATFORM_DRIVERS
|
|
|
|
source "drivers/media/platform/marvell-ccic/Kconfig"
|
|
|
|
config VIDEO_VIA_CAMERA
|
|
tristate "VIAFB camera controller support"
|
|
depends on FB_VIA
|
|
select VIDEOBUF_DMA_SG
|
|
select VIDEO_OV7670
|
|
help
|
|
Driver support for the integrated camera controller in VIA
|
|
Chrome9 chipsets. Currently only tested on OLPC xo-1.5 systems
|
|
with ov7670 sensors.
|
|
|
|
#
|
|
# Platform multimedia device configuration
|
|
#
|
|
|
|
source "drivers/media/platform/davinci/Kconfig"
|
|
|
|
source "drivers/media/platform/omap/Kconfig"
|
|
|
|
source "drivers/media/platform/blackfin/Kconfig"
|
|
|
|
config VIDEO_SH_VOU
|
|
tristate "SuperH VOU video output driver"
|
|
depends on MEDIA_CAMERA_SUPPORT
|
|
depends on VIDEO_DEV && I2C && HAS_DMA
|
|
depends on ARCH_SHMOBILE || COMPILE_TEST
|
|
select VIDEOBUF_DMA_CONTIG
|
|
help
|
|
Support for the Video Output Unit (VOU) on SuperH SoCs.
|
|
|
|
config VIDEO_VIU
|
|
tristate "Freescale VIU Video Driver"
|
|
depends on VIDEO_V4L2 && PPC_MPC512x
|
|
select VIDEOBUF_DMA_CONTIG
|
|
default y
|
|
---help---
|
|
Support for Freescale VIU video driver. This device captures
|
|
video data, or overlays video on DIU frame buffer.
|
|
|
|
Say Y here if you want to enable VIU device on MPC5121e Rev2+.
|
|
In doubt, say N.
|
|
|
|
config VIDEO_TIMBERDALE
|
|
tristate "Support for timberdale Video In/LogiWIN"
|
|
depends on VIDEO_V4L2 && I2C && DMADEVICES
|
|
depends on MFD_TIMBERDALE || COMPILE_TEST
|
|
select DMA_ENGINE
|
|
select TIMB_DMA
|
|
select VIDEO_ADV7180
|
|
select VIDEOBUF_DMA_CONTIG
|
|
---help---
|
|
Add support for the Video In peripherial of the timberdale FPGA.
|
|
|
|
config VIDEO_M32R_AR
|
|
tristate "AR devices"
|
|
depends on VIDEO_V4L2
|
|
depends on M32R || COMPILE_TEST
|
|
---help---
|
|
This is a video4linux driver for the Renesas AR (Artificial Retina)
|
|
camera module.
|
|
|
|
config VIDEO_M32R_AR_M64278
|
|
tristate "AR device with color module M64278(VGA)"
|
|
depends on PLAT_M32700UT
|
|
select VIDEO_M32R_AR
|
|
---help---
|
|
This is a video4linux driver for the Renesas AR (Artificial
|
|
Retina) with M64278E-800 camera module.
|
|
This module supports VGA(640x480 pixels) resolutions.
|
|
|
|
To compile this driver as a module, choose M here: the
|
|
module will be called arv.
|
|
|
|
config VIDEO_OMAP3
|
|
tristate "OMAP 3 Camera support"
|
|
depends on VIDEO_V4L2 && I2C && VIDEO_V4L2_SUBDEV_API && ARCH_OMAP3
|
|
depends on HAS_DMA
|
|
select ARM_DMA_USE_IOMMU
|
|
select OMAP_IOMMU
|
|
select VIDEOBUF2_DMA_CONTIG
|
|
---help---
|
|
Driver for an OMAP 3 camera controller.
|
|
|
|
config VIDEO_OMAP3_DEBUG
|
|
bool "OMAP 3 Camera debug messages"
|
|
depends on VIDEO_OMAP3
|
|
---help---
|
|
Enable debug messages on OMAP 3 camera controller driver.
|
|
|
|
config VIDEO_S3C_CAMIF
|
|
tristate "Samsung S3C24XX/S3C64XX SoC Camera Interface driver"
|
|
depends on VIDEO_V4L2 && I2C && VIDEO_V4L2_SUBDEV_API
|
|
depends on PM
|
|
depends on ARCH_S3C64XX || PLAT_S3C24XX || COMPILE_TEST
|
|
depends on HAS_DMA
|
|
select VIDEOBUF2_DMA_CONTIG
|
|
---help---
|
|
This is a v4l2 driver for s3c24xx and s3c64xx SoC series camera
|
|
host interface (CAMIF).
|
|
|
|
To compile this driver as a module, choose M here: the module
|
|
will be called s3c-camif.
|
|
|
|
source "drivers/media/platform/soc_camera/Kconfig"
|
|
source "drivers/media/platform/exynos4-is/Kconfig"
|
|
source "drivers/media/platform/s5p-tv/Kconfig"
|
|
|
|
endif # V4L_PLATFORM_DRIVERS
|
|
|
|
menuconfig V4L_MEM2MEM_DRIVERS
|
|
bool "Memory-to-memory multimedia devices"
|
|
depends on VIDEO_V4L2
|
|
depends on MEDIA_CAMERA_SUPPORT
|
|
default n
|
|
---help---
|
|
Say Y here to enable selecting drivers for V4L devices that
|
|
use system memory for both source and destination buffers, as opposed
|
|
to capture and output drivers, which use memory buffers for just
|
|
one of those.
|
|
|
|
if V4L_MEM2MEM_DRIVERS
|
|
|
|
config VIDEO_CODA
|
|
tristate "Chips&Media Coda multi-standard codec IP"
|
|
depends on VIDEO_DEV && VIDEO_V4L2 && ARCH_MXC
|
|
depends on HAS_DMA
|
|
select SRAM
|
|
select VIDEOBUF2_DMA_CONTIG
|
|
select V4L2_MEM2MEM_DEV
|
|
select GENERIC_ALLOCATOR
|
|
---help---
|
|
Coda is a range of video codec IPs that supports
|
|
H.264, MPEG-4, and other video formats.
|
|
|
|
config VIDEO_MEM2MEM_DEINTERLACE
|
|
tristate "Deinterlace support"
|
|
depends on VIDEO_DEV && VIDEO_V4L2 && DMA_ENGINE
|
|
depends on HAS_DMA
|
|
select VIDEOBUF2_DMA_CONTIG
|
|
select V4L2_MEM2MEM_DEV
|
|
help
|
|
Generic deinterlacing V4L2 driver.
|
|
|
|
config VIDEO_SAMSUNG_S5P_G2D
|
|
tristate "Samsung S5P and EXYNOS4 G2D 2d graphics accelerator driver"
|
|
depends on VIDEO_DEV && VIDEO_V4L2
|
|
depends on ARCH_S5PV210 || ARCH_EXYNOS || COMPILE_TEST
|
|
depends on HAS_DMA
|
|
select VIDEOBUF2_DMA_CONTIG
|
|
select V4L2_MEM2MEM_DEV
|
|
default n
|
|
---help---
|
|
This is a v4l2 driver for Samsung S5P and EXYNOS4 G2D
|
|
2d graphics accelerator.
|
|
|
|
config VIDEO_SAMSUNG_S5P_JPEG
|
|
tristate "Samsung S5P/Exynos3250/Exynos4 JPEG codec driver"
|
|
depends on VIDEO_DEV && VIDEO_V4L2
|
|
depends on ARCH_S5PV210 || ARCH_EXYNOS || COMPILE_TEST
|
|
depends on HAS_DMA
|
|
select VIDEOBUF2_DMA_CONTIG
|
|
select V4L2_MEM2MEM_DEV
|
|
---help---
|
|
This is a v4l2 driver for Samsung S5P, EXYNOS3250
|
|
and EXYNOS4 JPEG codec
|
|
|
|
config VIDEO_SAMSUNG_S5P_MFC
|
|
tristate "Samsung S5P MFC Video Codec"
|
|
depends on VIDEO_DEV && VIDEO_V4L2
|
|
depends on ARCH_S5PV210 || ARCH_EXYNOS || COMPILE_TEST
|
|
depends on HAS_DMA
|
|
select VIDEOBUF2_DMA_CONTIG
|
|
default n
|
|
help
|
|
MFC 5.1 and 6.x driver for V4L2
|
|
|
|
config VIDEO_MX2_EMMAPRP
|
|
tristate "MX2 eMMa-PrP support"
|
|
depends on VIDEO_DEV && VIDEO_V4L2
|
|
depends on SOC_IMX27 || COMPILE_TEST
|
|
depends on HAS_DMA
|
|
select VIDEOBUF2_DMA_CONTIG
|
|
select V4L2_MEM2MEM_DEV
|
|
help
|
|
MX2X chips have a PrP that can be used to process buffers from
|
|
memory to memory. Operations include resizing and format
|
|
conversion.
|
|
|
|
config VIDEO_SAMSUNG_EXYNOS_GSC
|
|
tristate "Samsung Exynos G-Scaler driver"
|
|
depends on VIDEO_DEV && VIDEO_V4L2
|
|
depends on ARCH_EXYNOS5 || COMPILE_TEST
|
|
depends on HAS_DMA
|
|
select VIDEOBUF2_DMA_CONTIG
|
|
select V4L2_MEM2MEM_DEV
|
|
help
|
|
This is a v4l2 driver for Samsung EXYNOS5 SoC G-Scaler.
|
|
|
|
config VIDEO_SH_VEU
|
|
tristate "SuperH VEU mem2mem video processing driver"
|
|
depends on VIDEO_DEV && VIDEO_V4L2 && HAS_DMA
|
|
depends on HAS_DMA
|
|
select VIDEOBUF2_DMA_CONTIG
|
|
select V4L2_MEM2MEM_DEV
|
|
help
|
|
Support for the Video Engine Unit (VEU) on SuperH and
|
|
SH-Mobile SoCs.
|
|
|
|
config VIDEO_RENESAS_VSP1
|
|
tristate "Renesas VSP1 Video Processing Engine"
|
|
depends on VIDEO_V4L2 && VIDEO_V4L2_SUBDEV_API && HAS_DMA
|
|
depends on ARCH_SHMOBILE || COMPILE_TEST
|
|
select VIDEOBUF2_DMA_CONTIG
|
|
---help---
|
|
This is a V4L2 driver for the Renesas VSP1 video processing engine.
|
|
|
|
To compile this driver as a module, choose M here: the module
|
|
will be called vsp1.
|
|
|
|
config VIDEO_TI_VPE
|
|
tristate "TI VPE (Video Processing Engine) driver"
|
|
depends on VIDEO_DEV && VIDEO_V4L2
|
|
depends on SOC_DRA7XX || COMPILE_TEST
|
|
depends on HAS_DMA
|
|
select VIDEOBUF2_DMA_CONTIG
|
|
select V4L2_MEM2MEM_DEV
|
|
default n
|
|
---help---
|
|
Support for the TI VPE(Video Processing Engine) block
|
|
found on DRA7XX SoC.
|
|
|
|
config VIDEO_TI_VPE_DEBUG
|
|
bool "VPE debug messages"
|
|
depends on VIDEO_TI_VPE
|
|
---help---
|
|
Enable debug messages on VPE driver.
|
|
|
|
endif # V4L_MEM2MEM_DRIVERS
|
|
|
|
menuconfig V4L_TEST_DRIVERS
|
|
bool "Media test drivers"
|
|
depends on MEDIA_CAMERA_SUPPORT
|
|
|
|
if V4L_TEST_DRIVERS
|
|
|
|
source "drivers/media/platform/vivid/Kconfig"
|
|
|
|
config VIDEO_VIM2M
|
|
tristate "Virtual Memory-to-Memory Driver"
|
|
depends on VIDEO_DEV && VIDEO_V4L2
|
|
select VIDEOBUF2_VMALLOC
|
|
select V4L2_MEM2MEM_DEV
|
|
default n
|
|
---help---
|
|
This is a virtual test device for the memory-to-memory driver
|
|
framework.
|
|
endif #V4L_TEST_DRIVERS
|