Merge branch 'linux-6.6-trunk/at91/drm' into linux-6.6-mchp

Author: cristibirsan

MAINTAINERS

@@ -14138,6 +14138,13 @@ S:	Supported
 F:	Documentation/devicetree/bindings/display/bridge/microchip,sam9x7-lvds.yaml
 F:	drivers/gpu/drm/bridge/microchip-lvds.c
 
+DRM DRIVER FOR MICROCHIP SAM9X7-COMPATIBLE MIPI DSI HOST CONTROLLER
+M:	Manikandan Muralidharan <manikandan.m@microchip.com>
+S:	Supported
+T:	git git://anongit.freedesktop.org/drm/drm-misc
+F:	Documentation/devicetree/bindings/display/bridge/microchip,sam9x75-mipi-dsi.yaml
+F:	drivers/gpu/drm/bridge/dw-mipi-dsi-mchp.c
+
 MICROCHIP SPI DRIVER
 M:	Ryan Wanner <ryan.wanner@microchip.com>
 S:	Supported

drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c

@@ -163,8 +163,14 @@ static void atmel_hlcdc_crtc_mode_set_nofb(struct drm_crtc *c)
 
 			if (div_low >= 2 &&
 			    ((prate / div_low >= mode_rate) &&
-			     (prate / div < mode_rate)))
+			     (prate / div < mode_rate))) {
 				div = div_low;
+			} else {
+				if (is_xlcdc) {
+					cfg |= ATMEL_XLCDC_CLKBYP;
+					mask |= ATMEL_XLCDC_CLKBYP;
+				}
+			}
 		}
 		cfg |= ATMEL_HLCDC_CLKDIV(div);
 	}

drivers/gpu/drm/bridge/Kconfig

@@ -180,6 +180,14 @@ config DRM_MICROCHIP_LVDS_SERIALIZER
 	help
 	  Support for Microchip's LVDS serializer.
 
+config DRM_MICROCHIP_DW_MIPI_DSI
+	tristate "Microchip specific extensions for Synopsys DW MIPI DSI"
+	depends on DRM_ATMEL_HLCDC
+	select DRM_DW_MIPI_DSI
+	help
+	  This selects support for Microchip's SoC specific extensions
+	  for the Synopsys DesignWare dsi driver.
+
 config DRM_NWL_MIPI_DSI
 	tristate "Northwest Logic MIPI DSI Host controller"
 	depends on DRM

drivers/gpu/drm/bridge/Makefile

@@ -12,6 +12,7 @@ obj-$(CONFIG_DRM_LONTIUM_LT9611UXC) += lontium-lt9611uxc.o
 obj-$(CONFIG_DRM_LVDS_CODEC) += lvds-codec.o
 obj-$(CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW) += megachips-stdpxxxx-ge-b850v3-fw.o
 obj-$(CONFIG_DRM_MICROCHIP_LVDS_SERIALIZER) += microchip-lvds.o
+obj-$(CONFIG_DRM_MICROCHIP_DW_MIPI_DSI) += dw-mipi-dsi-mchp.o
 obj-$(CONFIG_DRM_NXP_PTN3460) += nxp-ptn3460.o
 obj-$(CONFIG_DRM_PARADE_PS8622) += parade-ps8622.o
 obj-$(CONFIG_DRM_PARADE_PS8640) += parade-ps8640.o