Commit 0741bf66 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

media: atomisp: move atomisp_gmin_platform.c to pci/ dir 



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: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 93e24ec6

drivers/staging/media/atomisp/Kconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -31,6 +31,6 @@ config VIDEO_ATOMISP_ISP2401 
	  Disabling it enables support for Atom ISP2400-based boards

	  Disabling it enables support for Atom ISP2400-based boards

	  (Merrifield and Baytrail SoCs).

	  (Merrifield and Baytrail SoCs).





if INTEL_ATOMISP

if VIDEO_ATOMISP

source "drivers/staging/media/atomisp/i2c/Kconfig"

source "drivers/staging/media/atomisp/i2c/Kconfig"

endif
 
endif

drivers/staging/media/atomisp/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -2,7 +2,6 @@ 
# Makefile for camera drivers.

# Makefile for camera drivers.

#

#

obj-$(CONFIG_INTEL_ATOMISP) += i2c/

obj-$(CONFIG_INTEL_ATOMISP) += i2c/

obj-$(CONFIG_INTEL_ATOMISP) += platform/

obj-$(CONFIG_VIDEO_ATOMISP) += atomisp.o

obj-$(CONFIG_VIDEO_ATOMISP) += atomisp.o





# While on staging, keep debug enabled

# While on staging, keep debug enabled
@@ -24,6 +23,7 @@ atomisp-objs += \ 
	pci/atomisp_subdev.o \

	pci/atomisp_subdev.o \

	pci/atomisp_tpg.o \

	pci/atomisp_tpg.o \

	pci/atomisp_v4l2.o \

	pci/atomisp_v4l2.o \

	pci/atomisp_gmin_platform.o \

	pci/sh_css_firmware.o \

	pci/sh_css_firmware.o \

	pci/sh_css_host_data.o \

	pci/sh_css_host_data.o \

	pci/sh_css_hrt.o \

	pci/sh_css_hrt.o \

drivers/staging/media/atomisp/platform/Makefile

deleted100644 → 0
+0 −5
Original line number Original line Diff line number Diff line 
#

# Makefile for camera drivers.

#



obj-$(CONFIG_INTEL_ATOMISP) += intel-mid/

drivers/staging/media/atomisp/platform/intel-mid/Makefile

deleted100644 → 0
+0 −4
Original line number Original line Diff line number Diff line 
#

# Makefile for intel-mid devices.

#

obj-$(CONFIG_INTEL_ATOMISP) += atomisp_gmin_platform.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE