Em Tue, 12 Sep 2023 12:18:33 +0200 Hans de Goede <hdegoede@xxxxxxxxxx> escreveu: > Hi. > > On 8/13/23 17:45, Hans de Goede wrote: > > Hi Mauro, > > > > Here are the atomisp changes for 6.6. Most of the patches are from > > Kate Hsuan this cycle. > > > > Highlights: > > - Complete #ifdef ISP2401 removal work (Kate Hsuan), > > no more CONFIG_VIDEO_ATOMISP_ISP2401. Instead a single build > > now works on both the ISP2400(BYT) and ISP2401(CHT)! > > - The ACPI DSDT -> v4l2-subdev fwnode translation code (ipu-bridge) is > > now shared with the IPU3 code (already merged through Sakari's tree) > > - Drop the atomisp-ov2680 driver, instead the main ov2680 driver > > can now be used (already merged through Sakari's tree) > > - Drop the atomisp-ov5693 driver, instead the main ov5693 driver > > can now be used > > It seems that this has not made it into the media pull-req for 6.6 :( Weird. I merged patches until -rc6, which is when we close the media merge window. I don't recall having any pull requests opened on that time. > > I guess I'll just include the changes in my next atomisp pull-req > for 6.7 then ? Well, if the pull request is marked as new on patchwork, no need to re-submit. I should be handling the pending PRs there along the week (usually on Friday or on Monday, at most). Regards, Mauro > > Regards, > > Hans > > > > > > > The following changes since commit c816786c3b46ebe42c4887933e50a79b35c0a1c3: > > > > media: i2c: rdacm21: Fix uninitialized value (2023-08-11 13:36:19 +0200) > > > > are available in the Git repository at: > > > > git://git.kernel.org/pub/scm/linux/kernel/git/hansg/linux.git tags/media-atomisp-6.6-1 > > > > for you to fetch changes up to f0bfb0e19c8921468404a10f3c4e8ee4e417249d: > > > > media: atomisp: Drop atomisp-ov5693 sensor driver (2023-08-13 17:30:38 +0200) > > > > ---------------------------------------------------------------- > > atomisp staging driver changes for 6.6 > > > > Highlights: > > - Complete #ifdef ISP2401 removal work (Kate Hsuan), > > no more CONFIG_VIDEO_ATOMISP_ISP2401. Instead a single build > > now works on both the ISP2400(BYT) and ISP2401(CHT)! > > - The ACPI DSDT -> v4l2-subdev fwnode translation code (ipu-bridge) is > > now shared with the IPU3 code (already merged through Sakari's tree) > > - Drop the atomisp-ov2680 driver, instead the main ov2680 driver > > can now be used (already merged through Sakari's tree) > > - Drop the atomisp-ov5693 driver, instead the main ov5693 driver > > can now be used > > > > ---------------------------------------------------------------- > > Hans de Goede (15): > > media: atomisp: Fix missing v4l2_fh_release() in atomisp_open() error exit > > media: atomisp: Clamp width to max 1920 pixels when in ATOMISP_RUN_MODE_PREVIEW > > media: atomisp: Change atomisp_enum_framesizes() too small cut off from 2/3th to 5/8th > > media: atomisp: Add some higher resolutions to atomisp_enum_framesizes() > > media: atomisp: Remove support for custom run-mode v4l2-ctrl on sensors > > media: atomisp: Remove v4l2_ctrl_s_ctrl(asd->run_mode) calls from atomisp_open() > > media: atomisp: Remove empty isys_public.h > > media: atomisp: Remove aliases for MIPI_FORMAT_2400_CUSTOM0 > > media: atomisp: Mark ia_css_isys_240?_init() static > > media: atomisp: Simplify some if (IS_ISP2401...) statements > > media: atomisp: Drop ia_css_debug_dump_debug_info() and functions only used by it > > media: atomisp: Drop VIDEO_ATOMISP_ISP2401 Kconfig option > > media: atomisp: gc0310: Stop setting v4l2_subdev.fwnode to the endpoint fwnode > > media: atomisp: Disable VCM for OV5693 for now > > media: atomisp: Drop atomisp-ov5693 sensor driver > > > > Kate Hsuan (26): > > media: atomisp: ia_css_debug: Removed unused codes for debug > > media: atomisp: Removed unused HAS_WATCHDOG_SP_THREAD_DEBUG debug > > media: atomisp: sh_css_internal: sh_css_params: Unifying sh_css_sp_group data structure > > media: atomisp: ia_css_debug: Removed debug codes for dumping status > > media: atomisp: Make two individual enum to define the MIPI format > > media: atomisp: Included both input system headers > > media: atomisp: css_2401_system: Remove #ifdef ISP2401 to make the driver generic > > media: atomisp: isys: Removed #if defined(ISP2401) to make driver generic > > media: atomisp: hive_isp_css_common: Removed #if defined(ISP2401) to make driver generic > > media: atomisp: pipeline: Removed #if defined(ISP2401) to make driver generic > > media: atomisp: ifmtr: Removed #if defined(ISP2401) to make driver generic > > media: atomisp: Compile the object codes for a generic driver > > media: atomisp: rx: Removed #if defined(ISP2401) to make driver generic > > media: atomisp: isys_init: Initiate atomisp in a generic manner > > media: atomisp: ia_css_raw.host: Remove #ifdef ISP2401 to make the driver generic > > media: atomisp: binary: Removed #ifdef ISP2401 to make driver generic > > media: atomisp: hive_isp_css_include: Removed #ifdef ISP2401 to make driver generic > > media: atomisp: atomisp_compat_css20: Removed #ifdef ISP2401 to make driver generic > > media: atomisp: sh_css_mipi: Removed unused code ia_css_mipi_frame_enable_check_on_size() > > media: atomisp: sh_css: Removed #ifdef ISP2401 to make the driver generic > > media: atomisp: sh_css_sp: Remove #ifdef ISP2401 to make driver generic > > media: atomisp: sh_css: Removed #ifdef ISP2401 to make driver generic > > media: atomisp: sh_css: Renamed sh_css_config_input_network() > > media: atomisp: sh_css: Removed #ifdef ISP2401 to make code generic > > media: atomisp: sh_css: Removed #ifdef ISP2401 to make the driver generic > > media: atomisp: atomisp_v4l2: Removed unnecessary code > > > > drivers/staging/media/atomisp/Kconfig | 12 - > > drivers/staging/media/atomisp/Makefile | 16 +- > > drivers/staging/media/atomisp/TODO | 3 - > > drivers/staging/media/atomisp/i2c/Kconfig | 12 - > > drivers/staging/media/atomisp/i2c/Makefile | 1 - > > drivers/staging/media/atomisp/i2c/atomisp-gc0310.c | 20 +- > > drivers/staging/media/atomisp/i2c/ov5693/Makefile | 2 - > > drivers/staging/media/atomisp/i2c/ov5693/ad5823.h | 63 - > > .../media/atomisp/i2c/ov5693/atomisp-ov5693.c | 1763 -------------------- > > drivers/staging/media/atomisp/i2c/ov5693/ov5693.h | 1331 --------------- > > .../staging/media/atomisp/include/linux/atomisp.h | 10 - > > drivers/staging/media/atomisp/pci/atomisp_cmd.c | 26 +- > > drivers/staging/media/atomisp/pci/atomisp_cmd.h | 13 - > > .../media/atomisp/pci/atomisp_compat_css20.c | 14 +- > > .../media/atomisp/pci/atomisp_csi2_bridge.c | 7 +- > > drivers/staging/media/atomisp/pci/atomisp_fops.c | 7 +- > > drivers/staging/media/atomisp/pci/atomisp_ioctl.c | 21 +- > > drivers/staging/media/atomisp/pci/atomisp_subdev.c | 48 - > > drivers/staging/media/atomisp/pci/atomisp_subdev.h | 2 - > > drivers/staging/media/atomisp/pci/atomisp_v4l2.c | 19 - > > .../pci/css_2401_system/host/isys_irq_local.h | 3 - > > .../pci/css_2401_system/host/isys_irq_private.h | 2 - > > .../atomisp/pci/css_2401_system/isys_irq_global.h | 2 - > > .../atomisp/pci/hive_isp_css_common/debug_global.h | 7 - > > .../atomisp/pci/hive_isp_css_common/host/dma.c | 266 --- > > .../pci/hive_isp_css_common/host/dma_local.h | 116 -- > > .../pci/hive_isp_css_common/host/input_formatter.c | 2 - > > .../pci/hive_isp_css_common/host/input_system.c | 446 ----- > > .../atomisp/pci/hive_isp_css_common/host/irq.c | 19 - > > .../pci/hive_isp_css_common/host/irq_local.h | 8 - > > .../atomisp/pci/hive_isp_css_common/host/isp.c | 60 - > > .../pci/hive_isp_css_common/host/isp_local.h | 31 - > > .../atomisp/pci/hive_isp_css_common/host/sp.c | 47 - > > .../pci/hive_isp_css_common/host/sp_local.h | 26 - > > .../pci/hive_isp_css_include/host/csi_rx_public.h | 2 - > > .../pci/hive_isp_css_include/host/dma_public.h | 13 - > > .../pci/hive_isp_css_include/host/irq_public.h | 10 - > > .../pci/hive_isp_css_include/host/isp_public.h | 13 - > > .../hive_isp_css_include/host/isys_dma_public.h | 2 - > > .../hive_isp_css_include/host/isys_irq_public.h | 2 - > > .../pci/hive_isp_css_include/host/isys_public.h | 38 - > > .../hive_isp_css_include/host/pixelgen_public.h | 2 - > > .../pci/hive_isp_css_include/host/sp_public.h | 16 - > > .../atomisp/pci/hive_isp_css_include/isys_irq.h | 2 - > > .../staging/media/atomisp/pci/ia_css_acc_types.h | 6 +- > > drivers/staging/media/atomisp/pci/ia_css_mipi.h | 16 - > > .../staging/media/atomisp/pci/input_system_local.h | 7 +- > > .../media/atomisp/pci/input_system_private.h | 7 +- > > .../media/atomisp/pci/input_system_public.h | 4 +- > > .../pci/isp/kernels/raw/raw_1.0/ia_css_raw.host.c | 21 +- > > .../media/atomisp/pci/isp2400_input_system_local.h | 198 +-- > > .../atomisp/pci/isp2400_input_system_private.h | 4 +- > > .../atomisp/pci/isp2400_input_system_public.h | 42 +- > > .../media/atomisp/pci/isp2401_input_system_local.h | 88 +- > > .../atomisp/pci/isp2401_input_system_private.h | 112 +- > > .../media/atomisp/pci/runtime/binary/src/binary.c | 15 +- > > .../pci/runtime/debug/interface/ia_css_debug.h | 85 - > > .../atomisp/pci/runtime/debug/src/ia_css_debug.c | 1493 ----------------- > > .../media/atomisp/pci/runtime/ifmtr/src/ifmtr.c | 2 - > > .../pci/runtime/isys/interface/ia_css_isys.h | 9 +- > > .../pci/runtime/isys/interface/ia_css_isys_comm.h | 2 - > > .../atomisp/pci/runtime/isys/src/csi_rx_rmgr.c | 2 - > > .../atomisp/pci/runtime/isys/src/isys_dma_rmgr.c | 2 - > > .../media/atomisp/pci/runtime/isys/src/isys_init.c | 35 +- > > .../pci/runtime/isys/src/isys_stream2mmio_rmgr.c | 2 - > > .../media/atomisp/pci/runtime/isys/src/rx.c | 265 +-- > > .../atomisp/pci/runtime/isys/src/virtual_isys.c | 8 +- > > .../runtime/pipeline/interface/ia_css_pipeline.h | 2 - > > .../atomisp/pci/runtime/pipeline/src/pipeline.c | 2 - > > drivers/staging/media/atomisp/pci/sh_css.c | 236 ++- > > .../staging/media/atomisp/pci/sh_css_internal.h | 41 +- > > drivers/staging/media/atomisp/pci/sh_css_mipi.c | 29 - > > drivers/staging/media/atomisp/pci/sh_css_params.c | 41 +- > > drivers/staging/media/atomisp/pci/sh_css_sp.c | 62 +- > > drivers/staging/media/atomisp/pci/sh_css_sp.h | 4 - > > 75 files changed, 485 insertions(+), 6882 deletions(-) > > delete mode 100644 drivers/staging/media/atomisp/i2c/ov5693/Makefile > > delete mode 100644 drivers/staging/media/atomisp/i2c/ov5693/ad5823.h > > delete mode 100644 drivers/staging/media/atomisp/i2c/ov5693/atomisp-ov5693.c > > delete mode 100644 drivers/staging/media/atomisp/i2c/ov5693/ov5693.h > > delete mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_include/host/isys_public.h > > >