Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge tag 'xilinx-v2021.1' of https://github.com/Xilinx/linux-xlnx.git
These drivers were kept as is. Meaning that the incoming changes were not accepted: 1. drivers/gpio/gpio-xilinx.c Reason: commit 408c13c ("gpio: xilinx: Restore upstream version") 2. drivers/usb/phy/phy-ulpi.c. Reason: commit c426e12 ("Revert "usb: phy: Add platform driver support for ULPI phys") This is a list of fixes (some straight ones are not mentioned) needed after resolving the merge conflicts to have linux compiling: * Removed the ---help--- syntax in Kconfig (not supported anymore); * Remove dependency on VIDEO_V4L2_SUBDEV_API for VIDEO_AXI_HDMI_RX and VIDEO_IMAGEON_BRIDGE as they select VIDEO_ADV7604 which already selects VIDEO_V4L2_SUBDEV_API. This would create a kconfig recursive dependency; * The v4l2 VIDEO_ADV7511 driver cannot be enabled at the same time as the DRM driver. Otherwise kconfig will complain (as such VIDEO_IMAGEON_BRIDGE is removed from the defconfig): "WARNING: unmet direct dependencies detected for VIDEO_ADV7511 Depends on [n]: MEDIA_SUPPORT [=y] && VIDEO_V4L2 [=y] && I2C [=y] && (DRM_I2C_ADV7511 [=y]=n || COMPILE_TEST [=n]) Selected by [y]: - VIDEO_IMAGEON_BRIDGE [=y] && MEDIA_PLATFORM_SUPPORT [=y] && V4L_PLATFORM_DRIVERS [=y] && MEDIA_SUPPORT [=y] && VIDEO_V4L2 [=y] && I2C [=y] && (GPIOLIB [=y] || COMPILE_TEST [=n]) WARNING: unmet direct dependencies detected for VIDEO_ADV7511 Depends on [n]: MEDIA_SUPPORT [=y] && VIDEO_V4L2 [=y] && I2C [=y] && (DRM_I2C_ADV7511 [=y]=n || COMPILE_TEST [=n]) Selected by [y]: - VIDEO_IMAGEON_BRIDGE [=y] && MEDIA_PLATFORM_SUPPORT [=y] && V4L_PLATFORM_DRIVERS [=y] && MEDIA_SUPPORT [=y] && VIDEO_V4L2 [=y] && I2C [=y] && (GPIOLIB [=y] || COMPILE_TEST [=n])". * Remove dma-contiguous.h (not present anymore) from mw_stream_channel.h; * Remove drmP.h from axi_hdmi_drv.c; * Replace gem_open_object (dropped upstream) by gem_open_object_unlocked. * Include drm/drm_bridge.h on the encoder * Add flags argument to 'drm_bridge_attach()'. The flags value is 0 to keep the same functionality as before. Though we might want to double check this we can (most likely) pass 'DRM_BRIDGE_ATTACH_NO_CONNECTOR'; * Fix adrv9363x_box() by using the 'asoc_rtd_to_{codec|cpu}' helpers; * axi-hdmi-rx replace VFL_TYPE_GRABBER by VFL_TYPE_VIDEO (renamed upstream); * Handle removal of 'iio_priv_to_dev()'. A pointer to the iio_dev is used in the state struct; * Convert pwm_state period and duty cylce to u64 to be compliant with upstream. It also fixes a lot of warnings; * Replace removed 'dev->dma_pfn_offset' by new 'dma_range_map' in mathworks driver; * Replace removed 'dma_request_slave_channel_reason()' with 'dma_request_chan()' in mathworks driver;
- Loading branch information