kernel: bump 5.4 to 5.4.132

Manually rebased:
  layerscape/patches-5.4/805-display-0002-drm-rockchip-prepare-common-code-for-cdns-and-rk-dpi.patch

All other patches automatically rebased.

Build system: x86_64
Build-tested: ipq806x/R7800
Run-tested: ipq806x/R7800

No dmesg regressions, everything functional

Signed-off-by: John Audia <graysky@archlinux.us>

1 files changed, 15 insertions, 15 deletions

diff --git a/target/linux/layerscape/patches-5.4/805-display-0003-drm-bridge-add-Cadence-MHDP-HDMI-DP-API.patch b/target/linux/layerscape/patches-5.4/805-display-0003-drm-bridge-add-Cadence-MHDP-HDMI-DP-API.patch
index 19e762618a..14089a7b36 100644
--- a/target/linux/layerscape/patches-5.4/805-display-0003-drm-bridge-add-Cadence-MHDP-HDMI-DP-API.patch
+++ b/target/linux/layerscape/patches-5.4/805-display-0003-drm-bridge-add-Cadence-MHDP-HDMI-DP-API.patch
@@ -1794,7 +1794,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com>
  
  #define encoder_to_dp(c) \
  		container_of(c, struct cdn_dp_device, encoder)
-@@ -282,7 +282,7 @@ static int cdn_dp_connector_mode_valid(s
+@@ -283,7 +283,7 @@ static int cdn_dp_connector_mode_valid(s
  {
  	struct cdn_dp_device *dp = connector_to_dp(connector);
  	struct drm_display_info *display_info =
@@ -1803,7 +1803,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com>
  	u32 requested, actual, rate, sink_max, source_max = 0;
  	u8 lanes, bpc;
  
-@@ -378,7 +378,7 @@ static int cdn_dp_get_sink_capability(st
+@@ -379,7 +379,7 @@ static int cdn_dp_get_sink_capability(st
  	}
  
  	kfree(dp->edid);
@@ -1812,7 +1812,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com>
  				   cdns_mhdp_get_edid_block, &dp->mhdp);
  	return 0;
  }
-@@ -484,8 +484,8 @@ static int cdn_dp_disable(struct cdn_dp_
+@@ -485,8 +485,8 @@ static int cdn_dp_disable(struct cdn_dp_
  	cdns_mhdp_set_firmware_active(&dp->mhdp, false);
  	cdn_dp_clk_disable(dp);
  	dp->active = false;
@@ -1823,7 +1823,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com>
  	if (!dp->connected) {
  		kfree(dp->edid);
  		dp->edid = NULL;
-@@ -550,7 +550,7 @@ static void cdn_dp_encoder_mode_set(stru
+@@ -551,7 +551,7 @@ static void cdn_dp_encoder_mode_set(stru
  {
  	struct cdn_dp_device *dp = encoder_to_dp(encoder);
  	struct drm_display_info *display_info =
@@ -1832,7 +1832,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com>
  	struct video_info *video = &dp->mhdp.video_info;
  
  	switch (display_info->bpc) {
-@@ -578,7 +578,7 @@ static bool cdn_dp_check_link_status(str
+@@ -579,7 +579,7 @@ static bool cdn_dp_check_link_status(str
  	struct cdn_dp_port *port = cdn_dp_connected_port(dp);
  	u8 sink_lanes = drm_dp_max_lane_count(dp->dpcd);
  
@@ -1841,7 +1841,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com>
  		return false;
  
  	if (cdns_mhdp_dpcd_read(&dp->mhdp, DP_LANE0_1_STATUS, link_status,
-@@ -807,7 +807,7 @@ static int cdn_dp_audio_hw_params(struct
+@@ -808,7 +808,7 @@ static int cdn_dp_audio_hw_params(struct
  
  	ret = cdns_mhdp_audio_config(&dp->mhdp, &audio);
  	if (!ret)
@@ -1850,7 +1850,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com>
  
  out:
  	mutex_unlock(&dp->lock);
-@@ -823,9 +823,9 @@ static void cdn_dp_audio_shutdown(struct
+@@ -824,9 +824,9 @@ static void cdn_dp_audio_shutdown(struct
  	if (!dp->active)
  		goto out;
  
@@ -1862,7 +1862,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com>
  out:
  	mutex_unlock(&dp->lock);
  }
-@@ -854,8 +854,8 @@ static int cdn_dp_audio_get_eld(struct d
+@@ -855,8 +855,8 @@ static int cdn_dp_audio_get_eld(struct d
  {
  	struct cdn_dp_device *dp = dev_get_drvdata(dev);
  
@@ -1873,7 +1873,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com>
  
  	return 0;
  }
-@@ -877,11 +877,11 @@ static int cdn_dp_audio_codec_init(struc
+@@ -878,11 +878,11 @@ static int cdn_dp_audio_codec_init(struc
  		.max_i2s_channels = 8,
  	};
  
@@ -1889,7 +1889,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com>
  }
  
  static int cdn_dp_request_firmware(struct cdn_dp_device *dp)
-@@ -927,7 +927,7 @@ static void cdn_dp_pd_event_work(struct
+@@ -928,7 +928,7 @@ static void cdn_dp_pd_event_work(struct
  {
  	struct cdn_dp_device *dp = container_of(work, struct cdn_dp_device,
  						event_work);
@@ -1898,7 +1898,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com>
  	enum drm_connector_status old_status;
  	struct device *dev = dp->mhdp.dev;
  
-@@ -965,8 +965,8 @@ static void cdn_dp_pd_event_work(struct
+@@ -966,8 +966,8 @@ static void cdn_dp_pd_event_work(struct
  
  	/* Enabled and connected with a sink, re-train if requested */
  	} else if (!cdn_dp_check_link_status(dp)) {
@@ -1909,7 +1909,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com>
  		struct drm_display_mode *mode = &dp->mhdp.mode;
  
  		DRM_DEV_INFO(dev, "Connected with sink. Re-train link\n");
-@@ -979,8 +979,8 @@ static void cdn_dp_pd_event_work(struct
+@@ -980,8 +980,8 @@ static void cdn_dp_pd_event_work(struct
  
  		/* If training result is changed, update the video config */
  		if (mode->clock &&
@@ -1920,7 +1920,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com>
  			ret = cdns_mhdp_config_video(&dp->mhdp);
  			if (ret) {
  				dp->connected = false;
-@@ -1053,7 +1053,7 @@ static int cdn_dp_bind(struct device *de
+@@ -1054,7 +1054,7 @@ static int cdn_dp_bind(struct device *de
  
  	drm_encoder_helper_add(encoder, &cdn_dp_encoder_helper_funcs);
  
@@ -1929,7 +1929,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com>
  	connector->polled = DRM_CONNECTOR_POLL_HPD;
  	connector->dpms = DRM_MODE_DPMS_OFF;
  
-@@ -1104,7 +1104,7 @@ static void cdn_dp_unbind(struct device
+@@ -1105,7 +1105,7 @@ static void cdn_dp_unbind(struct device
  {
  	struct cdn_dp_device *dp = dev_get_drvdata(dev);
  	struct drm_encoder *encoder = &dp->encoder;
@@ -1938,7 +1938,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com>
  
  	cancel_work_sync(&dp->event_work);
  	cdn_dp_encoder_disable(encoder);
-@@ -1208,7 +1208,7 @@ static int cdn_dp_remove(struct platform
+@@ -1209,7 +1209,7 @@ static int cdn_dp_remove(struct platform
  {
  	struct cdn_dp_device *dp = platform_get_drvdata(pdev);