Skip to content

Commit

Permalink
ARM: imx6: revert changes done by v5.4.52 merge
Browse files Browse the repository at this point in the history
Commit 567092c (Merge tag 'v5.4.52'
into 5.4-1.0.0-imx) ended up bringing the pm-imx6.c content from
upstream, as a consequence of applying
1053339 (ARM: imx6: add missing
put_device() call in imx6q_suspend_init()), making the current version
incompatible with the rest of the BSP-based tree.

This was noticed when building the kernel for a iMX6-based device that
used pm-imx6, as the build failed due missing imx6_pm_map_io.

Signed-off-by: Ricardo Salveti <ricardo@foundries.io>
  • Loading branch information
ricardosalveti committed Aug 11, 2020
1 parent e3ffe38 commit 2483a91
Showing 1 changed file with 845 additions and 144 deletions.
Loading

0 comments on commit 2483a91

Please sign in to comment.