diff options
Diffstat (limited to 'target/linux/layerscape')
14 files changed, 69 insertions, 69 deletions
diff --git a/target/linux/layerscape/patches-5.4/301-arch-0011-drivers-soc-fsl-add-qixis-driver.patch b/target/linux/layerscape/patches-5.4/301-arch-0011-drivers-soc-fsl-add-qixis-driver.patch index bd82274be2..f1913c0af5 100644 --- a/target/linux/layerscape/patches-5.4/301-arch-0011-drivers-soc-fsl-add-qixis-driver.patch +++ b/target/linux/layerscape/patches-5.4/301-arch-0011-drivers-soc-fsl-add-qixis-driver.patch @@ -16,7 +16,7 @@ Signed-off-by: Pankaj Bansal <pankaj.bansal@nxp.com> --- a/drivers/soc/fsl/Kconfig +++ b/drivers/soc/fsl/Kconfig -@@ -40,4 +40,15 @@ config DPAA2_CONSOLE +@@ -41,4 +41,15 @@ config DPAA2_CONSOLE /dev/dpaa2_mc_console and /dev/dpaa2_aiop_console, which can be used to dump the Management Complex and AIOP firmware logs. diff --git a/target/linux/layerscape/patches-5.4/301-arch-0012-soc-fsl-select-MFD_CORE-for-qixis-driver.patch b/target/linux/layerscape/patches-5.4/301-arch-0012-soc-fsl-select-MFD_CORE-for-qixis-driver.patch index aefae7c6c2..f754b4873c 100644 --- a/target/linux/layerscape/patches-5.4/301-arch-0012-soc-fsl-select-MFD_CORE-for-qixis-driver.patch +++ b/target/linux/layerscape/patches-5.4/301-arch-0012-soc-fsl-select-MFD_CORE-for-qixis-driver.patch @@ -12,7 +12,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> --- a/drivers/soc/fsl/Kconfig +++ b/drivers/soc/fsl/Kconfig -@@ -46,6 +46,7 @@ config FSL_QIXIS +@@ -47,6 +47,7 @@ config FSL_QIXIS depends on OF select REGMAP_I2C select REGMAP_MMIO diff --git a/target/linux/layerscape/patches-5.4/805-display-0002-drm-rockchip-prepare-common-code-for-cdns-and-rk-dpi.patch b/target/linux/layerscape/patches-5.4/805-display-0002-drm-rockchip-prepare-common-code-for-cdns-and-rk-dpi.patch index 8ce4380664..91b2dba7d8 100644 --- a/target/linux/layerscape/patches-5.4/805-display-0002-drm-rockchip-prepare-common-code-for-cdns-and-rk-dpi.patch +++ b/target/linux/layerscape/patches-5.4/805-display-0002-drm-rockchip-prepare-common-code-for-cdns-and-rk-dpi.patch @@ -164,8 +164,8 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> edid->width_cm, edid->height_cm); dp->sink_has_audio = drm_detect_monitor_audio(edid); -@@ -279,7 +282,8 @@ static int cdn_dp_connector_mode_valid(s - struct drm_display_mode *mode) +@@ -280,7 +283,8 @@ cdn_dp_connector_mode_valid(struct drm_c + struct drm_display_mode *mode) { struct cdn_dp_device *dp = connector_to_dp(connector); - struct drm_display_info *display_info = &dp->connector.display_info; @@ -174,7 +174,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> u32 requested, actual, rate, sink_max, source_max = 0; u8 lanes, bpc; -@@ -305,7 +309,7 @@ static int cdn_dp_connector_mode_valid(s +@@ -306,7 +310,7 @@ cdn_dp_connector_mode_valid(struct drm_c sink_max = drm_dp_max_lane_count(dp->dpcd); lanes = min(source_max, sink_max); @@ -183,7 +183,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> sink_max = drm_dp_max_link_rate(dp->dpcd); rate = min(source_max, sink_max); -@@ -315,7 +319,7 @@ static int cdn_dp_connector_mode_valid(s +@@ -316,7 +320,7 @@ cdn_dp_connector_mode_valid(struct drm_c actual = actual * 8 / 10; if (requested > actual) { @@ -192,7 +192,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> "requested=%d, actual=%d, clock=%d\n", requested, actual, mode->clock); return MODE_CLOCK_HIGH; -@@ -335,28 +339,29 @@ static int cdn_dp_firmware_init(struct c +@@ -336,28 +340,29 @@ static int cdn_dp_firmware_init(struct c const u32 *iram_data, *dram_data; const struct firmware *fw = dp->fw; const struct cdn_firmware_header *hdr; @@ -228,7 +228,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> } static int cdn_dp_get_sink_capability(struct cdn_dp_device *dp) -@@ -366,28 +371,29 @@ static int cdn_dp_get_sink_capability(st +@@ -367,28 +372,29 @@ static int cdn_dp_get_sink_capability(st if (!cdn_dp_check_sink_connection(dp)) return -ENODEV; @@ -264,7 +264,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> ret); goto err_phy; } -@@ -397,28 +403,28 @@ static int cdn_dp_enable_phy(struct cdn_ +@@ -398,28 +404,28 @@ static int cdn_dp_enable_phy(struct cdn_ ret = cdn_dp_grf_write(dp, GRF_SOC_CON26, DPTX_HPD_SEL_MASK | DPTX_HPD_SEL); if (ret) { @@ -299,7 +299,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> ret); goto err_power_on; } -@@ -428,7 +434,7 @@ static int cdn_dp_enable_phy(struct cdn_ +@@ -429,7 +435,7 @@ static int cdn_dp_enable_phy(struct cdn_ err_power_on: if (phy_power_off(port->phy)) @@ -308,7 +308,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> else port->phy_enabled = false; -@@ -446,7 +452,8 @@ static int cdn_dp_disable_phy(struct cdn +@@ -447,7 +453,8 @@ static int cdn_dp_disable_phy(struct cdn if (port->phy_enabled) { ret = phy_power_off(port->phy); if (ret) { @@ -318,7 +318,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> return ret; } } -@@ -470,16 +477,16 @@ static int cdn_dp_disable(struct cdn_dp_ +@@ -471,16 +478,16 @@ static int cdn_dp_disable(struct cdn_dp_ ret = cdn_dp_grf_write(dp, GRF_SOC_CON26, DPTX_HPD_SEL_MASK | DPTX_HPD_DEL); if (ret) { @@ -339,7 +339,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> if (!dp->connected) { kfree(dp->edid); dp->edid = NULL; -@@ -492,11 +499,11 @@ static int cdn_dp_enable(struct cdn_dp_d +@@ -493,11 +500,11 @@ static int cdn_dp_enable(struct cdn_dp_d { int ret, i, lanes; struct cdn_dp_port *port; @@ -353,7 +353,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> return -ENODEV; } -@@ -509,7 +516,7 @@ static int cdn_dp_enable(struct cdn_dp_d +@@ -510,7 +517,7 @@ static int cdn_dp_enable(struct cdn_dp_d ret = cdn_dp_firmware_init(dp); if (ret) { @@ -362,7 +362,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> goto err_clk_disable; } -@@ -543,8 +550,9 @@ static void cdn_dp_encoder_mode_set(stru +@@ -544,8 +551,9 @@ static void cdn_dp_encoder_mode_set(stru struct drm_display_mode *adjusted) { struct cdn_dp_device *dp = encoder_to_dp(encoder); @@ -374,7 +374,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> switch (display_info->bpc) { case 10: -@@ -562,7 +570,7 @@ static void cdn_dp_encoder_mode_set(stru +@@ -563,7 +571,7 @@ static void cdn_dp_encoder_mode_set(stru video->v_sync_polarity = !!(mode->flags & DRM_MODE_FLAG_NVSYNC); video->h_sync_polarity = !!(mode->flags & DRM_MODE_FLAG_NHSYNC); @@ -383,7 +383,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> } static bool cdn_dp_check_link_status(struct cdn_dp_device *dp) -@@ -571,11 +579,11 @@ static bool cdn_dp_check_link_status(str +@@ -572,11 +580,11 @@ 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); @@ -398,7 +398,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> DRM_ERROR("Failed to get link status\n"); return false; } -@@ -587,15 +595,16 @@ static bool cdn_dp_check_link_status(str +@@ -588,15 +596,16 @@ static bool cdn_dp_check_link_status(str static void cdn_dp_encoder_enable(struct drm_encoder *encoder) { struct cdn_dp_device *dp = encoder_to_dp(encoder); @@ -418,7 +418,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> (ret) ? "LIT" : "BIG"); if (ret) val = DP_SEL_VOP_LIT | (DP_SEL_VOP_LIT << 16); -@@ -610,33 +619,33 @@ static void cdn_dp_encoder_enable(struct +@@ -611,33 +620,33 @@ static void cdn_dp_encoder_enable(struct ret = cdn_dp_enable(dp); if (ret) { @@ -461,7 +461,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> goto out; } out: -@@ -652,7 +661,8 @@ static void cdn_dp_encoder_disable(struc +@@ -653,7 +662,8 @@ static void cdn_dp_encoder_disable(struc if (dp->active) { ret = cdn_dp_disable(dp); if (ret) { @@ -471,7 +471,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> ret); } } -@@ -696,7 +706,7 @@ static const struct drm_encoder_funcs cd +@@ -697,7 +707,7 @@ static const struct drm_encoder_funcs cd static int cdn_dp_parse_dt(struct cdn_dp_device *dp) { @@ -480,7 +480,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> struct device_node *np = dev->of_node; struct platform_device *pdev = to_platform_device(dev); struct resource *res; -@@ -708,10 +718,10 @@ static int cdn_dp_parse_dt(struct cdn_dp +@@ -709,10 +719,10 @@ static int cdn_dp_parse_dt(struct cdn_dp } res = platform_get_resource(pdev, IORESOURCE_MEM, 0); @@ -494,7 +494,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> } dp->core_clk = devm_clk_get(dev, "core-clk"); -@@ -726,10 +736,10 @@ static int cdn_dp_parse_dt(struct cdn_dp +@@ -727,10 +737,10 @@ static int cdn_dp_parse_dt(struct cdn_dp return PTR_ERR(dp->pclk); } @@ -508,7 +508,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> } dp->grf_clk = devm_clk_get(dev, "grf"); -@@ -738,10 +748,10 @@ static int cdn_dp_parse_dt(struct cdn_dp +@@ -739,10 +749,10 @@ static int cdn_dp_parse_dt(struct cdn_dp return PTR_ERR(dp->grf_clk); } @@ -522,7 +522,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> } dp->dptx_rst = devm_reset_control_get(dev, "dptx"); -@@ -796,7 +806,7 @@ static int cdn_dp_audio_hw_params(struct +@@ -797,7 +807,7 @@ static int cdn_dp_audio_hw_params(struct goto out; } @@ -531,7 +531,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> if (!ret) dp->audio_info = audio; -@@ -814,7 +824,7 @@ static void cdn_dp_audio_shutdown(struct +@@ -815,7 +825,7 @@ static void cdn_dp_audio_shutdown(struct if (!dp->active) goto out; @@ -540,7 +540,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> if (!ret) dp->audio_info.format = AFMT_UNUSED; out: -@@ -833,7 +843,7 @@ static int cdn_dp_audio_digital_mute(str +@@ -834,7 +844,7 @@ static int cdn_dp_audio_digital_mute(str goto out; } @@ -549,7 +549,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> out: mutex_unlock(&dp->lock); -@@ -845,7 +855,8 @@ static int cdn_dp_audio_get_eld(struct d +@@ -846,7 +856,8 @@ static int cdn_dp_audio_get_eld(struct d { struct cdn_dp_device *dp = dev_get_drvdata(dev); @@ -559,7 +559,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> return 0; } -@@ -879,6 +890,7 @@ static int cdn_dp_request_firmware(struc +@@ -880,6 +891,7 @@ static int cdn_dp_request_firmware(struc int ret; unsigned long timeout = jiffies + msecs_to_jiffies(CDN_FW_TIMEOUT_MS); unsigned long sleep = 1000; @@ -567,7 +567,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> WARN_ON(!mutex_is_locked(&dp->lock)); -@@ -889,13 +901,13 @@ static int cdn_dp_request_firmware(struc +@@ -890,13 +902,13 @@ static int cdn_dp_request_firmware(struc mutex_unlock(&dp->lock); while (time_before(jiffies, timeout)) { @@ -583,7 +583,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> "failed to request firmware: %d\n", ret); goto out; } -@@ -905,7 +917,7 @@ static int cdn_dp_request_firmware(struc +@@ -906,7 +918,7 @@ static int cdn_dp_request_firmware(struc goto out; } @@ -592,7 +592,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> ret = -ETIMEDOUT; out: mutex_lock(&dp->lock); -@@ -916,8 +928,9 @@ static void cdn_dp_pd_event_work(struct +@@ -917,8 +929,9 @@ static void cdn_dp_pd_event_work(struct { struct cdn_dp_device *dp = container_of(work, struct cdn_dp_device, event_work); @@ -603,7 +603,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> int ret; -@@ -934,44 +947,45 @@ static void cdn_dp_pd_event_work(struct +@@ -935,44 +948,45 @@ static void cdn_dp_pd_event_work(struct /* Not connected, notify userspace to disable the block */ if (!cdn_dp_connected_port(dp)) { @@ -662,7 +662,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> "Failed to config video %d\n", ret); } -@@ -1040,7 +1054,7 @@ static int cdn_dp_bind(struct device *de +@@ -1041,7 +1055,7 @@ static int cdn_dp_bind(struct device *de drm_encoder_helper_add(encoder, &cdn_dp_encoder_helper_funcs); @@ -671,7 +671,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> connector->polled = DRM_CONNECTOR_POLL_HPD; connector->dpms = DRM_MODE_DPMS_OFF; -@@ -1064,7 +1078,7 @@ static int cdn_dp_bind(struct device *de +@@ -1065,7 +1079,7 @@ static int cdn_dp_bind(struct device *de port = dp->port[i]; port->event_nb.notifier_call = cdn_dp_pd_event; @@ -680,7 +680,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> EXTCON_DISP_DP, &port->event_nb); if (ret) { -@@ -1091,7 +1105,7 @@ static void cdn_dp_unbind(struct device +@@ -1092,7 +1106,7 @@ static void cdn_dp_unbind(struct device { struct cdn_dp_device *dp = dev_get_drvdata(dev); struct drm_encoder *encoder = &dp->encoder; @@ -689,7 +689,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> cancel_work_sync(&dp->event_work); cdn_dp_encoder_disable(encoder); -@@ -1151,7 +1165,7 @@ static int cdn_dp_probe(struct platform_ +@@ -1152,7 +1166,7 @@ static int cdn_dp_probe(struct platform_ dp = devm_kzalloc(dev, sizeof(*dp), GFP_KERNEL); if (!dp) return -ENOMEM; @@ -698,7 +698,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> match = of_match_node(cdn_dp_dt_ids, pdev->dev.of_node); dp_data = (struct cdn_dp_data *)match->data; -@@ -1196,7 +1210,7 @@ static int cdn_dp_remove(struct platform +@@ -1197,7 +1211,7 @@ static int cdn_dp_remove(struct platform struct cdn_dp_device *dp = platform_get_drvdata(pdev); platform_device_unregister(dp->audio_pdev); @@ -707,7 +707,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> component_del(&pdev->dev, &cdn_dp_component_ops); return 0; -@@ -1206,7 +1220,7 @@ static void cdn_dp_shutdown(struct platf +@@ -1207,7 +1221,7 @@ static void cdn_dp_shutdown(struct platf { struct cdn_dp_device *dp = platform_get_drvdata(pdev); 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 14089a7b36..7606af4796 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) -@@ -283,7 +283,7 @@ static int cdn_dp_connector_mode_valid(s +@@ -284,7 +284,7 @@ cdn_dp_connector_mode_valid(struct drm_c { 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; -@@ -379,7 +379,7 @@ static int cdn_dp_get_sink_capability(st +@@ -380,7 +380,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; } -@@ -485,8 +485,8 @@ static int cdn_dp_disable(struct cdn_dp_ +@@ -486,8 +486,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; -@@ -551,7 +551,7 @@ static void cdn_dp_encoder_mode_set(stru +@@ -552,7 +552,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) { -@@ -579,7 +579,7 @@ static bool cdn_dp_check_link_status(str +@@ -580,7 +580,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, -@@ -808,7 +808,7 @@ static int cdn_dp_audio_hw_params(struct +@@ -809,7 +809,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); -@@ -824,9 +824,9 @@ static void cdn_dp_audio_shutdown(struct +@@ -825,9 +825,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); } -@@ -855,8 +855,8 @@ static int cdn_dp_audio_get_eld(struct d +@@ -856,8 +856,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; } -@@ -878,11 +878,11 @@ static int cdn_dp_audio_codec_init(struc +@@ -879,11 +879,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) -@@ -928,7 +928,7 @@ static void cdn_dp_pd_event_work(struct +@@ -929,7 +929,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; -@@ -966,8 +966,8 @@ static void cdn_dp_pd_event_work(struct +@@ -967,8 +967,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"); -@@ -980,8 +980,8 @@ static void cdn_dp_pd_event_work(struct +@@ -981,8 +981,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; -@@ -1054,7 +1054,7 @@ static int cdn_dp_bind(struct device *de +@@ -1055,7 +1055,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; -@@ -1105,7 +1105,7 @@ static void cdn_dp_unbind(struct device +@@ -1106,7 +1106,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); -@@ -1209,7 +1209,7 @@ static int cdn_dp_remove(struct platform +@@ -1210,7 +1210,7 @@ static int cdn_dp_remove(struct platform { struct cdn_dp_device *dp = platform_get_drvdata(pdev); diff --git a/target/linux/layerscape/patches-5.4/805-display-0009-drm-rockchip-Fix-build-failed-issue.patch b/target/linux/layerscape/patches-5.4/805-display-0009-drm-rockchip-Fix-build-failed-issue.patch index 6f44ce2219..258079c222 100644 --- a/target/linux/layerscape/patches-5.4/805-display-0009-drm-rockchip-Fix-build-failed-issue.patch +++ b/target/linux/layerscape/patches-5.4/805-display-0009-drm-rockchip-Fix-build-failed-issue.patch @@ -13,7 +13,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> --- a/drivers/gpu/drm/rockchip/cdn-dp-core.c +++ b/drivers/gpu/drm/rockchip/cdn-dp-core.c -@@ -798,7 +798,7 @@ static int cdn_dp_audio_hw_params(struct +@@ -799,7 +799,7 @@ static int cdn_dp_audio_hw_params(struct audio.format = AFMT_I2S; break; case HDMI_SPDIF: diff --git a/target/linux/layerscape/patches-5.4/805-display-0012-drm-rockchip-change-base-address-name-from-regs-to-r.patch b/target/linux/layerscape/patches-5.4/805-display-0012-drm-rockchip-change-base-address-name-from-regs-to-r.patch index bb87fbcfbd..2b202dd25f 100644 --- a/target/linux/layerscape/patches-5.4/805-display-0012-drm-rockchip-change-base-address-name-from-regs-to-r.patch +++ b/target/linux/layerscape/patches-5.4/805-display-0012-drm-rockchip-change-base-address-name-from-regs-to-r.patch @@ -13,7 +13,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> --- a/drivers/gpu/drm/rockchip/cdn-dp-core.c +++ b/drivers/gpu/drm/rockchip/cdn-dp-core.c -@@ -718,10 +718,10 @@ static int cdn_dp_parse_dt(struct cdn_dp +@@ -719,10 +719,10 @@ static int cdn_dp_parse_dt(struct cdn_dp } res = platform_get_resource(pdev, IORESOURCE_MEM, 0); diff --git a/target/linux/layerscape/patches-5.4/805-display-0018-drm-bridge-cdns-dp-Remove-link-rate-lanes-set-by-dev.patch b/target/linux/layerscape/patches-5.4/805-display-0018-drm-bridge-cdns-dp-Remove-link-rate-lanes-set-by-dev.patch index fba2ac4f02..3019b0c43f 100644 --- a/target/linux/layerscape/patches-5.4/805-display-0018-drm-bridge-cdns-dp-Remove-link-rate-lanes-set-by-dev.patch +++ b/target/linux/layerscape/patches-5.4/805-display-0018-drm-bridge-cdns-dp-Remove-link-rate-lanes-set-by-dev.patch @@ -142,7 +142,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> msg[4] = PTS1 | PTS2 | PTS3 | PTS4; --- a/drivers/gpu/drm/rockchip/cdn-dp-core.c +++ b/drivers/gpu/drm/rockchip/cdn-dp-core.c -@@ -306,12 +306,10 @@ static int cdn_dp_connector_mode_valid(s +@@ -307,12 +307,10 @@ cdn_dp_connector_mode_valid(struct drm_c requested = mode->clock * bpc * 3 / 1000; source_max = dp->lanes; @@ -157,7 +157,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> actual = rate * lanes / 100; -@@ -366,21 +364,25 @@ static int cdn_dp_firmware_init(struct c +@@ -367,21 +365,25 @@ static int cdn_dp_firmware_init(struct c static int cdn_dp_get_sink_capability(struct cdn_dp_device *dp) { @@ -188,7 +188,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> return 0; } -@@ -422,7 +424,8 @@ static int cdn_dp_enable_phy(struct cdn_ +@@ -423,7 +425,8 @@ static int cdn_dp_enable_phy(struct cdn_ } port->lanes = cdn_dp_get_port_lanes(port); @@ -198,7 +198,7 @@ Signed-off-by: Sandor Yu <Sandor.yu@nxp.com> if (ret) { DRM_DEV_ERROR(dev, "set host capabilities failed: %d\n", ret); -@@ -577,9 +580,9 @@ static bool cdn_dp_check_link_status(str +@@ -578,9 +581,9 @@ static bool cdn_dp_check_link_status(str { u8 link_status[DP_LINK_STATUS_SIZE]; struct cdn_dp_port *port = cdn_dp_connected_port(dp); diff --git a/target/linux/layerscape/patches-5.4/807-gpio-0001-gpio-mpc8xxx-change-irq-handler-from-chained-to-norm.patch b/target/linux/layerscape/patches-5.4/807-gpio-0001-gpio-mpc8xxx-change-irq-handler-from-chained-to-norm.patch index 01d2772138..759480d4ac 100644 --- a/target/linux/layerscape/patches-5.4/807-gpio-0001-gpio-mpc8xxx-change-irq-handler-from-chained-to-norm.patch +++ b/target/linux/layerscape/patches-5.4/807-gpio-0001-gpio-mpc8xxx-change-irq-handler-from-chained-to-norm.patch @@ -59,7 +59,7 @@ Signed-off-by: Song Hui <hui.song_1@nxp.com> } static void mpc8xxx_irq_unmask(struct irq_data *d) -@@ -414,8 +414,16 @@ static int mpc8xxx_probe(struct platform +@@ -415,8 +415,16 @@ static int mpc8xxx_probe(struct platform if (devtype->gpio_dir_in_init) devtype->gpio_dir_in_init(gc); diff --git a/target/linux/layerscape/patches-5.4/807-gpio-0002-gpio-mpc8xxx-ls1088a-ls1028a-edge-detection-mode-bug.patch b/target/linux/layerscape/patches-5.4/807-gpio-0002-gpio-mpc8xxx-ls1088a-ls1028a-edge-detection-mode-bug.patch index 2809a8373e..1413e75d58 100644 --- a/target/linux/layerscape/patches-5.4/807-gpio-0002-gpio-mpc8xxx-ls1088a-ls1028a-edge-detection-mode-bug.patch +++ b/target/linux/layerscape/patches-5.4/807-gpio-0002-gpio-mpc8xxx-ls1088a-ls1028a-edge-detection-mode-bug.patch @@ -14,7 +14,7 @@ Signed-off-by: Song Hui <hui.song_1@nxp.com> --- a/drivers/gpio/gpio-mpc8xxx.c +++ b/drivers/gpio/gpio-mpc8xxx.c -@@ -296,6 +296,7 @@ static const struct mpc8xxx_gpio_devtype +@@ -297,6 +297,7 @@ static const struct mpc8xxx_gpio_devtype static const struct mpc8xxx_gpio_devtype ls1028a_gpio_devtype = { .gpio_dir_in_init = ls1028a_gpio_dir_in_init, diff --git a/target/linux/layerscape/patches-5.4/813-pm-0001-soc-fsl-add-RCPM-driver.patch b/target/linux/layerscape/patches-5.4/813-pm-0001-soc-fsl-add-RCPM-driver.patch index 533534d7c9..6bb5be37ee 100644 --- a/target/linux/layerscape/patches-5.4/813-pm-0001-soc-fsl-add-RCPM-driver.patch +++ b/target/linux/layerscape/patches-5.4/813-pm-0001-soc-fsl-add-RCPM-driver.patch @@ -24,7 +24,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> --- a/drivers/soc/fsl/Kconfig +++ b/drivers/soc/fsl/Kconfig -@@ -52,4 +52,13 @@ config FSL_QIXIS +@@ -53,4 +53,13 @@ config FSL_QIXIS Say y here to enable QIXIS system controller api. The qixis driver provides FPGA functions to control system. diff --git a/target/linux/layerscape/patches-5.4/813-pm-0003-drivers-soc-fsl-add-EPU-FSM-configuration-for-deep-s.patch b/target/linux/layerscape/patches-5.4/813-pm-0003-drivers-soc-fsl-add-EPU-FSM-configuration-for-deep-s.patch index 21ac78b68d..bcf8099f5b 100644 --- a/target/linux/layerscape/patches-5.4/813-pm-0003-drivers-soc-fsl-add-EPU-FSM-configuration-for-deep-s.patch +++ b/target/linux/layerscape/patches-5.4/813-pm-0003-drivers-soc-fsl-add-EPU-FSM-configuration-for-deep-s.patch @@ -26,7 +26,7 @@ Signed-off-by: Ran Wang <ran.wang_1@nxp.com> --- a/drivers/soc/fsl/Kconfig +++ b/drivers/soc/fsl/Kconfig -@@ -31,6 +31,13 @@ config FSL_MC_DPIO +@@ -32,6 +32,13 @@ config FSL_MC_DPIO objects individually, but groups them under a service layer API. diff --git a/target/linux/layerscape/patches-5.4/820-usb-0005-usb-dwc3-add-otg-properties-update.patch b/target/linux/layerscape/patches-5.4/820-usb-0005-usb-dwc3-add-otg-properties-update.patch index 62220ee8e5..e85d3531f3 100644 --- a/target/linux/layerscape/patches-5.4/820-usb-0005-usb-dwc3-add-otg-properties-update.patch +++ b/target/linux/layerscape/patches-5.4/820-usb-0005-usb-dwc3-add-otg-properties-update.patch @@ -44,7 +44,7 @@ Signed-off-by: Peter Chen <peter.chen@nxp.com> * @revision: revision register contents * @version_type: VERSIONTYPE register contents, a sub release of a revision * @dr_mode: requested mode of operation -@@ -1111,6 +1112,7 @@ struct dwc3 { +@@ -1112,6 +1113,7 @@ struct dwc3 { u32 nr_scratch; u32 u1u2; u32 maximum_speed; @@ -54,7 +54,7 @@ Signed-off-by: Peter Chen <peter.chen@nxp.com> * All 3.1 IP version constants are greater than the 3.0 IP --- a/drivers/usb/dwc3/gadget.c +++ b/drivers/usb/dwc3/gadget.c -@@ -3701,6 +3701,10 @@ int dwc3_gadget_init(struct dwc3 *dwc) +@@ -3706,6 +3706,10 @@ int dwc3_gadget_init(struct dwc3 *dwc) dwc->gadget.sg_supported = true; dwc->gadget.name = "dwc3-gadget"; dwc->gadget.lpm_capable = true; diff --git a/target/linux/layerscape/patches-5.4/820-usb-0006-usb-dwc3-drd-add-usb-role-switch-class-support-for-d.patch b/target/linux/layerscape/patches-5.4/820-usb-0006-usb-dwc3-drd-add-usb-role-switch-class-support-for-d.patch index 4e6f128695..f2a8190509 100644 --- a/target/linux/layerscape/patches-5.4/820-usb-0006-usb-dwc3-drd-add-usb-role-switch-class-support-for-d.patch +++ b/target/linux/layerscape/patches-5.4/820-usb-0006-usb-dwc3-drd-add-usb-role-switch-class-support-for-d.patch @@ -23,7 +23,7 @@ Signed-off-by: Li Jun <jun.li@nxp.com> #include <linux/ulpi/interface.h> #include <linux/phy/phy.h> -@@ -1096,6 +1097,7 @@ struct dwc3 { +@@ -1097,6 +1098,7 @@ struct dwc3 { void __iomem *regs; size_t regs_size; diff --git a/target/linux/layerscape/patches-5.4/820-usb-0009-usb-dwc3-Add-workaround-for-host-mode-VBUS-glitch-wh.patch b/target/linux/layerscape/patches-5.4/820-usb-0009-usb-dwc3-Add-workaround-for-host-mode-VBUS-glitch-wh.patch index 60b110ad58..a5b84f3db9 100644 --- a/target/linux/layerscape/patches-5.4/820-usb-0009-usb-dwc3-Add-workaround-for-host-mode-VBUS-glitch-wh.patch +++ b/target/linux/layerscape/patches-5.4/820-usb-0009-usb-dwc3-Add-workaround-for-host-mode-VBUS-glitch-wh.patch @@ -44,7 +44,7 @@ Reviewed-by: Peter Chen <peter.chen@nxp.com> --- a/drivers/usb/dwc3/core.h +++ b/drivers/usb/dwc3/core.h -@@ -1048,6 +1048,8 @@ struct dwc3_scratchpad_array { +@@ -1049,6 +1049,8 @@ struct dwc3_scratchpad_array { * 3 - Reserved * @dis_metastability_quirk: set to disable metastability quirk. * @dis_split_quirk: set to disable split boundary. @@ -53,7 +53,7 @@ Reviewed-by: Peter Chen <peter.chen@nxp.com> * @imod_interval: set the interrupt moderation interval in 250ns * increments or 0 to disable. */ -@@ -1243,6 +1245,8 @@ struct dwc3 { +@@ -1245,6 +1247,8 @@ struct dwc3 { unsigned dis_split_quirk:1; |