Commit d15be546 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'media/v5.8-3' of... 

Merge tag 'media/v5.8-3' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media into master

Pull media fixes from Mauro Carvalho Chehab:
 "A series of fixes for the upcoming atomisp driver. They solve issues
  when probing atomisp on devices with multiple cameras and get rid of
  warnings when built with W=1.

  The diffstat is a bit long, as this driver has several abstractions.
  The patches that solved the issues with W=1 had to get rid of some
  duplicated code (there used to have 2 versions of the same code, one
  for ISP2401 and another one for ISP2400).

  As this driver is not in 5.7, such changes won't cause regressions"

* tag 'media/v5.8-3' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (38 commits)
  Revert "media: atomisp: keep the ISP powered on when setting it"
  media: atomisp: fix mask and shift operation on ISPSSPM0
  media: atomisp: move system_local consts into a C file
  media: atomisp: get rid of version-specific system_local.h
  media: atomisp: move global stuff into a common header
  media: atomisp: remove non-used 32-bits consts at system_local
  media: atomisp: get rid of some unused static vars
  media: atomisp: Fix error code in ov5693_probe()
  media: atomisp: Replace trace_printk by pr_info
  media: atomisp: Fix __func__ style warnings
  media: atomisp: fix help message for ISP2401 selection
  media: atomisp: i2c: atomisp-ov2680.c: fixed a brace coding style issue.
  media: atomisp: make const arrays static, makes object smaller
  media: atomisp: Clean up non-existing folders from Makefile
  media: atomisp: Get rid of ACPI specifics in gmin_subdev_add()
  media: atomisp: Provide Gmin subdev as parameter to gmin_subdev_add()
  media: atomisp: Use temporary variable for device in gmin_subdev_add()
  media: atomisp: Refactor PMIC detection to a separate function
  media: atomisp: Deduplicate return ret in gmin_i2c_write()
  media: atomisp: Make pointer to PMIC client global
  ...
parents 071fb1bc 0d6db851

arch/x86/include/asm/iosf_mbi.h

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ 
#define BT_MBI_UNIT_PMC		0x04

#define BT_MBI_UNIT_GFX		0x06

#define BT_MBI_UNIT_SMI		0x0C

#define BT_MBI_UNIT_CCK		0x14

#define BT_MBI_UNIT_USB		0x43

#define BT_MBI_UNIT_SATA	0xA3

#define BT_MBI_UNIT_PCIE	0xA6

drivers/staging/media/atomisp/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ config VIDEO_ATOMISP 
	  module will be called atomisp



config VIDEO_ATOMISP_ISP2401

	bool "VIDEO_ATOMISP_ISP2401"

	bool "Use Intel Atom ISP on Cherrytail/Anniedale (ISP2401)"

	depends on VIDEO_ATOMISP

	help

	  Enable support for Atom ISP2401-based boards.

drivers/staging/media/atomisp/Makefile

+1 −5
Original line number Diff line number Diff line
@@ -156,6 +156,7 @@ atomisp-objs += \ 
	pci/hive_isp_css_common/host/timed_ctrl.o \

	pci/hive_isp_css_common/host/vmem.o \

	pci/hive_isp_css_shared/host/tag.o \

	pci/system_local.o \



obj-byt = \

	pci/css_2400_system/hive/ia_css_isp_configs.o \
@@ -182,7 +183,6 @@ INCLUDES += \ 
	-I$(atomisp)/include/hmm/ \

	-I$(atomisp)/include/mmu/ \

	-I$(atomisp)/pci/ \

	-I$(atomisp)/pci/hrt/ \

	-I$(atomisp)/pci/base/circbuf/interface/ \

	-I$(atomisp)/pci/base/refcount/interface/ \

	-I$(atomisp)/pci/camera/pipe/interface/ \
@@ -192,7 +192,6 @@ INCLUDES += \ 
	-I$(atomisp)/pci/hive_isp_css_include/ \

	-I$(atomisp)/pci/hive_isp_css_include/device_access/ \

	-I$(atomisp)/pci/hive_isp_css_include/host/ \

	-I$(atomisp)/pci/hive_isp_css_include/memory_access/ \

	-I$(atomisp)/pci/hive_isp_css_shared/ \

	-I$(atomisp)/pci/hive_isp_css_shared/host/ \

	-I$(atomisp)/pci/isp/kernels/ \
@@ -311,9 +310,7 @@ INCLUDES += \ 
	-I$(atomisp)/pci/runtime/tagger/interface/



INCLUDES_byt += \

	-I$(atomisp)/pci/css_2400_system/ \

	-I$(atomisp)/pci/css_2400_system/hive/ \

	-I$(atomisp)/pci/css_2400_system/hrt/ \



INCLUDES_cht += \

	-I$(atomisp)/pci/css_2401_system/ \
@@ -321,7 +318,6 @@ INCLUDES_cht += \ 
	-I$(atomisp)/pci/css_2401_system/hive/ \

	-I$(atomisp)/pci/css_2401_system/hrt/ \



#	-I$(atomisp)/pci/css_2401_system/hrt/ \

#	-I$(atomisp)/pci/css_2401_system/hive_isp_css_2401_system_generated/ \



DEFINES := -DHRT_HW -DHRT_ISP_CSS_CUSTOM_HOST -DHRT_USE_VIR_ADDRS -D__HOST__

drivers/staging/media/atomisp/i2c/atomisp-ov2680.c

+3 −3
Original line number Diff line number Diff line
@@ -495,11 +495,11 @@ static int ov2680_h_flip(struct v4l2_subdev *sd, s32 value) 
	ret = ov2680_read_reg(client, 1, OV2680_MIRROR_REG, &val);

	if (ret)

		return ret;

	if (value) {

	if (value)

		val |= OV2680_FLIP_MIRROR_BIT_ENABLE;

	} else {

	else

		val &= ~OV2680_FLIP_MIRROR_BIT_ENABLE;

	}



	ret = ov2680_write_reg(client, 1,

			       OV2680_MIRROR_REG, val);

	if (ret)

drivers/staging/media/atomisp/i2c/ov5693/atomisp-ov5693.c

+4 −2
Original line number Diff line number Diff line
@@ -1899,7 +1899,7 @@ static int ov5693_probe(struct i2c_client *client) 
{

	struct ov5693_device *dev;

	int i2c;

	int ret = 0;

	int ret;

	void *pdata;

	unsigned int i;
@@ -1929,8 +1929,10 @@ static int ov5693_probe(struct i2c_client *client) 
	pdata = gmin_camera_platform_data(&dev->sd,

					  ATOMISP_INPUT_FORMAT_RAW_10,

					  atomisp_bayer_order_bggr);

	if (!pdata)

	if (!pdata) {

		ret = -EINVAL;

		goto out_free;

	}



	ret = ov5693_s_config(&dev->sd, client->irq, pdata);

	if (ret)

CRA Git | Maintained and supported by SUSTech CRA and CCSE