Skip to content

Commit

Permalink
media: atomisp: move atomisp_gmin_platform.c to pci/ dir
Browse files Browse the repository at this point in the history
The atomisp_gmin_platform.c is not a platform driver anymore,
but it is, instead, part of the atomisp driver.

Move it to be together with the driver. As a bonus, as the
atomisp i2c drivers depends on its contents, probing them
should load automatically the atomisp core. This should
likely avoid some possible race conditions.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
  • Loading branch information
Mauro Carvalho Chehab committed May 20, 2020
1 parent 93e24ec commit 0741bf6
Show file tree
Hide file tree
Showing 5 changed files with 2 additions and 11 deletions.
2 changes: 1 addition & 1 deletion drivers/staging/media/atomisp/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,6 @@ config VIDEO_ATOMISP_ISP2401
Disabling it enables support for Atom ISP2400-based boards
(Merrifield and Baytrail SoCs).

if INTEL_ATOMISP
if VIDEO_ATOMISP
source "drivers/staging/media/atomisp/i2c/Kconfig"
endif
2 changes: 1 addition & 1 deletion drivers/staging/media/atomisp/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
# Makefile for camera drivers.
#
obj-$(CONFIG_INTEL_ATOMISP) += i2c/
obj-$(CONFIG_INTEL_ATOMISP) += platform/
obj-$(CONFIG_VIDEO_ATOMISP) += atomisp.o

# While on staging, keep debug enabled
Expand All @@ -24,6 +23,7 @@ atomisp-objs += \
pci/atomisp_subdev.o \
pci/atomisp_tpg.o \
pci/atomisp_v4l2.o \
pci/atomisp_gmin_platform.o \
pci/sh_css_firmware.o \
pci/sh_css_host_data.o \
pci/sh_css_hrt.o \
Expand Down
5 changes: 0 additions & 5 deletions drivers/staging/media/atomisp/platform/Makefile

This file was deleted.

4 changes: 0 additions & 4 deletions drivers/staging/media/atomisp/platform/intel-mid/Makefile

This file was deleted.

0 comments on commit 0741bf6

Please sign in to comment.