Commit 4a62b5cc authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

media: atomisp: get rid of ISP2401_NEW_INPUT_SYSTEM 



All ISP2401 devices use the new input system. So, get rid
of the remaining definitions, replacing them by runtime
checks for BYT/CHT when applicable.

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 62596705

drivers/staging/media/atomisp/Makefile

+1 −3
Original line number Diff line number Diff line
@@ -301,10 +301,8 @@ INCLUDES += \ 
	-I$(atomisp)/pci/runtime/rmgr/interface/ \

	-I$(atomisp)/pci/runtime/spctrl/interface/ \

	-I$(atomisp)/pci/runtime/tagger/interface/ \

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

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

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

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

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



DEFINES := -DHRT_HW -DHRT_ISP_CSS_CUSTOM_HOST -DHRT_USE_VIR_ADDRS -D__HOST__
@@ -319,7 +317,7 @@ ifeq ($(CONFIG_VIDEO_ATOMISP_ISP2401),y) 
atomisp-objs += \

	$(obj-cht) \

	pci/runtime/isys/src/ibuf_ctrl_rmgr.o

DEFINES += -DISP2401 -DISP2401_NEW_INPUT_SYSTEM

DEFINES += -DISP2401

endif



ccflags-y += $(INCLUDES) $(DEFINES) -fno-common

drivers/staging/media/atomisp/pci/atomisp_cmd.c

+11 −8
Original line number Diff line number Diff line
@@ -5156,11 +5156,11 @@ static int css_input_resolution_changed(struct atomisp_sub_device *asd, 
	dev_dbg(asd->isp->dev, "css_input_resolution_changed to %ux%u\n",

		ffmt->width, ffmt->height);



#if defined(ISP2401_NEW_INPUT_SYSTEM)

	if (IS_ISP2401)

		atomisp_css_input_set_two_pixels_per_clock(asd, false);

#else

	else

		atomisp_css_input_set_two_pixels_per_clock(asd, true);

#endif



	if (asd->continuous_mode->val) {

		/* Note for all checks: ffmt includes pad_w+pad_h */

		if (asd->run_mode->val == ATOMISP_RUN_MODE_VIDEO ||
@@ -5494,9 +5494,14 @@ static void atomisp_get_dis_envelop(struct atomisp_sub_device *asd, 
static void atomisp_check_copy_mode(struct atomisp_sub_device *asd,

				    int source_pad, struct v4l2_pix_format *f)

{

#if defined(ISP2401_NEW_INPUT_SYSTEM)

	struct v4l2_mbus_framefmt *sink, *src;



	if (!IS_ISP2401) {

		/* Only used for the new input system */

		asd->copy_mode = false;

		return;

	}



	sink = atomisp_subdev_get_ffmt(&asd->subdev, NULL,

				       V4L2_SUBDEV_FORMAT_ACTIVE, ATOMISP_SUBDEV_PAD_SINK);

	src = atomisp_subdev_get_ffmt(&asd->subdev, NULL,
@@ -5510,8 +5515,6 @@ static void atomisp_check_copy_mode(struct atomisp_sub_device *asd, 
	      sensor[asd->sensor_curr].stream_num > 1)))

		asd->copy_mode = true;

	else

#endif

		/* Only used for the new input system */

		asd->copy_mode = false;



	dev_dbg(asd->isp->dev, "copy_mode: %d\n", asd->copy_mode);

drivers/staging/media/atomisp/pci/atomisp_compat_css20.c

+2 −2
Original line number Diff line number Diff line
@@ -972,7 +972,7 @@ int atomisp_css_irq_translate(struct atomisp_device *isp, 
void atomisp_css_rx_get_irq_info(enum mipi_port_id port,

				 unsigned int *infos)

{

#ifndef ISP2401_NEW_INPUT_SYSTEM

#ifndef IS_ISP2401

	ia_css_isys_rx_get_irq_info(port, infos);

#else

	*infos = 0;
@@ -982,7 +982,7 @@ void atomisp_css_rx_get_irq_info(enum mipi_port_id port, 
void atomisp_css_rx_clear_irq_info(enum mipi_port_id port,

				   unsigned int infos)

{

#ifndef ISP2401_NEW_INPUT_SYSTEM

#ifndef IS_ISP2401

	ia_css_isys_rx_clear_irq_info(port, infos);

#endif

}

drivers/staging/media/atomisp/pci/atomisp_fops.c

+1 −3
Original line number Diff line number Diff line
@@ -464,13 +464,11 @@ int atomisp_qbuffers_to_css(struct atomisp_sub_device *asd) 
		css_capture_pipe_id = IA_CSS_PIPE_ID_CAPTURE;

	}



#ifdef ISP2401_NEW_INPUT_SYSTEM

	if (asd->copy_mode) {

	if (IS_ISP2401 && asd->copy_mode) {

		css_capture_pipe_id = IA_CSS_PIPE_ID_COPY;

		css_preview_pipe_id = IA_CSS_PIPE_ID_COPY;

		css_video_pipe_id = IA_CSS_PIPE_ID_COPY;

	}

#endif



	if (asd->yuvpp_mode) {

		capture_pipe = &asd->video_out_capture;

drivers/staging/media/atomisp/pci/atomisp_v4l2.c

+2 −12
Original line number Diff line number Diff line
@@ -1635,12 +1635,7 @@ static int atomisp_pci_probe(struct pci_dev *pdev, const struct pci_device_id *i 
		pdev->d3cold_delay = 0;

		break;

	case ATOMISP_PCI_DEVICE_SOC_ANN:

		isp->media_dev.hw_revision = (

#ifdef ISP2401_NEW_INPUT_SYSTEM

						 ATOMISP_HW_REVISION_ISP2401

#else

						 ATOMISP_HW_REVISION_ISP2401_LEGACY

#endif

		isp->media_dev.hw_revision = (	 ATOMISP_HW_REVISION_ISP2401

						 << ATOMISP_HW_REVISION_SHIFT);

		isp->media_dev.hw_revision |= pdev->revision < 2 ?

					      ATOMISP_HW_STEPPING_A0 : ATOMISP_HW_STEPPING_B0;
@@ -1648,12 +1643,7 @@ static int atomisp_pci_probe(struct pci_dev *pdev, const struct pci_device_id *i 
		isp->hpll_freq = HPLL_FREQ_1600MHZ;

		break;

	case ATOMISP_PCI_DEVICE_SOC_CHT:

		isp->media_dev.hw_revision = (

#ifdef ISP2401_NEW_INPUT_SYSTEM

						 ATOMISP_HW_REVISION_ISP2401

#else

						 ATOMISP_HW_REVISION_ISP2401_LEGACY

#endif

		isp->media_dev.hw_revision = (	 ATOMISP_HW_REVISION_ISP2401

						 << ATOMISP_HW_REVISION_SHIFT);

		isp->media_dev.hw_revision |= pdev->revision < 2 ?

					      ATOMISP_HW_STEPPING_A0 : ATOMISP_HW_STEPPING_B0;