[5.10-2.1.x-imx] Two fixes for minor issues observed on i.MX7 #510
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The timer node was moved from / to /soc by a previous commit, resulting
in the imx7d DTSI duplicating rather than amending the imx7s definition
of the timer. This causes the following warning in the kernel log:
arch_timer: multiple nodes in dt, skipping
We also revert the CPU mask from 4 CPUs to 1 (imx7d will modify it to
2 CPUs), as having a value of 4 on a single-core SoC seems questionable;
I haven't found any documentation of the purpose of this mask though.
Fixes: a12e072 ("ARM: dts: imx7d: add low power support")
Signed-off-by: Matthias Schiffer <[email protected]>
This reverts commit 2954aff. Signed-off-by: Matthias Schiffer <[email protected]>
On VF610, mclk0 = bus_clk; On i.MX6SX/6UL/6ULL/7D, mclk0 = mclk1; On i.MX7ULP, mclk0 = bus_clk; On i.MX8QM/8QXP, mclk0 = bus_clk; On i.MX8MQ/8MN/8MM/8MP, mclk0 = bus_clk; So add variable mclk0_is_mclk1 in fsl_sai_soc_data to distinguish these platforms. Signed-off-by: Shengjiu Wang <[email protected]> Acked-by: Nicolin Chen <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Mark Brown <[email protected]> (cherry picked from commit 53233e4) [Matthias Schiffer: adjusted for linux-imx 5.10] Signed-off-by: Matthias Schiffer <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
These seem to be only cosmetic issues, leaving warnings and error messages in the kernel log:
mclk0(which are all SoC older than i.MX8). Fixed by replacing a linux-imx change with a mainline backport.