diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2024-02-21 11:55:03 +0100 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2024-02-21 11:57:13 +0100 |
| commit | 5955a854cd8045a8a2a0c3d86d6edd6cb2d772b6 (patch) | |
| tree | 71969b16bb3bea65cfb92b3fcb71446f090bdec8 /drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | |
| parent | bafc616f36d0d9fc9cc3c4c6cfab2f31d3702683 (diff) | |
| parent | 5a86ca588b3f989d3d0a4841446b699aae8beec4 (diff) | |
Merge commit v5.4.132 into fslc-5.15-2.2.x-imx
Revert the following commits before merging, the sources have been
heavely modified by NXP.
5a86ca588b3f9 Revert "perf/imx_ddr: don't enable counter0 if none of 4 counters are used"
56ad67babb7fb Revert "usb: phy: mxs: fix getting wrong state with mxs_phy_is_otg_host()"
50b3a42d82f07 Revert "USB: core: Unite old scheme and new scheme descriptor reads"
cdcf46014f5ca Revert "USB: core: Change usb_get_device_descriptor() API"
2f2af6028f201 Revert "USB: core: Fix race by not overwriting udev->descriptor in hub_port_init()"
9e168d3268f89 Revert "USB: core: Fix oversight in SuperSpeed initialization"
7e95107f9b664 Revert "PCI: dwc: Add start_link/stop_link inlines"
d0bec10a7f796 Revert "PCI: layerscape: Add the endpoint linkup notifier support"
aaf9dc6089bc3 Revert "PCI: layerscape: Add workaround for lost link capabilities during reset"
Conflicts:
arch/arm/boot/dts/imx6qdl.dtsi
arch/arm/boot/dts/imx6sx.dtsi
Keep stable node name changes
drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
Keep stable code change
drivers/media/i2c/ov5640.c
Keep stable code change
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Diffstat (limited to 'drivers/gpu/drm/bridge/adv7511/adv7511_drv.c')
| -rw-r--r-- | drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c index dfff98fb2fdc..8abebc785d4b 100644 --- a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c +++ b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c @@ -830,12 +830,12 @@ static void adv7511_mode_set(struct adv7511 *adv7511, else low_refresh_rate = ADV7511_LOW_REFRESH_RATE_NONE; - if (adv7511->type == ADV7535) - regmap_update_bits(adv7511->regmap, 0x4a, - 0xc, low_refresh_rate << 2); - else + if (adv7511->type == ADV7511) regmap_update_bits(adv7511->regmap, 0xfb, - 0x6, low_refresh_rate << 1); + 0x6, low_refresh_rate << 1); + else + regmap_update_bits(adv7511->regmap, 0x4a, + 0xc, low_refresh_rate << 2); regmap_update_bits(adv7511->regmap, 0x17, 0x60, (vsync_polarity << 6) | (hsync_polarity << 5)); |